aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 645f106e73f..880e246fc8f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12000-12-22 Gerd Moellmann <gerd@gnu.org>
2
3 * simple.el (delete-key-deletes-forward): Doc fix.
4
12000-08-22 Emmanuel Briot <briot@gnat.com> 52000-08-22 Emmanuel Briot <briot@gnat.com>
2 6
3 * xml.el (top level comment): Updated to reflect the fact that 7 * xml.el (top level comment): Updated to reflect the fact that
diff --git a/lisp/simple.el b/lisp/simple.el
index 3f1ed22f32d..7987ab217b3 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4010,7 +4010,10 @@ a similar effect by mapping C-h, which is usually generated by the
4010Backspace key, to DEL, and by mapping DEL to C-d via 4010Backspace key, to DEL, and by mapping DEL to C-d via
4011`keyboard-translate'. The former functionality of C-h is available on 4011`keyboard-translate'. The former functionality of C-h is available on
4012the F1 key. You should probably not use this setting if you don't 4012the F1 key. You should probably not use this setting if you don't
4013have both Backspace, Delete and F1 keys." 4013have both Backspace, Delete and F1 keys.
4014
4015Setting this variable with setq doesn't take effect. Programmatically,
4016call `delete-key-deleted-forward-mode' instead."
4014 :type 'boolean 4017 :type 'boolean
4015 :group 'editing-basics 4018 :group 'editing-basics
4016 :version "21.1" 4019 :version "21.1"