diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/re-builder.el | 2 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 4 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 4 |
5 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e366159fbc9..a3882d5a07b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -7,7 +7,10 @@ * 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-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: + * international/mule-cmds.el: + * net/tramp.el: * play/mpuz.el: * progmodes/ada-mode.el, progmodes/antlr-mode.el, progmodes/cc-align.el: * progmodes/cc-cmds.el, progmodes/cperl-mode.el, progmodes/f90.el: diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 324b45d2692..beb0d85d74a 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -474,7 +474,7 @@ character is inserted ARG times. This command assumes point is not in a string or comment." (interactive "P") (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) insert-pair-alist)))) (if pair diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index bfd72148fd3..97aba431c0f 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -564,7 +564,7 @@ optional fourth argument FORCE is non-nil." (interactive) (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-do-update reb-subexp-displayed)) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index ac35228a19e..4e4c0352ccf 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -299,10 +299,10 @@ wrong, use this command again to toggle back to the right mode." cmd (key-binding keyseq t)) (not (eq cmd 'universal-argument-other-key))) (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 ;; prefix arg. - (last-command-char (aref keyseq 0))) + (last-command-event (aref keyseq 0))) (call-interactively cmd))) ;; This is the final call to `universal-argument-other-key', which diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index b226f22ad98..dbd34b76359 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3738,10 +3738,10 @@ beginning of local filename are not substituted." ;; We don't need to handle `last-input-event', because ;; due to the key map we know it must be ?/ or ?~. (let ((s (concat (buffer-substring (point-min) (point)) - (string last-command-char)))) + (string last-command-event)))) (delete-region (point-min) (point)) (insert (substitute-in-file-name s)) - (setq ad-return-value last-command-char)) + (setq ad-return-value last-command-event)) ad-do-it)))) '(minibuffer-electric-separator |