masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 11:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

unbind-key now removes key from personal-keybindings

Browse source 
Fixes https://github.com/jwiegley/use-package/issues/74
This commit is contained in:
John Wiegley 2015-03-21 04:13:02 -05:00
parent 47586c714e
commit 348bc57141
1 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
lisp/use-package/bind-key.el
View file

@ -91,6 +91,7 @@
;; what the default was. Also, it will tell you if the key was rebound after ;; what the default was. Also, it will tell you if the key was rebound after
;; your binding it with `bind-key', and what it was rebound it to. ;; your binding it with `bind-key', and what it was rebound it to.
(require 'cl-lib)
(require 'easy-mmode) (require 'easy-mmode)
(defgroup bind-key nil (defgroup bind-key nil
@ -144,8 +145,7 @@ spelled-out keystrokes, e.g., \"C-c C-z\". See documentation of
(let ((namevar (make-symbol "name")) (let ((namevar (make-symbol "name"))
(keyvar (make-symbol "key")) (keyvar (make-symbol "key"))
(kdescvar (make-symbol "kdesc")) (kdescvar (make-symbol "kdesc"))
(bindingvar (make-symbol "binding")) (bindingvar (make-symbol "binding")))
(entryvar (make-symbol "entry")))
`(let* ((,namevar ,key-name) `(let* ((,namevar ,key-name)
(,keyvar (if (vectorp ,namevar) ,namevar (,keyvar (if (vectorp ,namevar) ,namevar
(read-kbd-macro ,namevar))) (read-kbd-macro ,namevar)))
@ -153,19 +153,25 @@ spelled-out keystrokes, e.g., \"C-c C-z\". See documentation of
(key-description ,namevar)) (key-description ,namevar))
(quote ,keymap))) (quote ,keymap)))
(,bindingvar (lookup-key (or ,keymap global-map) (,bindingvar (lookup-key (or ,keymap global-map)
,keyvar)) ,keyvar)))
(,entryvar (assoc ,kdescvar personal-keybindings))) (add-to-list 'personal-keybindings
(when ,entryvar (list ,kdescvar ,command
(setq personal-keybindings (unless (numberp ,bindingvar) ,bindingvar)))
(delq ,entryvar personal-keybindings)))
(push (list ,kdescvar ,command
(unless (numberp ,bindingvar) ,bindingvar))
personal-keybindings)
(define-key (or ,keymap global-map) ,keyvar ,command)))) (define-key (or ,keymap global-map) ,keyvar ,command))))
;;;###autoload ;;;###autoload
(defmacro unbind-key (key-name &optional keymap) (defmacro unbind-key (key-name &optional keymap)
`(bind-key ,key-name nil ,keymap)) `(progn
(bind-key ,key-name nil ,keymap)
(setq personal-keybindings
(cl-delete-if #'(lambda (k)
,(if keymap
`(and (consp (car k))
(string= (caar k) ,key-name)
(eq (cdar k) ',keymap))
`(and (stringp (car k))
(string= (car k) ,key-name))))
personal-keybindings))))
;;;###autoload ;;;###autoload
(defmacro bind-key* (key-name command) (defmacro bind-key* (key-name command)
@ -288,7 +294,8 @@ function symbol (unquoted)."
"Display all the personal keybindings defined by `bind-key'." "Display all the personal keybindings defined by `bind-key'."
(interactive) (interactive)
(with-output-to-temp-buffer "*Personal Keybindings*" (with-output-to-temp-buffer "*Personal Keybindings*"
(princ (format "Key name%s Command%s Comments\n%s %s ---------------------\n" (princ (format (concat "Key name%s Command%s Comments\n%s %s "
"---------------------\n")
(make-string (- (car bind-key-column-widths) 9) ? ) (make-string (- (car bind-key-column-widths) 9) ? )
(make-string (- (cdr bind-key-column-widths) 8) ? ) (make-string (- (cdr bind-key-column-widths) 8) ? )
(make-string (1- (car bind-key-column-widths)) ?-) (make-string (1- (car bind-key-column-widths)) ?-)
@ -303,7 +310,8 @@ function symbol (unquoted)."
(if (not (eq (cdar last-binding) (cdar binding))) (if (not (eq (cdar last-binding) (cdar binding)))
(princ (format "\n\n%s\n%s\n\n" (princ (format "\n\n%s\n%s\n\n"
(cdar binding) (cdar binding)
(make-string (+ 21 (car bind-key-column-widths) (cdr bind-key-column-widths)) ?-))) (make-string (+ 21 (car bind-key-column-widths)
(cdr bind-key-column-widths)) ?-)))
(if (and last-binding (if (and last-binding
(cdr (compare-keybindings last-binding binding))) (cdr (compare-keybindings last-binding binding)))
(princ "\n"))) (princ "\n")))
@ -321,7 +329,8 @@ function symbol (unquoted)."
) )
(let ((line (let ((line
(format (format
(format "%%-%ds%%-%ds%%s\n" (car bind-key-column-widths) (cdr bind-key-column-widths)) (format "%%-%ds%%-%ds%%s\n" (car bind-key-column-widths)
(cdr bind-key-column-widths))
key-name (format "`%s\'" command-desc) key-name (format "`%s\'" command-desc)
(if (string= command-desc at-present-desc) (if (string= command-desc at-present-desc)
(if (or (null was-command) (if (or (null was-command)