aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2007-03-19 09:57:30 +0000
committerKim F. Storm2007-03-19 09:57:30 +0000
commitd55ebb63f03d124c98cea27c469f5b452c68e67f (patch)
tree6f25b2c8f516e3b44055ed95c7b23cf2a3bb2400
parent1c8f28b0b0ede18bc6b3ef280a654b20eecaa4dd (diff)
downloademacs-d55ebb63f03d124c98cea27c469f5b452c68e67f.tar.gz
emacs-d55ebb63f03d124c98cea27c469f5b452c68e67f.zip
(math-std-daylight-savings)
(math-std-daylight-savings-old): Doc fix.
-rw-r--r--lisp/calc/calc-forms.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 0adbbe0f558..5aa3158d044 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -508,7 +508,7 @@
508 508
509(defvar math-format-date-cache nil) 509(defvar math-format-date-cache nil)
510 510
511;; The variables math-fd-date, math-fd-dt, math-fd-year, 511;; The variables math-fd-date, math-fd-dt, math-fd-year,
512;; math-fd-month, math-fd-day, math-fd-weekday, math-fd-hour, 512;; math-fd-month, math-fd-day, math-fd-weekday, math-fd-hour,
513;; math-fd-minute, math-fd-second, math-fd-bc-flag are local 513;; math-fd-minute, math-fd-second, math-fd-bc-flag are local
514;; to math-format-date, but are used by math-format-date-part, 514;; to math-format-date, but are used by math-format-date-part,
@@ -533,7 +533,7 @@
533 (calc-group-digits nil) 533 (calc-group-digits nil)
534 (calc-leading-zeros nil) 534 (calc-leading-zeros nil)
535 (calc-number-radix 10) 535 (calc-number-radix 10)
536 math-fd-year math-fd-month math-fd-day math-fd-weekday 536 math-fd-year math-fd-month math-fd-day math-fd-weekday
537 math-fd-hour math-fd-minute math-fd-second 537 math-fd-hour math-fd-minute math-fd-second
538 (math-fd-bc-flag nil) 538 (math-fd-bc-flag nil)
539 (fmt (apply 'concat (mapcar 'math-format-date-part 539 (fmt (apply 'concat (mapcar 'math-format-date-part
@@ -570,7 +570,7 @@
570 math-fd-year (car math-fd-dt) 570 math-fd-year (car math-fd-dt)
571 math-fd-month (nth 1 math-fd-dt) 571 math-fd-month (nth 1 math-fd-dt)
572 math-fd-day (nth 2 math-fd-dt) 572 math-fd-day (nth 2 math-fd-dt)
573 math-fd-weekday (math-mod 573 math-fd-weekday (math-mod
574 (math-add (math-floor math-fd-date) 6) 7) 574 (math-add (math-floor math-fd-date) 6) 7)
575 math-fd-hour (nth 3 math-fd-dt) 575 math-fd-hour (nth 3 math-fd-dt)
576 math-fd-minute (nth 4 math-fd-dt) 576 math-fd-minute (nth 4 math-fd-dt)
@@ -784,7 +784,7 @@
784 (while (and (string-match "[-+]?0*[1-9][0-9][0-9][0-9][0-9]+" math-pd-str) 784 (while (and (string-match "[-+]?0*[1-9][0-9][0-9][0-9][0-9]+" math-pd-str)
785 (setq temp (concat (substring math-pd-str 0 (match-beginning 0)) 785 (setq temp (concat (substring math-pd-str 0 (match-beginning 0))
786 (substring math-pd-str (match-end 0)))) 786 (substring math-pd-str (match-end 0))))
787 (string-match 787 (string-match
788 "[4-9][0-9]\\|[0-9][0-9][0-9]\\|[-+][0-9]+[^-]*\\'" temp)) 788 "[4-9][0-9]\\|[0-9][0-9][0-9]\\|[-+][0-9]+[^-]*\\'" temp))
789 (setq math-pd-str temp)) 789 (setq math-pd-str temp))
790 790
@@ -1173,7 +1173,7 @@
1173;;; Note: Longer names must appear before shorter names which are 1173;;; Note: Longer names must appear before shorter names which are
1174;;; substrings of them. 1174;;; substrings of them.
1175(defvar math-tzone-names 1175(defvar math-tzone-names
1176 '(( "UTC" 0 0) 1176 '(( "UTC" 0 0)
1177 ( "MEGT" -1 "MET" "METDST" ) ; Middle Europe 1177 ( "MEGT" -1 "MET" "METDST" ) ; Middle Europe
1178 ( "METDST" -1 -1 ) ( "MET" -1 0 ) 1178 ( "METDST" -1 -1 ) ( "MET" -1 0 )
1179 ( "MEGZ" -1 "MEZ" "MESZ" ) ( "MEZ" -1 0 ) ( "MESZ" -1 -1 ) 1179 ( "MEGZ" -1 "MEZ" "MESZ" ) ( "MEZ" -1 0 ) ( "MESZ" -1 -1 )
@@ -1314,7 +1314,7 @@
1314(defun math-std-daylight-savings (date dt zone bump) 1314(defun math-std-daylight-savings (date dt zone bump)
1315 "Standard North American daylight saving algorithm. 1315 "Standard North American daylight saving algorithm.
1316Before 2007, this uses `math-std-daylight-savings-old', where 1316Before 2007, this uses `math-std-daylight-savings-old', where
1317daylight savings began on the first Sunday of April at 2 a.m., 1317daylight saving began on the first Sunday of April at 2 a.m.,
1318and ended on the last Sunday of October at 2 a.m. 1318and ended on the last Sunday of October at 2 a.m.
1319As of 2007, this uses `math-std-daylight-savings-new', where 1319As of 2007, this uses `math-std-daylight-savings-new', where
1320daylight saving begins on the second Sunday of March at 2 a.m., 1320daylight saving begins on the second Sunday of March at 2 a.m.,
@@ -1345,9 +1345,9 @@ and ends on the first Sunday of November at 2 a.m."
1345 (t 0))) 1345 (t 0)))
1346 1346
1347(defun math-std-daylight-savings-old (date dt zone bump) 1347(defun math-std-daylight-savings-old (date dt zone bump)
1348 "Standard North American daylight savings algorithm before 2007. 1348 "Standard North American daylight saving algorithm before 2007.
1349This implements the rules for the U.S. and Canada. 1349This implements the rules for the U.S. and Canada.
1350Daylight savings begins on the first Sunday of April at 2 a.m., 1350Daylight saving begins on the first Sunday of April at 2 a.m.,
1351and ends on the last Sunday of October at 2 a.m." 1351and ends on the last Sunday of October at 2 a.m."
1352 (cond ((< (nth 1 dt) 4) 0) 1352 (cond ((< (nth 1 dt) 4) 0)
1353 ((= (nth 1 dt) 4) 1353 ((= (nth 1 dt) 4)
@@ -1850,7 +1850,7 @@ and ends on the last Sunday of October at 2 a.m."
1850 (math-make-intv 2 0 b))))) 1850 (math-make-intv 2 0 b)))))
1851 1851
1852;; The variables math-exp-str and math-exp-pos are local to 1852;; The variables math-exp-str and math-exp-pos are local to
1853;; math-read-exprs in math-aent.el, but are used by 1853;; math-read-exprs in math-aent.el, but are used by
1854;; math-read-angle-brackets, which is called (indirectly) by 1854;; math-read-angle-brackets, which is called (indirectly) by
1855;; math-read-exprs. 1855;; math-read-exprs.
1856(defvar math-exp-str) 1856(defvar math-exp-str)