mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-30 04:10:54 -08:00
(map-y-or-n-p): Make bindings of user-defined keys be each a vector
containing the user's binding, rather than 'user. Check (vectorp DEF) and call the vector's elt, rather than checking (eq 'user DEF) and calling something completely random.
This commit is contained in:
parent
6c416012fe
commit
03329370c2
1 changed files with 6 additions and 6 deletions
|
|
@ -80,11 +80,11 @@ Returns the number of actions taken."
|
|||
action-alist ", ")
|
||||
" ")
|
||||
""))
|
||||
;; Make a map that defines all the user keys as `user'.
|
||||
;; Make a map that defines each user key as a vector containing
|
||||
;; its definition.
|
||||
(map (cons 'keymap
|
||||
(append (mapcar (function
|
||||
(lambda (elt)
|
||||
(cons (car elt) 'user)))
|
||||
(append (mapcar (lambda (elt)
|
||||
(cons (car elt) (vector (nth 1 elt))))
|
||||
action-alist)
|
||||
query-replace-map)))
|
||||
(actions 0)
|
||||
|
|
@ -175,9 +175,9 @@ the current %s and exit."
|
|||
(setq next (` (lambda ()
|
||||
(setq next '(, next))
|
||||
'(, elt)))))
|
||||
((eq def 'user)
|
||||
((vectorp def)
|
||||
;; A user-defined key.
|
||||
(if (funcall (nth 1 tail) elt) ;Call its function.
|
||||
(if (funcall (aref def 0) elt) ;Call its function.
|
||||
;; The function has eaten this object.
|
||||
(setq actions (1+ actions))
|
||||
;; Regurgitated; try again.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue