diff options
| author | Richard M. Stallman | 1993-10-20 05:51:19 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-10-20 05:51:19 +0000 |
| commit | 3d9dece2e8254c33be7a27137f11b67b0adf90ca (patch) | |
| tree | accec79fb5ae1eacf4372a8e24921cb3cf03595f | |
| parent | ebf11942fc17cbb638085ef9ab4dfbe506c9ae0e (diff) | |
| download | emacs-3d9dece2e8254c33be7a27137f11b67b0adf90ca.tar.gz emacs-3d9dece2e8254c33be7a27137f11b67b0adf90ca.zip | |
(solar-n-hemi-seasons, solar-s-hemi-seasons): New vars.
(solar-equinoxes-solstices): Use them to fix names for southern hemisphere.
| -rw-r--r-- | lisp/calendar/solar.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index ecc3f6bec1a..0298400b799 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el | |||
| @@ -105,12 +105,11 @@ value and might not know how to override it.") | |||
| 105 | "*Expression evaluating to name of `calendar-longitude', calendar-latitude'. | 105 | "*Expression evaluating to name of `calendar-longitude', calendar-latitude'. |
| 106 | Default value is just the latitude, longitude pair.") | 106 | Default value is just the latitude, longitude pair.") |
| 107 | 107 | ||
| 108 | ;;; List of names of the seasons, dependent on your hemisphere. | 108 | (defvar solar-n-hemi-seasons |
| 109 | (defconst n-hemi-seasons | ||
| 110 | '("Vernal Equinox" "Summer Solstice" "Autumnal Equinox" "Winter Solstice") | 109 | '("Vernal Equinox" "Summer Solstice" "Autumnal Equinox" "Winter Solstice") |
| 111 | "List of season changes for the northern hemisphere.") | 110 | "List of season changes for the northern hemisphere.") |
| 112 | 111 | ||
| 113 | (defconst s-hemi-seasons | 112 | (defvar solar-s-hemi-seasons |
| 114 | '("Autumnal Equinox" "Winter Solstice" "Vernal Equinox" "Summer Solstice") | 113 | '("Autumnal Equinox" "Winter Solstice" "Vernal Equinox" "Summer Solstice") |
| 115 | "List of season changes for the southern hemisphere.") | 114 | "List of season changes for the southern hemisphere.") |
| 116 | 115 | ||
| @@ -506,7 +505,8 @@ Requires floating point." | |||
| 506 | (extract-calendar-year date)))) | 505 | (extract-calendar-year date)))) |
| 507 | (list (list date | 506 | (list (list date |
| 508 | (format "%s %s" | 507 | (format "%s %s" |
| 509 | (nth k (if s-hemi s-hemi-seasons n-hemi-seasons)) | 508 | (nth k (if s-hemi solar-s-hemi-seasons |
| 509 | solar-n-hemi-seasons)) | ||
| 510 | (solar-time-string time date))))))) | 510 | (solar-time-string time date))))))) |
| 511 | 511 | ||
| 512 | (provide 'solar) | 512 | (provide 'solar) |