summaryrefslogtreecommitdiff
path: root/lisp/calendar/solar.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2008-06-17 15:42:19 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2008-06-17 15:42:19 +0000
commit10979c74669477d58347a20ebec04a7a2fd902b1 (patch)
tree55cad205dec27f51098cca7c573268a0c71d18b4 /lisp/calendar/solar.el
parentde7a9afaf3ed4b9e62986fe6687c6bf1a7e86638 (diff)
downloademacs-10979c74669477d58347a20ebec04a7a2fd902b1.tar.gz
emacs-10979c74669477d58347a20ebec04a7a2fd902b1.tar.bz2
emacs-10979c74669477d58347a20ebec04a7a2fd902b1.zip
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
(calendar-set-mark): * calendar/diary-lib.el (diary-insert-entry): * calendar/solar.el (calendar-sunrise-sunset): Use it. * calendar/cal-menu.el (calendar-mouse-sunrise/sunset) (calendar-mouse-insert-diary-entry, calendar-mouse-set-mark): Delete. (cal-menu-context-mouse-menu): Use calendar-set-mark, diary-insert-entry, and calendar-sunrise-sunset instead, to get proper key-shortcuts.
Diffstat (limited to 'lisp/calendar/solar.el')
-rw-r--r--lisp/calendar/solar.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 3d1121f1d0b..6dbd9b3a33d 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -853,13 +853,13 @@ This function is suitable for execution in a .emacs file."
contents of temp window."))))))
;;;###cal-autoload
-(defun calendar-sunrise-sunset ()
+(defun calendar-sunrise-sunset (&optional event)
"Local time of sunrise and sunset for date under cursor.
Accurate to a few seconds."
- (interactive)
+ (interactive (list last-nonmenu-event))
(or (and calendar-latitude calendar-longitude calendar-time-zone)
(solar-setup))
- (let ((date (calendar-cursor-to-date t)))
+ (let ((date (calendar-cursor-to-date t event)))
(message "%s: %s"
(calendar-date-string date t t)
(solar-sunrise-sunset-string date))))