Add setupEmacs(String) for specifying path to Emacs binary

Author: d-torrance

M2/Macaulay2/m2/files.m2

@@ -447,8 +447,8 @@ runAndEcho = s -> (
     printerr("running: ", cmd);
     run cmd)
 
-makeEmacsPackage = () -> (
-    if run "command -v emacs > /dev/null" != 0 then (
+makeEmacsPackage = emacs -> (
+    if run("command -v " | emacs | " > /dev/null") != 0 then (
 	printerr "warning: emacs not found; cannot install package";
 	return);
     rootdir := temporaryFileName() | "/";
@@ -470,7 +470,7 @@ makeEmacsPackage = () -> (
     pkgfile << "(define-package \"M2\" \"" << version#"VERSION";
     pkgfile << "\" \"Macaulay2 major modes\")" << endl << close;
     runAndEcho("cd", rootdir, "&&", "tar", "-cf", tarfile, pkgname);
-    runAndEcho("emacs", "--batch",
+    runAndEcho(emacs, "--batch",
 	"--eval", "'(package-install-file \"" | rootdir | tarfile | "\")'");)
 
 stripdir := dir -> if dir === "/" then dir else replace("/$","",dir)
@@ -508,7 +508,13 @@ prelim := () -> (
      promptUser = true;
      if prefixDirectory === null then error "can't determine Macaulay 2 prefix (prefixDirectory not set)";
      )
-installMethod(setupEmacs, () -> ( prelim(); mungeEmacs(); makeEmacsPackage() ))
+
+setupEmacs String := emacs -> (
+    prelim();
+    mungeEmacs();
+    makeEmacsPackage emacs)
+installMethod(setupEmacs, () -> setupEmacs "emacs")
+
 installMethod(setup, () -> (
      prelim();
      dotprofileFix = concatenate(shHeader, apply(shellfixes, (var,dir,rest) -> fix(var,dir,rest,bashtempl)));

M2/Macaulay2/packages/Macaulay2Doc/functions/setup-doc.m2

@@ -48,8 +48,12 @@ Node
   Key
     setupEmacs
     1:setupEmacs
+    (setupEmacs, String)
   Usage
     setupEmacs()
+    setupEmacs s
+  Inputs
+    s:String -- defaults to "emacs" when absent
   Consequences
     Item
       The initialization file for Emacs (@TT ".emacs"@ in your home directory) will have lines
@@ -61,6 +65,10 @@ Node
       it will not be modified. The lines added are bracketed by comment lines containing
       the phrases @TT "Macaulay 2 start"@ and @TT "Macaulay 2 end"@.
 
+      Emacs will be run in batch mode to install the Macaulay2 major mode
+      package.  If @CODE "emacs"@ is not available on the @CODE "PATH"@, then
+      you may specify the path to the Emacs binary using @VAR "s"@.
+
       The function @TO setup@ does all this and more.
   SeeAlso
     setup