summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2016-05-10 13:20:53 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2016-05-10 13:21:43 -0700
commit597fa5ee5d1bda8f91f6f0e4716c5fccc9927cf6 (patch)
tree9adfd7f6a57b14574fcdbe3794a42c53d53fa6ec
parent29e88b3ea3e13c7c86c707b6119cadad669e55aa (diff)
downloadzsh-597fa5ee5d1bda8f91f6f0e4716c5fccc9927cf6.tar.gz
zsh-597fa5ee5d1bda8f91f6f0e4716c5fccc9927cf6.tar.xz
zsh-597fa5ee5d1bda8f91f6f0e4716c5fccc9927cf6.zip
38463: use immortal widgets in .safe keymap
-rw-r--r--ChangeLog4
-rw-r--r--Src/Zle/zle_keymap.c16
2 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 5caeeccef..4c10e772a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-05-10  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 38463: Src/Zle/zle_keymap.c: use immortal widgets in .safe keymap
+
 2016-05-10  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* unposted: Functions/Math/.distfiles, Functions/Math/zmathfunc:
diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c
index 13fd13844..f547dbf17 100644
--- a/Src/Zle/zle_keymap.c
+++ b/Src/Zle/zle_keymap.c
@@ -1322,15 +1322,15 @@ default_bindings(void)
 	amap->first[i] = refthingy(t_undefinedkey);
 
     /* safe fallback keymap:
-     *   0-255  self-insert, except: *
-     *    '\n'  accept-line          *
-     *    '\r'  accept-line          */
+     *   0-255  .self-insert, except: *
+     *    '\n'  .accept-line          *
+     *    '\r'  .accept-line          */
     for (i = 0; i < 256; i++)
-	smap->first[i] = refthingy(t_selfinsert);
-    unrefthingy(t_selfinsert);
-    unrefthingy(t_selfinsert);
-    smap->first['\n'] = refthingy(t_acceptline);
-    smap->first['\r'] = refthingy(t_acceptline);
+	smap->first[i] = refthingy(t_Dselfinsert);
+    unrefthingy(t_Dselfinsert);
+    unrefthingy(t_Dselfinsert);
+    smap->first['\n'] = refthingy(t_Dacceptline);
+    smap->first['\r'] = refthingy(t_Dacceptline);
 
     /* vt100 arrow keys are bound by default, for historical reasons. *
      * Both standard and keypad modes are supported.                  */