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

[Werner LEMBERG]

Index: emacs/lisp/calc/calc-forms.el
diff -c emacs/lisp/calc/calc-forms.el:1.12 emacs/lisp/calc/calc-forms.el:1.13
*** emacs/lisp/calc/calc-forms.el:1.12  Tue Nov 30 17:08:20 2004
--- emacs/lisp/calc/calc-forms.el       Fri Mar 25 08:16:06 2005
***************
*** 1,6 ****
  ;;; calc-forms.el --- data format conversion functions for Calc
  
! ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, 
Inc.
  
  ;; Author: David Gillespie <address@hidden>
  ;; Maintainer: Jay Belanger <address@hidden>
--- 1,7 ----
  ;;; calc-forms.el --- data format conversion functions for Calc
  
! ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004, 2005
! ;; Free Software Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
  ;; Maintainer: Jay Belanger <address@hidden>
***************
*** 1434,1440 ****
  (defun calcFunc-badd (a b)
    (if (eq (car-safe b) 'date)
        (if (eq (car-safe a) 'date)
!         (math-reject-arg nil "*Illegal combination in date arithmetic")
        (calcFunc-badd b a))
      (if (eq (car-safe a) 'date)
        (if (Math-realp b)
--- 1435,1441 ----
  (defun calcFunc-badd (a b)
    (if (eq (car-safe b) 'date)
        (if (eq (car-safe a) 'date)
!         (math-reject-arg nil "*Invalid combination in date arithmetic")
        (calcFunc-badd b a))
      (if (eq (car-safe a) 'date)
        (if (Math-realp b)
***************
*** 1452,1458 ****
                (if hours
                    (setq b (math-div b (cdr hours))))
                (calcFunc-badd a b))
!           (math-reject-arg nil "*Illegal combination in date arithmetic")))
        (math-reject-arg a 'datep))))
  
  (defun calcFunc-holiday (a)
--- 1453,1459 ----
                (if hours
                    (setq b (math-div b (cdr hours))))
                (calcFunc-badd a b))
!           (math-reject-arg nil "*Invalid combination in date arithmetic")))
        (math-reject-arg a 'datep))))
  
  (defun calcFunc-holiday (a)