aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 202770d96af..00bb0c5606e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-12-01 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * simple.el (normal-erase-is-backspace-mode): Fix thinko in message.
4
12009-12-01 Glenn Morris <rgm@gnu.org> 52009-12-01 Glenn Morris <rgm@gnu.org>
2 6
3 * window.el (window--display-buffer-2): Fix previous changes. 7 * window.el (window--display-buffer-2): Fix previous changes.
diff --git a/lisp/simple.el b/lisp/simple.el
index ad9178e5838..65086dbfdfc 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6455,7 +6455,7 @@ See also `normal-erase-is-backspace'."
6455 (run-hooks 'normal-erase-is-backspace-hook) 6455 (run-hooks 'normal-erase-is-backspace-hook)
6456 (if (called-interactively-p 'interactive) 6456 (if (called-interactively-p 'interactive)
6457 (message "Delete key deletes %s" 6457 (message "Delete key deletes %s"
6458 (if (terminal-parameter nil 'normal-erase-is-backspace) 6458 (if (eq 1 (terminal-parameter nil 'normal-erase-is-backspace))
6459 "forward" "backward"))))) 6459 "forward" "backward")))))
6460 6460
6461(defvar vis-mode-saved-buffer-invisibility-spec nil 6461(defvar vis-mode-saved-buffer-invisibility-spec nil