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

1 files changed, 11 insertions, 11 deletions

diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 6294d7680e..d97cd7971e 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1446,26 +1446,26 @@ calc-kill calc-kill-region calc-yank))))
 	 (if (boundp 'overriding-terminal-local-map)
 	     (setq overriding-terminal-local-map calc-fancy-prefix-map)
 	   (let ((event (calc-read-key t)))
-	     (if (eq (setq last-command-char (car event)) ?\C-u)
+	     (if (eq (setq last-command-event (car event)) ?\C-u)
 		 (universal-argument)
-	       (if (or (not (integerp last-command-char))
-		       (and (>= last-command-char 0) (< last-command-char ? )
-			    (not (memq last-command-char '(?\e)))))
+	       (if (or (not (integerp last-command-event))
+		       (and (>= last-command-event 0) (< last-command-event ? )
+			    (not (memq last-command-event '(?\e)))))
 		   (calc-wrapper))  ; clear flags if not a Calc command.
                (setq last-command-event (cdr event))
-	       (if (or (not (integerp last-command-char))
-		       (eq last-command-char ?-))
+	       (if (or (not (integerp last-command-event))
+		       (eq last-command-event ?-))
 		   (calc-unread-command)
 		 (digit-argument n))))))))
 
 (defun calc-fancy-prefix-other-key (arg)
   (interactive "P")
   (if (and
-       (not (eq last-command-char 'tab))
-       (not (eq last-command-char 'M-tab))
-       (or (not (integerp last-command-char))
-           (and (>= last-command-char 0) (< last-command-char ? )
-                (not (eq last-command-char meta-prefix-char)))))
+       (not (eq last-command-event 'tab))
+       (not (eq last-command-event 'M-tab))
+       (or (not (integerp last-command-event))
+           (and (>= last-command-event 0) (< last-command-event ? )
+                (not (eq last-command-event meta-prefix-char)))))
      (calc-wrapper))  ; clear flags if not a Calc command.
   (setq prefix-arg arg)
   (calc-unread-command)