Rework of Editor/defaulteditor, similar to Pager/defaultpager; new env vars.

[mmh] / uip / whatnow.c

diff --git a/uip/whatnow.c b/uip/whatnow.c
index b809ebe..bd1a3d5 100644 (file)
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -622,10 +622,9 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
                        if ((cp = context_find(cp)) != NULL)
                                *ed = cp;
                }
-       } else {
+       } else if (!*ed) {
                /* set initial editor */
-               if (*ed == NULL && (*ed = context_find("editor")) == NULL)
-                       *ed = defaulteditor;
+               *ed = defaulteditor;
        }
 
        if (altmsg) {