[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog calc/calc-aent.el calc/cal...
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog calc/calc-aent.el calc/cal... |
|
Date: |
Fri, 09 Jan 2009 03:57:17 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/01/09 03:57:16
Modified files:
lisp : ChangeLog
lisp/calc : calc-aent.el calc-ext.el calc-incom.el
calc-keypd.el calc-misc.el calc-prog.el
calc-sel.el calc-store.el calc-stuff.el
calc-units.el calc-yank.el calc.el
Log message:
Replace last-command-char with last-command-event.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15064&r2=1.15065
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-aent.el?cvsroot=emacs&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-ext.el?cvsroot=emacs&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-incom.el?cvsroot=emacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-keypd.el?cvsroot=emacs&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-misc.el?cvsroot=emacs&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-prog.el?cvsroot=emacs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-sel.el?cvsroot=emacs&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-store.el?cvsroot=emacs&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-stuff.el?cvsroot=emacs&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-units.el?cvsroot=emacs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-yank.el?cvsroot=emacs&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc.el?cvsroot=emacs&r1=1.121&r2=1.122
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15064
retrieving revision 1.15065
diff -u -b -r1.15064 -r1.15065
--- ChangeLog 9 Jan 2009 03:28:56 -0000 1.15064
+++ ChangeLog 9 Jan 2009 03:57:12 -0000 1.15065
@@ -3,6 +3,12 @@
* subr.el (last-input-char, last-command-char):
Move here from src/keyboard.c.
+ * calc/calc-aent.el, calc/calc-ext.el, calc/calc-incom.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-units.el, calc/calc-yank.el, calc/calc.el:
+ Replace last-command-char with last-command-event.
+
2009-01-09 Dave Love <address@hidden>
* calendar/time-date.el: Require cl for `declare'.
Index: calc/calc-aent.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-aent.el,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- calc/calc-aent.el 5 Jan 2009 03:19:59 -0000 1.49
+++ calc/calc-aent.el 9 Jan 2009 03:57:14 -0000 1.50
@@ -109,7 +109,7 @@
(setq buf long))))
(calc-handle-whys)
(message "Result: %s" buf)))
- (if (eq last-command-char 10)
+ (if (eq last-command-event 10)
(insert shortbuf)
(kill-new shortbuf)))))
@@ -279,7 +279,7 @@
(calc-wrapper
(let ((calc-language (if prefix nil calc-language))
(math-expr-opers (if prefix (math-standard-ops) (math-expr-ops))))
- (calc-alg-entry (and auto (char-to-string last-command-char))))))
+ (calc-alg-entry (and auto (char-to-string last-command-event))))))
(defvar calc-alg-entry-history nil
"History for algebraic entry.")
@@ -296,7 +296,7 @@
(progn
(require 'calc-ext)
(calc-alg-edit alg-exp))
- (let* ((calc-simplify-mode (if (eq last-command-char ?\C-j)
+ (let* ((calc-simplify-mode (if (eq last-command-event ?\C-j)
'none
calc-simplify-mode))
(nvals (mapcar 'calc-normalize alg-exp)))
@@ -468,12 +468,12 @@
;;;###autoload
(defun calc-alg-digit-entry ()
(calc-alg-entry
- (cond ((eq last-command-char ?e)
+ (cond ((eq last-command-event ?e)
(if (> calc-number-radix 14) (format "%d.^" calc-number-radix) "1e"))
- ((eq last-command-char ?#) (format "%d#" calc-number-radix))
- ((eq last-command-char ?_) "-")
- ((eq last-command-char ?@) "0@ ")
- (t (char-to-string last-command-char)))))
+ ((eq last-command-event ?#) (format "%d#" calc-number-radix))
+ ((eq last-command-event ?_) "-")
+ ((eq last-command-event ?@) "0@ ")
+ (t (char-to-string last-command-event)))))
;; The variable calc-digit-value is initially declared in calc.el,
;; but can be set by calcDigit-algebraic and calcDigit-edit.
Index: calc/calc-ext.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-ext.el,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- calc/calc-ext.el 5 Jan 2009 03:20:00 -0000 1.78
+++ calc/calc-ext.el 9 Jan 2009 03:57:14 -0000 1.79
@@ -1446,26 +1446,26 @@
(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)
Index: calc/calc-incom.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-incom.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- calc/calc-incom.el 5 Jan 2009 03:20:01 -0000 1.20
+++ calc/calc-incom.el 9 Jan 2009 03:57:15 -0000 1.21
@@ -180,7 +180,7 @@
(if (calc-minibuffer-contains ".*\\.\\'")
(delete-backward-char 1))
(setq calc-prev-char 'dots
- last-command-char 32)
+ last-command-event 32)
(if calc-prev-prev-char
(calcDigit-nondigit)
(setq calc-digit-value nil)
Index: calc/calc-keypd.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-keypd.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- calc/calc-keypd.el 5 Jan 2009 03:20:01 -0000 1.22
+++ calc/calc-keypd.el 9 Jan 2009 03:57:15 -0000 1.23
@@ -608,7 +608,7 @@
negative-argument))
(and prefix (string-match "\\`\e?[-0-9]\\'" keys)))
(progn
- (setq last-command-char (aref keys (1- (length keys))))
+ (setq last-command-event (aref keys (1- (length keys))))
(command-execute cmd)
(setq flush 'not-any-more
prefix t
Index: calc/calc-misc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-misc.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- calc/calc-misc.el 5 Jan 2009 03:20:08 -0000 1.37
+++ calc/calc-misc.el 9 Jan 2009 03:57:15 -0000 1.38
@@ -472,8 +472,8 @@
loaded and the keystroke automatically re-typed."
(interactive "P")
(require 'calc-ext)
- (if (keymapp (key-binding (char-to-string last-command-char)))
- (message "%s%c-" (calc-num-prefix-name n) last-command-char))
+ (if (keymapp (key-binding (char-to-string last-command-event)))
+ (message "%s%c-" (calc-num-prefix-name n) last-command-event))
(calc-unread-command)
(setq prefix-arg n))
@@ -491,7 +491,7 @@
(interactive)
(if (calc-minibuffer-contains "[-+]?\\(1[1-9]\\|[2-9][0-9]\\)#.*")
(progn
- (setq last-command-char (upcase last-command-char))
+ (setq last-command-event (upcase last-command-event))
(calcDigit-key))
(calcDigit-nondigit)))
Index: calc/calc-prog.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-prog.el,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- calc/calc-prog.el 5 Jan 2009 03:20:17 -0000 1.45
+++ calc/calc-prog.el 9 Jan 2009 03:57:15 -0000 1.46
@@ -1285,7 +1285,7 @@
(let* ((count 0)
(parts nil)
(body "")
- (open last-command-char)
+ (open last-command-event)
(counter initial)
ch)
(or executing-kbd-macro
Index: calc/calc-sel.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-sel.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- calc/calc-sel.el 5 Jan 2009 03:20:19 -0000 1.23
+++ calc/calc-sel.el 9 Jan 2009 03:57:15 -0000 1.24
@@ -132,7 +132,7 @@
(defun calc-select-part (num)
(interactive "P")
- (or num (setq num (- last-command-char ?0)))
+ (or num (setq num (- last-command-event ?0)))
(calc-wrapper
(calc-prepare-selection)
(let ((sel (calc-find-nth-part (or (nth 2 calc-selection-cache-entry)
Index: calc/calc-store.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-store.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- calc/calc-store.el 5 Jan 2009 03:20:22 -0000 1.31
+++ calc/calc-store.el 9 Jan 2009 03:57:15 -0000 1.32
@@ -381,15 +381,15 @@
(defun calc-store-quick ()
(interactive)
- (calc-store (intern (format "var-q%c" last-command-char))))
+ (calc-store (intern (format "var-q%c" last-command-event))))
(defun calc-store-into-quick ()
(interactive)
- (calc-store-into (intern (format "var-q%c" last-command-char))))
+ (calc-store-into (intern (format "var-q%c" last-command-event))))
(defun calc-recall-quick ()
(interactive)
- (calc-recall (intern (format "var-q%c" last-command-char))))
+ (calc-recall (intern (format "var-q%c" last-command-event))))
(defun calc-copy-special-constant (&optional sconst var)
(interactive)
Index: calc/calc-stuff.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-stuff.el,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- calc/calc-stuff.el 5 Jan 2009 03:20:24 -0000 1.24
+++ calc/calc-stuff.el 9 Jan 2009 03:57:15 -0000 1.25
@@ -210,9 +210,9 @@
(interactive "P")
(calc-clean (- (if num
(prefix-numeric-value num)
- (if (and (>= last-command-char ?0)
- (<= last-command-char ?9))
- (- last-command-char ?0)
+ (if (and (>= last-command-event ?0)
+ (<= last-command-event ?9))
+ (- last-command-event ?0)
(error "Number required"))))))
Index: calc/calc-units.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-units.el,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- calc/calc-units.el 5 Jan 2009 03:20:27 -0000 1.45
+++ calc/calc-units.el 9 Jan 2009 03:57:15 -0000 1.46
@@ -349,7 +349,7 @@
(defun calc-quick-units ()
(interactive)
(calc-slow-wrapper
- (let* ((num (- last-command-char ?0))
+ (let* ((num (- last-command-event ?0))
(pos (if (= num 0) 10 num))
(units (calc-var-value 'var-Units))
(expr (calc-top-n 1)))
Index: calc/calc-yank.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-yank.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- calc/calc-yank.el 5 Jan 2009 03:20:28 -0000 1.33
+++ calc/calc-yank.el 9 Jan 2009 03:57:16 -0000 1.34
@@ -489,7 +489,7 @@
(insert str))
(let ((i 0))
(while (< i (length str))
- (if (= (setq last-command-char (aref str i)) ?\n)
+ (if (= (setq last-command-event (aref str i)) ?\n)
(or (= i (1- (length str)))
(let ((pt (point)))
(end-of-line)
@@ -702,7 +702,7 @@
(if calc-edit-disp-trail
(calc-trail-display 1 t))
(and vals
- (let ((calc-simplify-mode (if (eq last-command-char ?\C-j)
+ (let ((calc-simplify-mode (if (eq last-command-event ?\C-j)
'none
calc-simplify-mode)))
(if (>= num 0)
Index: calc/calc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc.el,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- calc/calc.el 5 Jan 2009 03:20:28 -0000 1.121
+++ calc/calc.el 9 Jan 2009 03:57:16 -0000 1.122
@@ -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 "address@hidden"))
(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 *\\)?\\(address@hidden
*\\)?\\([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))))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog calc/calc-aent.el calc/cal...,
Glenn Morris <=