diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-11 00:58:59 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-11 00:58:59 +0000 |
| commit | 8cb95edf7cdec140efb1c8dbf4f7f33320f0ca0c (patch) | |
| tree | 082de7005695b6792640b4a2d54cfbe4a67921fc /lisp/emulation | |
| parent | 599498c31f0ce7a3ffd6094a12a986766b5a694d (diff) | |
| download | emacs-8cb95edf7cdec140efb1c8dbf4f7f33320f0ca0c.tar.gz | |
* keymap.c (QCadvertised_binding): New constant.
(syms_of_keymap): Initialize it.
(Fwhere_is_internal): Try and use bindings from :advertised-binding
if applicable.
* progmodes/xscheme.el (xscheme-evaluation-commands):
Put a :advertised-binding property rather than using
advertised-xscheme-send-previous-expression.
(advertised-xscheme-send-previous-expression): Declare obsolete.
* emulation/crisp.el (crisp-mode-map): Use `undo' rather than
`advertised-undo'.
(crisp-mode): Add corresponding bindings to
undo's :advertised-binding instead.
* dired.el (dired-mode-map): Put a :advertised-binding property rather
than using dired-advertised-find-file.
(dired-advertised-find-file):
* simple.el (advertised-undo):
* wid-edit.el (advertised-widget-backward): Declare obsolete.
(widget-keymap): Put a :advertised-binding property rather
than using advertised-widget-backward.
* bindings.el (ctl-x-map): Put a :advertised-binding property rather
than using advertised-undo.
* tutorial.el (tutorial--default-keys): Adjust accordingly.
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/crisp.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el index 64ca561fbe2..a53adf00fea 100644 --- a/lisp/emulation/crisp.el +++ b/lisp/emulation/crisp.el @@ -55,6 +55,8 @@ ;;; Code: +(eval-when-compile (require 'cl)) + ;; local variables (defgroup crisp nil @@ -205,8 +207,8 @@ does not load the scroll-all package." (define-key crisp-mode-map [(meta m)] 'set-mark-command) (define-key crisp-mode-map [(meta n)] 'bury-buffer) (define-key crisp-mode-map [(meta p)] 'crisp-unbury-buffer) -(define-key crisp-mode-map [(meta u)] 'advertised-undo) -(define-key crisp-mode-map [(f14)] 'advertised-undo) +(define-key crisp-mode-map [(meta u)] 'undo) +(define-key crisp-mode-map [(f14)] 'undo) (define-key crisp-mode-map [(meta w)] 'save-buffer) (define-key crisp-mode-map [(meta x)] 'crisp-meta-x-wrapper) (define-key crisp-mode-map [(meta ?0)] (lambda () @@ -357,6 +359,9 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise." (not crisp-mode) (> (prefix-numeric-value arg) 0))) (when crisp-mode + ;; Make menu entries show M-u or f14 in preference to C-x u. + (put 'undo :advertised-binding + (list* [?\M-u] [f14] (get 'undo :advertised-binding))) ;; Force transient-mark-mode, so that the marking routines work as ;; expected. If the user turns off transient mark mode, most ;; things will still work fine except the crisp-(copy|kill) |