diff lisp/calc/calc.el @ 101001:14b421290b2f

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

--- a/lisp/calc/calc.el	Fri Jan 09 03:30:02 2009 +0000
+++ b/lisp/calc/calc.el	Fri Jan 09 03:57:12 2009 +0000
@@ -2147,7 +2147,7 @@
   (interactive)
   (calc-wrapper
    (if (or calc-algebraic-mode
-	   (and (> calc-number-radix 14) (eq last-command-char ?e)))
+	   (and (> calc-number-radix 14) (eq last-command-event ?e)))
        (calc-alg-digit-entry)
      (calc-unread-command)
      (setq calc-aborted-prefix nil)
@@ -2196,9 +2196,9 @@
       (progn
 	(beep)
 	(calc-temp-minibuffer-message " [Bad format]"))
-    (or (memq last-command-char '(32 13))
+    (or (memq last-command-event '(32 13))
 	(progn (setq prefix-arg current-prefix-arg)
-	       (calc-unread-command (if (and (eq last-command-char 27)
+	       (calc-unread-command (if (and (eq last-command-event 27)
 					     (>= last-input-char 128))
 					last-input-char
 				      nil))))
@@ -2213,38 +2213,38 @@
 (defun calcDigit-key ()
   (interactive)
   (goto-char (point-max))
-  (if (or (and (memq last-command-char '(?+ ?-))
+  (if (or (and (memq last-command-event '(?+ ?-))
 	       (> (buffer-size) 0)
 	       (/= (preceding-char) ?e))
-	  (and (memq last-command-char '(?m ?s))
+	  (and (memq last-command-event '(?m ?s))
 	       (not (calc-minibuffer-contains "[-+]?[0-9]+\\.?0*[@oh].*"))
 	       (not (calc-minibuffer-contains "[-+]?\\(1[1-9]\\|[2-9][0-9]\\)#.*"))))
       (calcDigit-nondigit)
     (if (calc-minibuffer-contains "\\([-+]?\\|.* \\)\\'")
-	(cond ((memq last-command-char '(?. ?@)) (insert "0"))
-	      ((and (memq last-command-char '(?o ?h ?m))
+	(cond ((memq last-command-event '(?. ?@)) (insert "0"))
+	      ((and (memq last-command-event '(?o ?h ?m))
 		    (not (calc-minibuffer-contains ".*#.*"))) (insert "0"))
-	      ((memq last-command-char '(?: ?e)) (insert "1"))
-	      ((eq last-command-char ?#)
+	      ((memq last-command-event '(?: ?e)) (insert "1"))
+	      ((eq last-command-event ?#)
 	       (insert (int-to-string calc-number-radix)))))
     (if (and (calc-minibuffer-contains "\\([-+]?[0-9]+#\\|[^:]*:\\)\\'")
-	     (eq last-command-char ?:))
+	     (eq last-command-event ?:))
 	(insert "1"))
     (if (and (calc-minibuffer-contains "[-+]?[0-9]+#\\'")
-	     (eq last-command-char ?.))
+	     (eq last-command-event ?.))
 	(insert "0"))
     (if (and (calc-minibuffer-contains "[-+]?0*\\([2-9]\\|1[0-4]\\)#\\'")
-	     (eq last-command-char ?e))
+	     (eq last-command-event ?e))
 	(insert "1"))
-    (if (or (and (memq last-command-char '(?h ?o ?m ?s ?p))
+    (if (or (and (memq last-command-event '(?h ?o ?m ?s ?p))
 		 (calc-minibuffer-contains ".*#.*"))
-	    (and (eq last-command-char ?e)
+	    (and (eq last-command-event ?e)
 		 (calc-minibuffer-contains "[-+]?\\(1[5-9]\\|[2-9][0-9]\\)#.*"))
-	    (and (eq last-command-char ?n)
+	    (and (eq last-command-event ?n)
 		 (calc-minibuffer-contains "[-+]?\\(2[4-9]\\|[3-9][0-9]\\)#.*")))
-	(setq last-command-char (upcase last-command-char)))
+	(setq last-command-event (upcase last-command-event)))
     (cond
-     ((memq last-command-char '(?_ ?n))
+     ((memq last-command-event '(?_ ?n))
       (goto-char (minibuffer-prompt-end))
       (if (and (search-forward " +/- " nil t)
 	       (not (search-forward "e" nil t)))
@@ -2257,7 +2257,7 @@
 	    (delete-char 1)
 	  (insert "-")))
       (goto-char (point-max)))
-     ((eq last-command-char ?p)
+     ((eq last-command-event ?p)
       (if (or (calc-minibuffer-contains ".*\\+/-.*")
 	      (calc-minibuffer-contains ".*mod.*")
 	      (calc-minibuffer-contains ".*#.*")
@@ -2266,7 +2266,7 @@
 	(if (not (calc-minibuffer-contains ".* \\'"))
 	    (insert " "))
 	(insert "+/- ")))
-     ((and (eq last-command-char ?M)
+     ((and (eq last-command-event ?M)
 	   (not (calc-minibuffer-contains
 		 "[-+]?\\(2[3-9]\\|[3-9][0-9]\\)#.*")))
       (if (or (calc-minibuffer-contains ".*\\+/-.*")
@@ -2281,25 +2281,25 @@
 	      (insert " "))
 	  (insert "mod "))))
      (t
-      (insert (char-to-string last-command-char))
+      (insert (char-to-string last-command-event))
       (if (or (and (calc-minibuffer-contains "[-+]?\\(.*\\+/- *\\|.*mod *\\)?\\([0-9][0-9]?\\)#[0-9a-zA-Z]*\\(:[0-9a-zA-Z]*\\(:[0-9a-zA-Z]*\\)?\\|.[0-9a-zA-Z]*\\(e[-+]?[0-9]*\\)?\\)?\\'")
 		   (let ((radix (string-to-number
 				 (buffer-substring
 				  (match-beginning 2) (match-end 2)))))
 		     (and (>= radix 2)
 			  (<= radix 36)
-			  (or (memq last-command-char '(?# ?: ?. ?e ?+ ?-))
+			  (or (memq last-command-event '(?# ?: ?. ?e ?+ ?-))
 			      (let ((dig (math-read-radix-digit
-					  (upcase last-command-char))))
+					  (upcase last-command-event))))
 				(and dig
 				     (< dig radix)))))))
 	      (calc-minibuffer-contains
 	       "[-+]?\\(.*\\+/- *\\|.*mod *\\)?\\([0-9]+\\.?0*[@oh] *\\)?\\([0-9]+\\.?0*['m] *\\)?[0-9]*\\(\\.?[0-9]*\\(e[-+]?[0-3]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?\\)?\\|[0-9]:\\([0-9]+:\\)?[0-9]*\\)?[\"s]?\\'"))
-	  (if (and (memq last-command-char '(?@ ?o ?h ?\' ?m))
+	  (if (and (memq last-command-event '(?@ ?o ?h ?\' ?m))
 		   (string-match " " calc-hms-format))
 	      (insert " "))
 	(if (and (eq this-command last-command)
-		 (eq last-command-char ?.))
+		 (eq last-command-event ?.))
 	    (progn
 	      (require 'calc-ext)
 	      (calc-digit-dots))
@@ -2307,7 +2307,7 @@
 	  (beep)
 	  (calc-temp-minibuffer-message " [Bad format]"))))))
   (setq calc-prev-prev-char calc-prev-char
-	calc-prev-char last-command-char))
+	calc-prev-char last-command-event))
 
 
 (defun calcDigit-backspace ()
@@ -2324,7 +2324,7 @@
 	(t (backward-delete-char 1)))
   (if (= (calc-minibuffer-size) 0)
       (progn
-	(setq last-command-char 13)
+	(setq last-command-event 13)
 	(calcDigit-nondigit))))