[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 36/56: * keymap.c (QCadvertised_binding): New constant. (syms_of_
From: |
Luke Lee |
Subject: |
[elpa] 36/56: * keymap.c (QCadvertised_binding): New constant. (syms_of_keymap): Initialize it. (Fwhere_is_internal): Try and use bindings from :advertised-binding if applicable. |
Date: |
Thu, 28 Aug 2014 02:21:53 +0000 |
lukelee pushed a commit to branch master
in repository elpa.
commit 381a59685a8db3f5dcd4a0435f4004ad1eb4eb0b
Author: Stefan Monnier <address@hidden>
Date: Fri Sep 11 00:58:59 2009 +0000
* 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.
---
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 64ca561..a53adf0 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)
- [elpa] branch master updated (413d7a6 -> b8f95e4), Luke Lee, 2014/08/27
- [elpa] 28/56: Update copyright years., Luke Lee, 2014/08/27
- [elpa] 29/56: Add 2007 to copyright years., Luke Lee, 2014/08/27
- [elpa] 31/56: Add 2008 to copyright years., Luke Lee, 2014/08/27
- [elpa] 33/56: Fix up comment convention on the arch-tag lines., Luke Lee, 2014/08/27
- [elpa] 30/56: Switch license to GPLv3 or later., Luke Lee, 2014/08/27
- [elpa] 34/56: Switch to recommended form of GPLv3 permissions notice., Luke Lee, 2014/08/27
- [elpa] 35/56: Add 2009 to copyright years., Luke Lee, 2014/08/27
- [elpa] 38/56: Add 2010 to copyright years., Luke Lee, 2014/08/27
- [elpa] 36/56: * keymap.c (QCadvertised_binding): New constant. (syms_of_keymap): Initialize it. (Fwhere_is_internal): Try and use bindings from :advertised-binding if applicable.,
Luke Lee <=
- [elpa] 40/56: Add 2011 to FSF/AIST copyright years., Luke Lee, 2014/08/27
- [elpa] 39/56: Remove leading `*' from docs of some defcustoms etc., Luke Lee, 2014/08/27
- [elpa] 42/56: Refill some copyright headers., Luke Lee, 2014/08/27
- [elpa] 37/56: * emulation/crisp.el (crisp-mode-map): Move initialization into declaration. (crisp-mode): Use define-minor-mode., Luke Lee, 2014/08/27
- [elpa] 41/56: Nuke arch-tags., Luke Lee, 2014/08/27
- [elpa] 47/56: Add 2012 to FSF copyright years for Emacs files, Luke Lee, 2014/08/27
- [elpa] 50/56: Replace version 24.2 with 24.3 where appropriate (hopefully), Luke Lee, 2014/08/27
- [elpa] 43/56: Convert consecutive FSF copyright years to ranges., Luke Lee, 2014/08/27
- [elpa] 49/56: Reduce use of (require 'cl). * admin/bzrmerge.el: Use cl-lib. * leim/quail/hangul.el: Don't require CL. * leim/quail/ipa.el: Use cl-lib. * vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el: * vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el: * register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el: * msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el: * international/quail.el, info-xref.el, imenu.el, image-mode.el: * font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el: * battery.el, avoid.el, abbrev.el: Use cl-lib. * vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el: * vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el: * jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el: * emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el: * calculator.el, autorevert.el, apropos.el: Don't require CL. * emacs-bytecomp.el (byte-recompile-directory, display-call-tree) (byte-compile-unfold-bcf, byte-compile-check-variable): * emacs-byte-opt.el (byte-compile-trueconstp) (byte-compile-nilconstp): * emacs-autoload.el (make-autoload): Use pcase. * face-remap.el (text-scale-adjust): Simplify pcase patterns., Luke Lee, 2014/08/27
- [elpa] 51/56: Aliases to defcustoms must come before the defcustom., Luke Lee, 2014/08/27