[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: |
Thu, 26 Jun 2008 22:28:25 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/06/26 22:28:25
Index: solar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/solar.el,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- solar.el 17 Jun 2008 15:42:19 -0000 1.83
+++ solar.el 26 Jun 2008 22:28:24 -0000 1.84
@@ -640,18 +640,20 @@
(and set-time (calendar-date-equal date (car adj-set)) (cdr adj-set))
(solar-daylight length))))
-(defun solar-sunrise-sunset-string (date)
- "String of *local* times of sunrise, sunset, and daylight on Gregorian DATE."
+(defun solar-sunrise-sunset-string (date &optional nolocation)
+ "String of *local* times of sunrise, sunset, and daylight on Gregorian DATE.
+Optional NOLOCATION non-nil means do not print the location."
(let ((l (solar-sunrise-sunset date)))
(format
- "%s, %s at %s (%s hours daylight)"
+ "%s, %s%s (%s hours daylight)"
(if (car l)
(concat "Sunrise " (apply 'solar-time-string (car l)))
"No sunrise")
(if (cadr l)
(concat "sunset " (apply 'solar-time-string (cadr l)))
"no sunset")
- (eval calendar-location-name)
+ (if nolocation ""
+ (format " at %s" (eval calendar-location-name)))
(nth 2 l))))
(defconst solar-data-list
@@ -864,6 +866,27 @@
(calendar-date-string date t t)
(solar-sunrise-sunset-string date))))
+;;;###cal-autoload
+(defun calendar-sunrise-sunset-month (&optional event)
+ "Local time of sunrise and sunset for month under cursor or at EVENT."
+ (interactive (list last-nonmenu-event))
+ (or (and calendar-latitude calendar-longitude calendar-time-zone)
+ (solar-setup))
+ (let* ((date (calendar-cursor-to-date t event))
+ (month (car date))
+ (year (nth 2 date))
+ (last (calendar-last-day-of-month month year))
+ (title (format "Sunrise/sunset times for %s %d at %s"
+ (calendar-month-name month) year
+ (eval calendar-location-name))))
+ (calendar-in-read-only-buffer solar-sunrises-buffer
+ (calendar-set-mode-line title)
+ (insert title ":\n\n")
+ (dotimes (i last)
+ (setq date (list month (1+ i) year))
+ (insert (format "%s %2d: " (calendar-month-name month t) (1+ i))
+ (solar-sunrise-sunset-string date t) "\n")))))
+
(defvar date)
;; To be called from diary-list-sexp-entries, where DATE is bound.