aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2008-06-26 07:08:01 +0000
committerGlenn Morris <[email protected]>2008-06-26 07:08:01 +0000
commit2b11fcd531a5d9e8084344b341aecff379870770 (patch)
treed9f3fb229c241048cd69adffaca9c45d6b07121f /lisp
parent2eff62d6fa0c9ff9cd2e18b2a3db9850508b2856 (diff)
(calendar-cursor-to-date): Handle case where event-start is nil.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calendar/calendar.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78ef7e35b3..b9683e282d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -48,6 +48,10 @@
Add doc strings.
(cal-menu-context-mouse-menu): Add some :keys.
+ * calendar/cal-menu.el (cal-menu-moon-menu): Add sunrise/sunset.
+ * calendar/calendar.el (calendar-cursor-to-date): Handle case where
+ event-start is nil.
+
2008-06-26 Stefan Monnier <[email protected]>
* minibuffer.el (completion-basic-try-completion): Use the text after
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 35dc611901..284937f301 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1787,7 +1787,8 @@ use instead of point."
(if event (window-buffer (posn-window (event-start event)))
(current-buffer))
(save-excursion
- (if event (goto-char (posn-point (event-start event))))
+ (and event (setq event (event-start event))
+ (goto-char (posn-point event)))
(let* ((segment (calendar-column-to-segment))
(month (% (+ displayed-month (1- segment)) 12)))
;; Call with point on either of the two digits in a 2-digit date,