mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

(math-format-date-part,calc-parse-standard-date,calcFunc-julian):

Browse Source 
Fix incorrect number used in calculations.
This commit is contained in:
Jay Belanger 2007-06-22 15:05:08 +00:00
parent 512eb16107
commit 092c493633
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2007-06-22 Jay Belanger <jay.p.belanger@gmail.com>
* calc/calc-forms.el (math-format-date-part)
(calc-parse-standard-date,calcFunc-julian): Fix incorrect number
used in calculations.
2007-06-22 Thien-Thi Nguyen <ttn@gnuvola.org> 2007-06-22 Thien-Thi Nguyen <ttn@gnuvola.org>
* simple.el (next-error-recenter): New defcustom. * simple.el (next-error-recenter): New defcustom.

8
lisp/calc/calc-forms.el
View File

@ -561,7 +561,7 @@
(math-format-number (math-format-number
(math-add math-fd-date (math-add math-fd-date
(eval-when-compile (eval-when-compile
(math-read-number-simple "1.7214235"))))) (math-read-number-simple "1721423.5")))))
((eq x 'j) ((eq x 'j)
(math-format-number (math-add (math-format-number (math-add
(math-floor math-fd-date) (math-floor math-fd-date)
@ -944,7 +944,7 @@
(eval-when-compile (eval-when-compile
(math-read-number-simple "1721424")) (math-read-number-simple "1721424"))
(eval-when-compile (eval-when-compile
(math-read-number-simple "1.7214235"))))) (math-read-number-simple "1721423.5")))))
hour (or (nth 3 num) hour) hour (or (nth 3 num) hour)
minute (or (nth 4 num) minute) minute (or (nth 4 num) minute)
second (or (nth 5 num) second) second (or (nth 5 num) second)
@ -1157,7 +1157,7 @@
(math-read-number-simple "1721424"))) (math-read-number-simple "1721424")))
(setq date (math-sub date (setq date (math-sub date
(eval-when-compile (eval-when-compile
(math-read-number-simple "1.7214235")))) (math-read-number-simple "1721423.5"))))
(math-sub date (math-div (calcFunc-tzone zone date) (math-sub date (math-div (calcFunc-tzone zone date)
'(float 864 2))))) '(float 864 2)))))
(if (eq (car date) 'date) (if (eq (car date) 'date)
@ -1166,7 +1166,7 @@
(math-read-number-simple "1721424")) (math-read-number-simple "1721424"))
(math-add (math-add
(eval-when-compile (eval-when-compile
(math-read-number-simple "1.7214235")) (math-read-number-simple "1721423.5"))
(math-div (calcFunc-tzone zone date) (math-div (calcFunc-tzone zone date)
'(float 864 2))))) '(float 864 2)))))
(math-reject-arg date 'datep)))) (math-reject-arg date 'datep))))