Replace last-command-char with last-command-event.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e366159fbc91cf8841142cd40712fea4df2c6c17..a3882d5a07bd843ccf7fed1f825ecacda3916a03 100644 (file)
--- 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 324b45d269269d5c3f856cda6e55c7f14b79a99c..beb0d85d74a9ac8fd2f8c1b766801a1dc39a0e18 100644 (file)
--- 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 bfd72148fd384dbb2f8f3e364d324271cf763698..97aba431c0f89ef38d6811c4a5a615ed2f18f1db 100644 (file)
--- 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 ac35228a19edd9e6a2a48c2adad2498ce33709e0..4e4c0352ccf33830696a836cb3d97b7957eed992 100644 (file)
--- 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 b226f22ad98475ade1871e6fcffb1088e9c40f4c..dbd34b763598af23146545a3861d64f621a2fc7a 100644 (file)
--- 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