Update copyright date.

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

diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index 5febb343e3f731b93e61caec9606cddbda36e64a..389b52385b688c42143c52e0cfea983e871e6331 100644 (file)
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -3,8 +3,7 @@
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainers: D. Goel <deego@gnufans.org>
-;;              Colin Walters <walters@debian.org>
+;; Maintainer: Jay Belanger <belanger@truman.edu>
 
 ;; This file is part of GNU Emacs.
 
@@ -27,15 +26,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
@@ -314,25 +309,22 @@
 (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")))))
@@ -429,8 +421,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)
@@ -674,4 +664,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