X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..f345b9b480296b4b6a8469d6221752893c5d1420:/uip/whatnowproc.c

diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index 6bf4b369..8fc6ee72 100644
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -19,13 +19,10 @@
  * it will call this routine directly without exec'ing it.
  */
 
-/* from whatnowsbr.c */
-int WhatNow (int, char **);
-
 
 int
 what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
-          struct msgs *mp, char *text, int inplace, char *cwd)
+          struct msgs *mp, char *text, int inplace, char *cwd, int atfile)
 {
     int found, k, msgnum, vecp;
     int len, buflen;
@@ -58,11 +55,12 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
     if (nedit) {
 	unputenv ("mheditor");
     } else {
-	m_putenv ("mheditor", ed ? ed : (ed = context_find ("editor"))
-	    ? ed : defaulteditor);
+	m_putenv ("mheditor", ed ? ed : (ed = get_default_editor()));
     }
     snprintf (buffer, sizeof(buffer), "%d", use);
     m_putenv ("mhuse", buffer);
+    snprintf (buffer, sizeof(buffer), "%d", atfile);
+    m_putenv ("mhatfile", buffer);
 
     unputenv ("mhmessages");
     unputenv ("mhannotate");
@@ -101,8 +99,11 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
     context_save ();	/* save the context file */
     fflush (stdout);
 
-    if (cwd)
-	chdir (cwd);
+    if (cwd) {
+	if (chdir (cwd) < 0) {
+	    advise (cwd, "chdir");
+	}
+    }
 
     /*
      * If the "whatnowproc" is the nmh command "whatnow",