about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Functions/Zle/edit-command-line2
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 36e5c173b..eebd4ae31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	* Simon Ruderich: 29041: Completion/Unix/Command/_git: Add
 	completion for `tig' like the one for `gitk' from 29028.
 
+	* unposted: Functions/Zle/edit-command-line: Revert change from
+	28896, which did more evil than good.
+
 2011-04-24  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* Jun T.: 29031: Src/Zle/complist.c: increment global minfo
@@ -14516,5 +14519,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5262 $
+* $Revision: 1.5263 $
 *****************************************************
diff --git a/Functions/Zle/edit-command-line b/Functions/Zle/edit-command-line
index efcc4b957..250cac65f 100644
--- a/Functions/Zle/edit-command-line
+++ b/Functions/Zle/edit-command-line
@@ -6,8 +6,6 @@
 # will give ksh-like behaviour for that key,
 # except that it will handle multi-line buffers properly.
 
-setopt local_options no_monitor
-
 local tmpfile=${TMPPREFIX:-/tmp/zsh}ecl$$
 
 print -R - "$PREBUFFER$BUFFER" >$tmpfile