Replace last-command-char with last-command-event.
This commit is contained in:
parent
51bc9aff5e
commit
61a846fbec
5 changed files with 9 additions and 6 deletions
|
@ -7,7 +7,10 @@
|
||||||
* calc/calc-keypd.el, calc/calc-misc.el, calc/calc-prog.el:
|
* calc/calc-keypd.el, calc/calc-misc.el, calc/calc-prog.el:
|
||||||
* calc/calc-sel.el, calc/calc-store.el, calc/calc-stuff.el:
|
* calc/calc-sel.el, calc/calc-store.el, calc/calc-stuff.el:
|
||||||
* calc/calc-units.el, calc/calc-yank.el, calc/calc.el:
|
* calc/calc-units.el, calc/calc-yank.el, calc/calc.el:
|
||||||
|
* emacs-lisp/lisp.el, emacs-lisp/re-builder.el:
|
||||||
* eshell/em-smart.el, eshell/esh-mode.el:
|
* eshell/em-smart.el, eshell/esh-mode.el:
|
||||||
|
* international/mule-cmds.el:
|
||||||
|
* net/tramp.el:
|
||||||
* play/mpuz.el:
|
* play/mpuz.el:
|
||||||
* progmodes/ada-mode.el, progmodes/antlr-mode.el, progmodes/cc-align.el:
|
* progmodes/ada-mode.el, progmodes/antlr-mode.el, progmodes/cc-align.el:
|
||||||
* progmodes/cc-cmds.el, progmodes/cperl-mode.el, progmodes/f90.el:
|
* progmodes/cc-cmds.el, progmodes/cperl-mode.el, progmodes/f90.el:
|
||||||
|
|
|
@ -474,7 +474,7 @@ character is inserted ARG times.
|
||||||
This command assumes point is not in a string or comment."
|
This command assumes point is not in a string or comment."
|
||||||
(interactive "P")
|
(interactive "P")
|
||||||
(if (not (and open close))
|
(if (not (and open close))
|
||||||
(let ((pair (or (assq last-command-char insert-pair-alist)
|
(let ((pair (or (assq last-command-event insert-pair-alist)
|
||||||
(assq (event-basic-type last-command-event)
|
(assq (event-basic-type last-command-event)
|
||||||
insert-pair-alist))))
|
insert-pair-alist))))
|
||||||
(if pair
|
(if pair
|
||||||
|
|
|
@ -564,7 +564,7 @@ optional fourth argument FORCE is non-nil."
|
||||||
(interactive)
|
(interactive)
|
||||||
|
|
||||||
(setq reb-subexp-displayed
|
(setq reb-subexp-displayed
|
||||||
(or subexp (string-to-number (format "%c" last-command-char))))
|
(or subexp (string-to-number (format "%c" last-command-event))))
|
||||||
(reb-update-modestring)
|
(reb-update-modestring)
|
||||||
(reb-do-update reb-subexp-displayed))
|
(reb-do-update reb-subexp-displayed))
|
||||||
|
|
||||||
|
|
|
@ -299,10 +299,10 @@ wrong, use this command again to toggle back to the right mode."
|
||||||
cmd (key-binding keyseq t))
|
cmd (key-binding keyseq t))
|
||||||
(not (eq cmd 'universal-argument-other-key)))
|
(not (eq cmd 'universal-argument-other-key)))
|
||||||
(let ((current-prefix-arg prefix-arg)
|
(let ((current-prefix-arg prefix-arg)
|
||||||
;; Have to bind `last-command-char' here so that
|
;; Have to bind `last-command-event' here so that
|
||||||
;; `digit-argument', for instance, can compute the
|
;; `digit-argument', for instance, can compute the
|
||||||
;; prefix arg.
|
;; prefix arg.
|
||||||
(last-command-char (aref keyseq 0)))
|
(last-command-event (aref keyseq 0)))
|
||||||
(call-interactively cmd)))
|
(call-interactively cmd)))
|
||||||
|
|
||||||
;; This is the final call to `universal-argument-other-key', which
|
;; This is the final call to `universal-argument-other-key', which
|
||||||
|
|
|
@ -3738,10 +3738,10 @@ beginning of local filename are not substituted."
|
||||||
;; We don't need to handle `last-input-event', because
|
;; We don't need to handle `last-input-event', because
|
||||||
;; due to the key map we know it must be ?/ or ?~.
|
;; due to the key map we know it must be ?/ or ?~.
|
||||||
(let ((s (concat (buffer-substring (point-min) (point))
|
(let ((s (concat (buffer-substring (point-min) (point))
|
||||||
(string last-command-char))))
|
(string last-command-event))))
|
||||||
(delete-region (point-min) (point))
|
(delete-region (point-min) (point))
|
||||||
(insert (substitute-in-file-name s))
|
(insert (substitute-in-file-name s))
|
||||||
(setq ad-return-value last-command-char))
|
(setq ad-return-value last-command-event))
|
||||||
ad-do-it))))
|
ad-do-it))))
|
||||||
|
|
||||||
'(minibuffer-electric-separator
|
'(minibuffer-electric-separator
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue