summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/startup.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c791affe2f2..2fda98c317d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-21 Xue Fuqiao <xfq.free@gmail.com>
+
+ * startup.el (normal-no-mouse-startup-screen): Bug fix, the
+ default key binding for `describe-distribution' has been moved to
+ `C-h C-o'. (Bug#13970)
+
2013-04-21 Glenn Morris <rgm@gnu.org>
* vc/vc.el (vc-print-log-setup-buttons, vc-print-log-internal):
diff --git a/lisp/startup.el b/lisp/startup.el
index db84a5b11b2..dc21005ab94 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1940,7 +1940,7 @@ If you have no Meta key, you may instead type ESC followed by the character.)")
(insert "\n" (emacs-version) "\n" emacs-copyright "\n")
(if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
- (eq (key-binding "\C-h\C-d") 'describe-distribution)
+ (eq (key-binding "\C-h\C-o") 'describe-distribution)
(eq (key-binding "\C-h\C-w") 'describe-no-warranty))
(progn
(insert