summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2007-03-19 09:57:30 +0000
committerKim F. Storm <storm@cua.dk>2007-03-19 09:57:30 +0000
commitd55ebb63f03d124c98cea27c469f5b452c68e67f (patch)
tree6f25b2c8f516e3b44055ed95c7b23cf2a3bb2400
parent1c8f28b0b0ede18bc6b3ef280a654b20eecaa4dd (diff)
downloademacs-d55ebb63f03d124c98cea27c469f5b452c68e67f.tar.gz
(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 @@
(defvar math-format-date-cache nil)
-;; The variables math-fd-date, math-fd-dt, math-fd-year,
+;; The variables math-fd-date, math-fd-dt, math-fd-year,
;; math-fd-month, math-fd-day, math-fd-weekday, math-fd-hour,
;; math-fd-minute, math-fd-second, math-fd-bc-flag are local
;; to math-format-date, but are used by math-format-date-part,
@@ -533,7 +533,7 @@
(calc-group-digits nil)
(calc-leading-zeros nil)
(calc-number-radix 10)
- math-fd-year math-fd-month math-fd-day math-fd-weekday
+ math-fd-year math-fd-month math-fd-day math-fd-weekday
math-fd-hour math-fd-minute math-fd-second
(math-fd-bc-flag nil)
(fmt (apply 'concat (mapcar 'math-format-date-part
@@ -570,7 +570,7 @@
math-fd-year (car math-fd-dt)
math-fd-month (nth 1 math-fd-dt)
math-fd-day (nth 2 math-fd-dt)
- math-fd-weekday (math-mod
+ math-fd-weekday (math-mod
(math-add (math-floor math-fd-date) 6) 7)
math-fd-hour (nth 3 math-fd-dt)
math-fd-minute (nth 4 math-fd-dt)
@@ -784,7 +784,7 @@
(while (and (string-match "[-+]?0*[1-9][0-9][0-9][0-9][0-9]+" math-pd-str)
(setq temp (concat (substring math-pd-str 0 (match-beginning 0))
(substring math-pd-str (match-end 0))))
- (string-match
+ (string-match
"[4-9][0-9]\\|[0-9][0-9][0-9]\\|[-+][0-9]+[^-]*\\'" temp))
(setq math-pd-str temp))
@@ -1173,7 +1173,7 @@
;;; Note: Longer names must appear before shorter names which are
;;; substrings of them.
(defvar math-tzone-names
- '(( "UTC" 0 0)
+ '(( "UTC" 0 0)
( "MEGT" -1 "MET" "METDST" ) ; Middle Europe
( "METDST" -1 -1 ) ( "MET" -1 0 )
( "MEGZ" -1 "MEZ" "MESZ" ) ( "MEZ" -1 0 ) ( "MESZ" -1 -1 )
@@ -1314,7 +1314,7 @@
(defun math-std-daylight-savings (date dt zone bump)
"Standard North American daylight saving algorithm.
Before 2007, this uses `math-std-daylight-savings-old', where
-daylight savings began on the first Sunday of April at 2 a.m.,
+daylight saving began on the first Sunday of April at 2 a.m.,
and ended on the last Sunday of October at 2 a.m.
As of 2007, this uses `math-std-daylight-savings-new', where
daylight 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."
(t 0)))
(defun math-std-daylight-savings-old (date dt zone bump)
- "Standard North American daylight savings algorithm before 2007.
+ "Standard North American daylight saving algorithm before 2007.
This implements the rules for the U.S. and Canada.
-Daylight savings begins on the first Sunday of April at 2 a.m.,
+Daylight saving begins on the first Sunday of April at 2 a.m.,
and ends on the last Sunday of October at 2 a.m."
(cond ((< (nth 1 dt) 4) 0)
((= (nth 1 dt) 4)
@@ -1850,7 +1850,7 @@ and ends on the last Sunday of October at 2 a.m."
(math-make-intv 2 0 b)))))
;; The variables math-exp-str and math-exp-pos are local to
-;; math-read-exprs in math-aent.el, but are used by
+;; math-read-exprs in math-aent.el, but are used by
;; math-read-angle-brackets, which is called (indirectly) by
;; math-read-exprs.
(defvar math-exp-str)