summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2009-01-10 22:01:32 +0000
committerGlenn Morris <rgm@gnu.org>2009-01-10 22:01:32 +0000
commit3309a9ee3f196146ecc1651da0bf1d3449a48411 (patch)
tree0cd2140178852b5de2f97991acc6067928a8e69c
parentdc67263ca39f129d07485b3da3a4b9b6c5b2c93f (diff)
downloademacs-3309a9ee3f196146ecc1651da0bf1d3449a48411.tar.gz
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Add event handling, for when called from menus with the calendar buffer not current.
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/calendar/cal-move.el20
2 files changed, 22 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a94006499ad..519ca5d847f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-10 Glenn Morris <rgm@gnu.org>
+
+ * calendar/cal-move.el (calendar-scroll-left-three-months)
+ (calendar-scroll-right-three-months):
+ * calendar/holidays.el (calendar-list-holidays)
+ (calendar-mark-holidays):
+ * calendar/lunar.el (calendar-lunar-phases):
+ Add event handling, for when called from menus with the calendar buffer
+ not current.
+
2009-01-10 Dan Nicolaescu <dann@ics.uci.edu>
* diff-mode.el (diff-show-trailing-whitespaces): Remove function.
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index e262bd0b77b..749fe9f8c97 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -190,23 +190,27 @@ EVENT is an event like `last-nonmenu-event'."
'scroll-calendar-right 'calendar-scroll-right "23.1")
;;;###cal-autoload
-(defun calendar-scroll-left-three-months (arg)
+(defun calendar-scroll-left-three-months (arg &optional event)
"Scroll the displayed calendar window left by 3*ARG months.
If ARG is negative the calendar is scrolled right. Maintains the relative
-position of the cursor with respect to the calendar as well as possible."
- (interactive "p")
- (calendar-scroll-left (* 3 arg)))
+position of the cursor with respect to the calendar as well as possible.
+EVENT is an event like `last-nonmenu-event'."
+ (interactive (list (prefix-numeric-value current-prefix-arg)
+ last-nonmenu-event))
+ (calendar-scroll-left (* 3 arg) event))
(define-obsolete-function-alias 'scroll-calendar-left-three-months
'calendar-scroll-left-three-months "23.1")
;;;###cal-autoload
-(defun calendar-scroll-right-three-months (arg)
+(defun calendar-scroll-right-three-months (arg &optional event)
"Scroll the displayed calendar window right by 3*ARG months.
If ARG is negative the calendar is scrolled left. Maintains the relative
-position of the cursor with respect to the calendar as well as possible."
- (interactive "p")
- (calendar-scroll-left (* -3 arg)))
+position of the cursor with respect to the calendar as well as possible.
+EVENT is an event like `last-nonmenu-event'."
+ (interactive (list (prefix-numeric-value current-prefix-arg)
+ last-nonmenu-event))
+ (calendar-scroll-left (* -3 arg) event))
(define-obsolete-function-alias 'scroll-calendar-right-three-months
'calendar-scroll-right-three-months "23.1")