Updated message, as `install-mh' had been replaced by `mmh'.

[mmh] / sbr / context_read.c

diff --git a/sbr/context_read.c b/sbr/context_read.c
index d1b22ac..600efab 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -68,7 +68,7 @@ context_read(void)
        } else {
                mmhpath = concat(mypath, "/", mmhdir, NULL);
                if (stat(mmhpath, &st) == -1 || (st.st_mode & S_IFDIR) == 0) {
-                       adios(NULL, "Doesn't look like mmh is set up for your account.  Run `install-mh' to do so.");
+                       adios(NULL, "Doesn't look like mmh is set up for your account.  Run `mmh' to do so.");
                }
        }
 
@@ -174,6 +174,18 @@ context_read(void)
                lkfclose(ib, ctxpath);
        }
 
+       /* Set editor */
+       if (!(cp = getenv("MMHEDITOR")) || !*cp) {
+               if (!(cp = context_find("editor")) || !*cp) {
+                       if (!(cp = getenv("VISUAL")) || !*cp) {
+                               if (!(cp = getenv("EDITOR")) || !*cp) {
+                                       cp = defaulteditor;
+                               }
+                       }
+               }
+       }
+       defaulteditor = cp;
+
        /* Set pager */
        if (!(cp = getenv("MMHPAGER")) || !*cp) {
                if (!(cp = context_find("pager")) || !*cp) {