X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fcontext_read.c;h=600efab2b754f5b9c8c6024ede62a4eaf10e0889;hp=d1b22ac6bb6ac0cdc2905d2b01a6c0ccc7021ee3;hb=0ac9f5ab199e03ff8f6e5914437cb14d25171058;hpb=0c4214ea2aec6497d0d67b436bbee9bc1d225f1e

diff --git a/sbr/context_read.c b/sbr/context_read.c
index d1b22ac..600efab 100644
--- 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) {