mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Code Issues Projects Releases Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
Jay Belanger 2007-06-22 06:02:50 +00:00
parent 37b5443868
commit cebd3c8a27
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lisp/calc/calc-forms.el
View file

@ -561,12 +561,12 @@
(math-format-number
(math-add math-fd-date
(eval-when-compile
(math-read-number "1.7214235")))))
(math-read-number-simple "1.7214235")))))
((eq x 'j)
(math-format-number (math-add
(math-floor math-fd-date)
(eval-when-compile
(math-read-number "1721424")))))
(math-read-number-simple "1721424")))))
((eq x 'U)
(math-format-number (nth 1 (math-date-parts math-fd-date 719164))))
((progn
@ -942,9 +942,9 @@
(if (or (eq this 'j)
(math-integerp num))
(eval-when-compile
(math-read-number "1721424"))
(math-read-number-simple "1721424"))
(eval-when-compile
(math-read-number "1.7214235")))))
(math-read-number-simple "1.7214235")))))
hour (or (nth 3 num) hour)
minute (or (nth 4 num) minute)
second (or (nth 5 num) second)
@ -1154,19 +1154,19 @@
(if (math-realp date)
(list 'date (if (math-integerp date)
(math-sub date (eval-when-compile
(math-read-number "1721424")))
(math-read-number-simple "1721424")))
(setq date (math-sub date
(eval-when-compile
(math-read-number "1.7214235"))))
(math-read-number-simple "1.7214235"))))
(math-sub date (math-div (calcFunc-tzone zone date)
'(float 864 2)))))
(if (eq (car date) 'date)
(math-add (nth 1 date) (if (math-integerp (nth 1 date))
(eval-when-compile
(math-read-number "1721424"))
(math-read-number-simple "1721424"))
(math-add
(eval-when-compile
(math-read-number "1.7214235"))
(math-read-number-simple "1.7214235"))
(math-div (calcFunc-tzone zone date)
'(float 864 2)))))
(math-reject-arg date 'datep))))