[Emacs-diffs] Changes to emacs/lisp/calc/calc-maint.el

[Colin Walters]

Index: emacs/lisp/calc/calc-maint.el
diff -u emacs/lisp/calc/calc-maint.el:1.2 emacs/lisp/calc/calc-maint.el:1.3
--- emacs/lisp/calc/calc-maint.el:1.2   Wed Nov 14 04:05:11 2001
+++ emacs/lisp/calc/calc-maint.el       Mon Nov 19 02:36:01 2001
@@ -1,6 +1,9 @@
-;; Calculator for GNU Emacs, maintenance routines
+;;; calc-maint.el --- maintenance routines for Calc
+
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
-;; Written by Dave Gillespie, address@hidden
+
+;; Author: David Gillespie <address@hidden>
+;; Maintainer: Colin Walters <address@hidden>
 
 ;; This file is part of GNU Emacs.
 
@@ -18,9 +21,10 @@
 ;; can know your rights and responsibilities.  It should be in a
 ;; file named COPYING.  Among other things, the copyright notice
 ;; and this notice must be preserved on all copies.
-
 
+;;; Commentary:
 
+;;; Code:
 
 (defun calc-compile ()
   "Compile all parts of Calc.
@@ -58,7 +62,7 @@
     ;; Make sure we're in the right directory.
     (find-file "calc.el")
     (if (= (buffer-size) 0)
-       (error "This command must be used in the Calc source directory."))
+       (error "This command must be used in the Calc source directory"))
 
     ;; Make sure current directory is in load-path.
     (setq load-path (cons default-directory load-path))
@@ -82,7 +86,7 @@
                  (setq changed-units t))
              (or message-bug (message ""))
              (byte-compile-file (car files)))
-         (message "File %s is up to date." (car files)))
+         (message "File %s is up to date" (car files)))
        (if (string-match "calc\\(-ext\\)?.el" (car files))
            (load (concat (car files) "c") nil t t))
        (setq files (cdr files))))
@@ -132,7 +136,7 @@
                            (sort rules 'string<))
                    (save-buffer))))
          (error (message "Unable to pre-build tables %s" err))))
-    (message "Done.  Don't forget to install with \"make public\" or \"make 
private\".")))
+    (message "Done.  Don't forget to install with \"make public\" or \"make 
private\"")))
 
 (defun calc-compile-message (fmt &rest args)
   (cond ((and (= (length args) 2)
@@ -158,8 +162,8 @@
              (= (length args) 1)
              (stringp (car args))
              (string-match ".elc?\\'" (car args)))
-        (or (string-match "Saving file %s..." fmt)
-            (funcall old-message fmt (file-name-nondirectory (car args)))))
+        (unless (string-match "Saving file %s..." fmt)
+          (funcall old-message fmt (file-name-nondirectory (car args)))))
        ((string-match "\\(Preparing\\|Building\\).*\\.\\.\\.$" fmt)
         (send-string-to-terminal (apply 'format fmt args)))
        ((string-match "\\(Preparing\\|Building\\).*\\.\\.\\. *done$" fmt)
@@ -203,7 +207,7 @@
   (or (let ((case-fold-search t))
        (string-match "calc\\.texinfo" (buffer-name)))
       force
-      (error "This command should be used in the calc.texinfo buffer."))
+      (error "This command should be used in the calc.texinfo buffer"))
   (let ((srcbuf (current-buffer))
        tutpos refpos endpos (maxpos (point-max)))
     (goto-char 1)
@@ -278,7 +282,7 @@
   (or (let ((case-fold-search t))
        (string-match "calc\\.texinfo" (buffer-name)))
       force
-      (error "This command should be used in the calc.texinfo buffer."))
+      (error "This command should be used in the calc.texinfo buffer"))
   (let ((srcbuf (current-buffer))
        begpos sumpos endpos midpos)
     (goto-char 1)
@@ -402,7 +406,8 @@
                (not (file-exists-p
                      (setq name (expand-file-name "default.el" (car p))))))
       (setq p (cdr p)))
-    (or p (error "Unable to find \"default\" file.  Create one and try 
again."))
+    (unless p
+      (error "Unable to find \"default\" file.  Create one and try again"))
     (find-file name)
     (if buffer-read-only (error "No write permission for \"%s\"" 
buffer-file-name))
     (goto-char (point-max))