[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v |
Date: |
Sat, 15 Mar 2008 02:55:07 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/03/15 02:55:06
Index: solar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/solar.el,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- solar.el 14 Mar 2008 07:24:20 -0000 1.72
+++ solar.el 15 Mar 2008 02:55:06 -0000 1.73
@@ -166,11 +166,11 @@
;;; End of user options.
-(defvar solar-n-hemi-seasons
+(defconst solar-n-hemi-seasons
'("Vernal Equinox" "Summer Solstice" "Autumnal Equinox" "Winter Solstice")
"List of season changes for the northern hemisphere.")
-(defvar solar-s-hemi-seasons
+(defconst solar-s-hemi-seasons
'("Autumnal Equinox" "Winter Solstice" "Vernal Equinox" "Summer Solstice")
"List of season changes for the southern hemisphere.")
@@ -647,14 +647,14 @@
(list t0 (cadr exact-local-noon))
(calendar-latitude)
(calendar-longitude) -0.61)))
- (rise (car rise-set))
- (adj-rise (if rise (dst-adjust-time date rise)))
- (set (cadr rise-set)) ; FIXME ?
- (adj-set (if set (dst-adjust-time date set)))
+ (rise-time (car rise-set))
+ (adj-rise (if rise-time (dst-adjust-time date rise-time)))
+ (set-time (cadr rise-set))
+ (adj-set (if set-time (dst-adjust-time date set-time)))
(length (nth 2 rise-set)))
(list
- (and rise (calendar-date-equal date (car adj-rise)) (cdr adj-rise))
- (and set (calendar-date-equal date (car adj-set)) (cdr adj-set))
+ (and rise-time (calendar-date-equal date (car adj-rise)) (cdr adj-rise))
+ (and set-time (calendar-date-equal date (car adj-set)) (cdr adj-set))
(solar-daylight length))))
(defun solar-sunrise-sunset-string (date)
@@ -842,7 +842,7 @@
"E" "W"))))))
(calendar-standard-time-zone-name
(if (< arg 16) calendar-standard-time-zone-name
- (cond ((= calendar-time-zone 0) "UTC")
+ (cond ((zerop calendar-time-zone) "UTC")
((< calendar-time-zone 0)
(format "UTC%dmin" calendar-time-zone))
(t (format "UTC+%dmin" calendar-time-zone)))))
@@ -968,7 +968,7 @@
(defun solar-mean-equinoxes/solstices (k year)
"Julian day of mean equinox/solstice K for YEAR.
K=0, spring equinox; K=1, summer solstice; K=2, fall equinox; K=3, winter
-solstice. These formulas are only to be used between 1000 BC and 3000 AD."
+solstice. These formulae are only to be used between 1000 BC and 3000 AD."
(let ((y (/ year 1000.0))
(z (/ (- year 2000) 1000.0)))
(if (< year 1000) ; actually between -1000 and 1000
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/08
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/08
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/14
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/15
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/20
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/25
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v, Glenn Morris, 2008/03/31