Add 2007 to copyright years.

[gnu-emacs] / lisp / calc / calc-mode.el

diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index 9d26ea50e45261cb49324b15620bf5f90bf0739b..14cb3c746d51a81926f57f359f9a60b3ef1c83b7 100644 (file)
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -1,9 +1,10 @@
 ;;; calc-mode.el --- calculator modes for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainer: Colin Walters <walters@debian.org>
+;; Maintainer: Jay Belanger <belanger@truman.edu>
 
 ;; This file is part of GNU Emacs.
 
@@ -26,15 +27,11 @@
 
 ;;; Code:
 
-
 ;; This file is autoloaded from calc-ext.el.
-(require 'calc-ext)
 
+(require 'calc-ext)
 (require 'calc-macs)
 
-(defun calc-Need-calc-mode () nil)
-
-
 (defun calc-line-numbering (n)
   (interactive "P")
   (calc-wrapper
@@ -267,7 +264,7 @@
 
 ;;; Mode commands.
 
-(defun calc-save-modes (&optional quiet)
+(defun calc-save-modes ()
   (interactive)
   (calc-wrapper
    (let (pos
@@ -308,34 +305,29 @@
               vals (cdr vals))))
      (run-hooks 'calc-mode-save-hook)
      (insert ";;; End of mode settings\n")
-     (if quiet
-        ;; FIXME: why is this here? -cgw 2001.11.12
-        (let ((executing-kbd-macro ""))   ; what a kludge!
-          (save-buffer))
-       (save-buffer)))))
+     (save-buffer)
+     (if calc-embedded-info
+         (calc-embedded-save-original-modes)))))
 
 (defun calc-settings-file-name (name &optional arg)
   (interactive
    (list (read-file-name (format "Settings file name (normally %s): "
-                                (abbreviate-file-name (or user-init-file
-                                                          "~/.emacs"))))
+                                (abbreviate-file-name calc-settings-file)))
         current-prefix-arg))
   (calc-wrapper
    (setq arg (if arg (prefix-numeric-value arg) 0))
-   (if (equal name "")
+   (if (string-equal (file-name-nondirectory name) "")
        (message "Calc settings file is \"%s\"" calc-settings-file)
      (if (< (math-abs arg) 2)
         (let ((list calc-mode-var-list))
           (while list
             (set (car (car list)) (nth 1 (car list)))
             (setq list (cdr list)))))
-     ;; FIXME: we should use ~/.calc or so in order to avoid
-     ;; reexecuting ~/.emacs (it's not always idempotent) -cgw 2001.11.12
      (setq calc-settings-file name)
      (or (and
          calc-settings-file
-         (string-match "\\.emacs" calc-settings-file)
-             (> arg 0))
+          (equal user-init-file calc-settings-file)
+          (> arg 0))
         (< arg 0)
         (load name t)
         (message "New file")))))
@@ -360,6 +352,7 @@
        (if (eq calc-complex-mode 'polar) 1 0)
        (cond ((eq calc-matrix-mode 'scalar) 0)
              ((eq calc-matrix-mode 'matrix) -2)
+             ((eq calc-matrix-mode 'sqmatrix) -3)
              (calc-matrix-mode)
              (t -1))
        (cond ((eq calc-simplify-mode 'none) -1)
@@ -416,7 +409,8 @@
                           ((= n 4) 'global)
                           ((= n 5) 'save)
                           (t 'local)))
-   (message (cond ((and (eq calc-mode-save-mode 'local) calc-embedded-info)
+   (message "%s" 
+           (cond ((and (eq calc-mode-save-mode 'local) calc-embedded-info)
                   "Recording mode changes with [calc-mode: ...]")
                  ((eq calc-mode-save-mode 'edit)
                   "Recording mode changes with [calc-edit-mode: ...]")
@@ -432,8 +426,6 @@
 
 (defun calc-total-algebraic-mode (flag)
   (interactive "P")
-  (if calc-emacs-type-19
-      (error "Total algebraic mode not yet supported for Emacs 19"))
   (calc-wrapper
    (if (eq calc-algebraic-mode 'total)
        (calc-algebraic-mode nil)
@@ -462,7 +454,7 @@
 (defun calc-symbolic-mode (n)
   (interactive "P")
   (calc-wrapper
-   
+
    (message (if (calc-change-mode 'calc-symbolic-mode n nil t)
                "Inexact computations like sqrt(2) are deferred"
              "Numerical computations are always done immediately"))))
@@ -485,7 +477,9 @@
                     (cond ((eq arg 0) 'scalar)
                           ((< (prefix-numeric-value arg) 1)
                            (and (< (prefix-numeric-value arg) -1) 'matrix))
-                          (arg (prefix-numeric-value arg))
+                          (arg 
+                            (if (consp arg) 'sqmatrix
+                              (prefix-numeric-value arg)))
                           ((eq calc-matrix-mode 'matrix) 'scalar)
                           ((eq calc-matrix-mode 'scalar) nil)
                           (t 'matrix)))
@@ -494,9 +488,11 @@
                calc-matrix-mode calc-matrix-mode)
      (message (if (eq calc-matrix-mode 'matrix)
                  "Variables are assumed to be matrices"
-               (if calc-matrix-mode
-                   "Variables are assumed to be scalars (non-matrices)"
-                 "Variables are not assumed to be matrix or scalar"))))))
+                (if (eq calc-matrix-mode 'sqmatrix)
+                    "Variables are assumed to be square matrices"
+                  (if calc-matrix-mode
+                      "Variables are assumed to be scalars (non-matrices)"
+                    "Variables are not assumed to be matrix or scalar")))))))
 
 (defun calc-set-simplify-mode (mode arg msg)
   (calc-change-mode 'calc-simplify-mode
@@ -677,4 +673,7 @@
         (error "Unrecognized character: %c" (aref arg bad)))
      (calc-change-mode 'calc-matrix-brackets code t))))
 
+(provide 'calc-mode)
+
+;;; arch-tag: ecc70eea-c712-43f2-9085-4205e58d6ddf
 ;;; calc-mode.el ends here