diff options
| author | Chong Yidong | 2012-12-08 00:34:01 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-12-08 00:34:01 +0800 |
| commit | ffe7ba8f156fd3fb5afc78e50148b28b7584c622 (patch) | |
| tree | 0f11d4c8532a45a274446e357540aa14e688b631 | |
| parent | 454eb09524ef6e8c25ea7dc8b9fd6fadb0bb1a5c (diff) | |
| download | emacs-ffe7ba8f156fd3fb5afc78e50148b28b7584c622.tar.gz emacs-ffe7ba8f156fd3fb5afc78e50148b28b7584c622.zip | |
* novice.el (disabled-command-function): Remove a spurious help xref.
Suggested by Kelly Dean.
Fixes: debbugs:13043
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/novice.el | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab351f2a69c..18dc2e962ad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-12-07 Chong Yidong <cyd@gnu.org> | 1 | 2012-12-07 Chong Yidong <cyd@gnu.org> |
| 2 | 2 | ||
| 3 | * novice.el (disabled-command-function): Remove a spurious help | ||
| 4 | xref (Bug#13043). Suggested by Kelly Dean. | ||
| 5 | |||
| 3 | * subr.el (text-clone-maintain): Fix clone overlay deletion when a | 6 | * subr.el (text-clone-maintain): Fix clone overlay deletion when a |
| 4 | syntax is specified (Bug#13025). | 7 | syntax is specified (Bug#13025). |
| 5 | 8 | ||
diff --git a/lisp/novice.el b/lisp/novice.el index c621ac4b692..b8e4a268b23 100644 --- a/lisp/novice.el +++ b/lisp/novice.el | |||
| @@ -49,7 +49,6 @@ If nil, the feature is disabled, i.e., all commands work normally.") | |||
| 49 | (unless keys (setq keys (this-command-keys))) | 49 | (unless keys (setq keys (this-command-keys))) |
| 50 | (let (char) | 50 | (let (char) |
| 51 | (save-window-excursion | 51 | (save-window-excursion |
| 52 | (help-setup-xref (list 'disabled-command-function cmd keys) nil) | ||
| 53 | (with-output-to-temp-buffer "*Disabled Command*" ;; (help-buffer) | 52 | (with-output-to-temp-buffer "*Disabled Command*" ;; (help-buffer) |
| 54 | (if (or (eq (aref keys 0) | 53 | (if (or (eq (aref keys 0) |
| 55 | (if (stringp keys) | 54 | (if (stringp keys) |