X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/358131df8b64ef0c6020dbe9ec61e11cecdef356..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/whatnowproc.c?ds=inline

diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index fc8783d0..90e72d65 100644
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -26,7 +26,7 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
 {
     int found, k, msgnum, vecp;
     int len, buflen;
-    register char *bp;
+    char *bp;
     char buffer[BUFSIZ], *vec[MAXARGS];
 
     vecp = 0;
@@ -55,8 +55,7 @@ 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);
@@ -100,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",