50569 (Daniel Shahaf): main keymap defaults to emacs

Tweaked to make the sample .zshrc code better match the former C code,
and to remove the declaration of no-longer-used variable "ed".

2 files changed, 5 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index e67a33ea9..c7fa8a1ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2023-10-25  Bart Schaefer  <schaefer@zsh.org>
 
+	* Daniel Shahaf: 50569 (tweaked): main keymap defaults to emacs
+
 	* Sebastian Gniazdowski: 52240: Functions/MIME/zsh-mime-handler:
 	use work-var $s not $suffix when setting flags
 
diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c
index a31ab22d7..041682ee9 100644
--- a/Src/Zle/zle_keymap.c
+++ b/Src/Zle/zle_keymap.c
@@ -1315,7 +1315,7 @@ default_bindings(void)
     Keymap vismap = newkeymap(NULL, "visual");
     Keymap smap = newkeymap(NULL, ".safe");
     Keymap vimaps[2], vilmaps[2], kptr;
-    char buf[3], *ed;
+    char buf[3];
     int i;
 
     /* vi insert mode and emacs mode:  *
@@ -1445,20 +1445,14 @@ default_bindings(void)
 	}
 
     /* Put the keymaps in the right namespace.  The "main" keymap  *
-     * will be linked to the "emacs" keymap, except that if VISUAL *
-     * or EDITOR contain the string "vi" then it will be linked to *
-     * the "viins" keymap.                                         */
+     * will be linked to the "emacs" keymap.                       */
     linkkeymap(vmap, "viins", 0);
     linkkeymap(emap, "emacs", 0);
     linkkeymap(amap, "vicmd", 0);
     linkkeymap(oppmap, "viopp", 0);
     linkkeymap(vismap, "visual", 0);
     linkkeymap(smap, ".safe", 1);
-    if (((ed = zgetenv("VISUAL")) && strstr(ed, "vi")) ||
-	((ed = zgetenv("EDITOR")) && strstr(ed, "vi")))
-	linkkeymap(vmap, "main", 0);
-    else
-	linkkeymap(emap, "main", 0);
+    linkkeymap(emap, "main", 0);
 
     /* the .safe map cannot be modified or deleted */
     smap->flags |= KM_IMMUTABLE;