diff options
| author | Glenn Morris | 2012-05-01 17:06:59 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-05-01 17:06:59 -0400 |
| commit | 976f7668ab5166673c3010eed82bae8ea8a30b69 (patch) | |
| tree | bf0044bd67d21e7a37fbf2b883192d75bec66dc1 | |
| parent | ab1121bd6de4533213cc9723b8d20f89bf10f063 (diff) | |
| download | emacs-976f7668ab5166673c3010eed82bae8ea8a30b69.tar.gz emacs-976f7668ab5166673c3010eed82bae8ea8a30b69.zip | |
* lisp/cus-start.el (suggest-key-bindings): Remove, now it is in Lisp.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/cus-start.el | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 887441d1c9d..07505a32536 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-05-01 Glenn Morris <rgm@gnu.org> | 1 | 2012-05-01 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * cus-start.el (suggest-key-bindings): Remove, now it is in Lisp. | ||
| 4 | |||
| 3 | * eshell/esh-cmd.el (eshell-debug-command): Doc fix. Add :set. | 5 | * eshell/esh-cmd.el (eshell-debug-command): Doc fix. Add :set. |
| 4 | 6 | ||
| 5 | * cus-edit.el (custom-variable-documentation): Simplify with format. | 7 | * cus-edit.el (custom-variable-documentation): Simplify with format. |
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 83973e4a534..9198eaddc37 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; cus-start.el --- define customization properties of builtins | 1 | ;;; cus-start.el --- define customization properties of builtins |
| 2 | ;; | 2 | |
| 3 | ;; Copyright (C) 1997, 1999-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1997, 1999-2012 Free Software Foundation, Inc. |
| 4 | ;; | 4 | |
| 5 | ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> | 5 | ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> |
| 6 | ;; Keywords: internal | 6 | ;; Keywords: internal |
| 7 | ;; Package: emacs | 7 | ;; Package: emacs |
| @@ -22,7 +22,7 @@ | |||
| 22 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 22 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 23 | 23 | ||
| 24 | ;;; Commentary: | 24 | ;;; Commentary: |
| 25 | ;; | 25 | |
| 26 | ;; This file adds customize support for built-in variables. | 26 | ;; This file adds customize support for built-in variables. |
| 27 | 27 | ||
| 28 | ;; While dumping Emacs, this file is loaded, but it only records | 28 | ;; While dumping Emacs, this file is loaded, but it only records |
| @@ -269,9 +269,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of | |||
| 269 | (const :tag "only shift-selection or mouse-drag" only) | 269 | (const :tag "only shift-selection or mouse-drag" only) |
| 270 | (const :tag "off" nil)) | 270 | (const :tag "off" nil)) |
| 271 | "24.1") | 271 | "24.1") |
| 272 | (suggest-key-bindings keyboard (choice (const :tag "off" nil) | ||
| 273 | (integer :tag "time" 2) | ||
| 274 | (other :tag "on"))) | ||
| 275 | (debug-on-event debug | 272 | (debug-on-event debug |
| 276 | (choice (const :tag "None" nil) | 273 | (choice (const :tag "None" nil) |
| 277 | (const :tag "When sent SIGUSR1" sigusr1) | 274 | (const :tag "When sent SIGUSR1" sigusr1) |