mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-17 17:58:46 +00:00
(substitute-key-definition):
Compare with equal if definition is a key sequence.
This commit is contained in:
parent
1cd24721c2
commit
328a37ec31
10
lisp/subr.el
10
lisp/subr.el
@ -125,7 +125,11 @@ in KEYMAP as NEWDEF those chars which are defined as OLDDEF in OLDMAP."
|
||||
(while (and (symbolp inner-def)
|
||||
(fboundp inner-def))
|
||||
(setq inner-def (symbol-function inner-def)))
|
||||
(if (eq defn olddef)
|
||||
(if (or (eq defn olddef)
|
||||
;; Compare with equal if definition is a key sequence.
|
||||
;; That is useful for operating on function-key-map.
|
||||
(and (or (stringp defn) (vectorp defn))
|
||||
(equal defn olddef)))
|
||||
(define-key keymap prefix1 (nconc (nreverse skipped) newdef))
|
||||
(if (and (keymapp defn)
|
||||
;; Avoid recursively scanning
|
||||
@ -162,7 +166,9 @@ in KEYMAP as NEWDEF those chars which are defined as OLDDEF in OLDMAP."
|
||||
(while (and (symbolp inner-def)
|
||||
(fboundp inner-def))
|
||||
(setq inner-def (symbol-function inner-def)))
|
||||
(if (eq defn olddef)
|
||||
(if (or (eq defn olddef)
|
||||
(and (or (stringp defn) (vectorp defn))
|
||||
(equal defn olddef)))
|
||||
(define-key keymap prefix1
|
||||
(nconc (nreverse skipped) newdef))
|
||||
(if (and (keymapp defn)
|
||||
|
Loading…
Reference in New Issue
Block a user