diff options
| author | Xue Fuqiao | 2013-04-21 10:45:38 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-04-21 10:45:38 +0800 |
| commit | cc641ee19e6f99b388f96405807ad22c793f48cf (patch) | |
| tree | bf466c00a58f719df856fa4a24b38234abe5de92 | |
| parent | 1b42ee4390648fa29ecc1243be6dbee4414d3d69 (diff) | |
| download | emacs-cc641ee19e6f99b388f96405807ad22c793f48cf.tar.gz emacs-cc641ee19e6f99b388f96405807ad22c793f48cf.zip | |
startup.el (normal-no-mouse-startup-screen): Bug fix, the default key binding for C-h C-o'. (Bug#13970)
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/startup.el | 2 |
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 @@ | |||
| 1 | 2013-04-21 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * startup.el (normal-no-mouse-startup-screen): Bug fix, the | ||
| 4 | default key binding for `describe-distribution' has been moved to | ||
| 5 | `C-h C-o'. (Bug#13970) | ||
| 6 | |||
| 1 | 2013-04-21 Glenn Morris <rgm@gnu.org> | 7 | 2013-04-21 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * vc/vc.el (vc-print-log-setup-buttons, vc-print-log-internal): | 9 | * 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.)") | |||
| 1940 | (insert "\n" (emacs-version) "\n" emacs-copyright "\n") | 1940 | (insert "\n" (emacs-version) "\n" emacs-copyright "\n") |
| 1941 | 1941 | ||
| 1942 | (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) | 1942 | (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) |
| 1943 | (eq (key-binding "\C-h\C-d") 'describe-distribution) | 1943 | (eq (key-binding "\C-h\C-o") 'describe-distribution) |
| 1944 | (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) | 1944 | (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) |
| 1945 | (progn | 1945 | (progn |
| 1946 | (insert | 1946 | (insert |