Changeset 4131 for trunk/lisp/calc/calc-aent.el

Timestamp:

2006年07月29日 07時48分34秒 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/calc/calc-aent.el (modified) (9 diffs)

trunk/lisp/calc/calc-aent.el

@@ -33 +33 @@
-(require 'calc-macs)
-
+(defvar calc-quick-calc-history nil
+  "The history list for quick-calc.")
+
-(defun calc-do-quick-calc ()
+  (require 'calc-ext)
-  (calc-check-defines)
-  (if (eq major-mode 'calc-mode)
@@ -46 +50 @@
-               (calc-language (if (memq calc-language '(nil big))
-                                  'flat calc-language))
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-          (when (and (= (length alg-exp) 1)
-                     (eq (car-safe (car alg-exp)) 'calcFunc-assign)
-                     (= (length (car alg-exp)) 3)
-                     (eq (car-safe (nth 1 (car alg-exp))) 'var))
-            (require 'calc-ext)
-            (set (nth 2 (nth 1 (car alg-exp))) (nth 2 (car alg-exp)))
-            (calc-refresh-evaltos (nth 2 (nth 1 (car alg-exp))))
@@ -265 +258 @@
-     (calc-alg-entry (and auto (char-to-string last-command-char))))))
-
+(defvar calc-alg-entry-history nil
+  "History for algebraic entry.")
+
-(defun calc-alg-entry (&optional initial prompt)
-  (let* ((sel-mode nil)
@@ -271 +267 @@
-         (calc-dollar-used 0)
-         (calc-plain-entry t)
-
+ 'calc-alg-entry-history
-    (if (stringp alg-exp)
-        (progn
@@ -302 +298 @@
-(defvar calc-alg-exp)
-
-
+ history
-  (let* ((calc-buffer (current-buffer))
-         (blink-paren-function 'calcAlg-blink-matching-open)
@@ -320 +316 @@
-    (if (eq calc-algebraic-mode 'total)
-        (define-key calc-alg-ent-map "\e" calc-alg-ent-esc-map)
-p
++
-      (define-key calc-alg-ent-map "\em" 'calcAlg-mod)
-      (define-key calc-alg-ent-map "\e=" 'calcAlg-equals)
-      (define-key calc-alg-ent-map "\e\r" 'calcAlg-equals)
+      (define-key calc-alg-ent-map "\ep" 'previous-history-element)
+      (define-key calc-alg-ent-map "\en" 'next-history-element)
-      (define-key calc-alg-ent-map "\e%" 'self-insert-command))
-    (setq calc-aborted-prefix nil)
-    (let ((buf (read-from-minibuffer (or prompt "Algebraic: ")
-                                     (or initial "")
-
+ history
-      (when (eq calc-alg-exp 'error)
-        (when (eq (car-safe (setq calc-alg-exp (math-read-exprs buf))) 'error)
@@ -356 +354 @@
-  (interactive)
-  (if (calc-minibuffer-contains "\\'")
-
-
-
+
-    (insert "'")))
-
@@ -385 +381 @@
-      (insert "`")
-    (setq calc-alg-exp (minibuffer-contents))
-    (and (> (length calc-alg-exp) 0) (setq calc-previous-alg-entry calc-alg-exp))
-    (exit-minibuffer)))
-
@@ -408 +403 @@
-                        '((incomplete vec))
-                      exp))
-      (and (> (length str) 0) (setq calc-previous-alg-entry str))
-      (exit-minibuffer))))
-