X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/df6971a59e8d01dcfe605bbac949b7d4b3ab0a92..cf57870921b26703aad420c6741c524b33736ff1:/uip/whatnowproc.c

diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index 293d5ceb..90e72d65 100644
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -22,11 +22,11 @@
 
 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;
-    register char *bp;
+    char *bp;
     char buffer[BUFSIZ], *vec[MAXARGS];
 
     vecp = 0;
@@ -55,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");
@@ -98,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",