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

[Colin Walters]

Index: emacs/lisp/calc/calc-forms.el
diff -u emacs/lisp/calc/calc-forms.el:1.2 emacs/lisp/calc/calc-forms.el:1.3
--- emacs/lisp/calc/calc-forms.el:1.2   Wed Nov 14 04:04:02 2001
+++ emacs/lisp/calc/calc-forms.el       Mon Nov 19 02:33:36 2001
@@ -1,6 +1,9 @@
-;; Calculator for GNU Emacs, part II [calc-forms.el]
+;;; calc-forms.el --- data format conversion functions 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.
 
@@ -19,7 +22,9 @@
 ;; file named COPYING.  Among other things, the copyright notice
 ;; and this notice must be preserved on all copies.
 
+;;; Commentary:
 
+;;; Code:
 
 ;; This file is autoloaded from calc-ext.el.
 (require 'calc-ext)
@@ -69,7 +74,7 @@
                                   "%s" (math-match-substring fmt 5))
                           t)
         (setq-default calc-hms-format calc-hms-format))  ; for minibuffer
-     (error "Bad hours-minutes-seconds format."))))
+     (error "Bad hours-minutes-seconds format"))))
 
 (defun calc-date-notation (fmt arg)
   (interactive "sDate format (e.g., M/D/YY h:mm:ss): \nP")
@@ -154,7 +159,7 @@
   (interactive)
   (calc-wrapper
    (calc-change-mode 'calc-angle-mode 'hms)
-   (message "Angles measured in degrees-minutes-seconds.")))
+   (message "Angles measured in degrees-minutes-seconds")))
 
 
 (defun calc-now (arg)
@@ -503,6 +508,7 @@
                                  "Jul" "Aug" "Sep" "Oct" "Nov" "Dec" ))
 
 
+(defvar math-format-date-cache nil)
 (defun math-format-date (date)
   (if (eq (car-safe date) 'date)
       (setq date (nth 1 date)))
@@ -521,7 +527,6 @@
          (and (setq dt (nthcdr 10 math-format-date-cache))
               (setcdr dt nil))
          fmt))))
-(setq math-format-date-cache nil)
 
 (defun math-format-date-part (x)
   (cond ((stringp x)
@@ -1399,6 +1404,8 @@
                    (if (and (cdr db) (not (cdr da))) 1 0))))
     (calcFunc-badd a (math-neg b))))
 
+(defvar math-holidays-cache nil)
+(defvar math-holidays-cache-tag t)
 (defun calcFunc-badd (a b)
   (if (eq (car-safe b) 'date)
       (if (eq (car-safe a) 'date)
@@ -1425,11 +1432,6 @@
 
 (defun calcFunc-holiday (a)
   (if (cdr (math-to-business-day a)) 1 0))
-
-
-(setq math-holidays-cache nil)
-(setq math-holidays-cache-tag t)
-
 
 ;;; Compute the number of business days since Jan 1, 1 AD.