Mercurial > emacs
changeset 82151:7b6bc42d5f2c
(calendar-mode-map): Use new calendar-scroll-* names.
(mouse-scroll-calendar-left, mouse-scroll-calendar-right): Remove.
Use calendar-scroll-* directly instead.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 27 Jul 2007 06:28:39 +0000 |
| parents | 0d322d300115 |
| children | 75200257ecbb |
| files | lisp/ChangeLog lisp/calendar/calendar.el |
| diffstat | 2 files changed, 24 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jul 27 06:23:45 2007 +0000 +++ b/lisp/ChangeLog Fri Jul 27 06:28:39 2007 +0000 @@ -1,11 +1,5 @@ 2007-07-27 Stefan Monnier <monnier@iro.umontreal.ca> - * calendar/cal-move.el (calendar-scroll-left, calendar-scroll-right): - Behave like mouse-scroll-calendar-* when used from the mouse. - - * calendar/cal-menu.el (cal-menu-scroll-menu) - (cal-menu-global-mouse-menu): Use new names. - * calendar/cal-move.el (calendar-scroll-left, calendar-scroll-right) (calendar-scroll-left-three-months) (calendar-scroll-right-three-months): Clean up namespace. @@ -13,6 +7,16 @@ (scroll-calendar-left-three-months) (scroll-calendar-right-three-months): Add compatibility aliases. + * calendar/cal-move.el (calendar-scroll-left, calendar-scroll-right): + Behave like mouse-scroll-calendar-* when used from the mouse. + + * calendar/cal-menu.el (cal-menu-scroll-menu) + (cal-menu-global-mouse-menu): + * calendar/calendar.el (calendar-mode-map): + Use new calendar-scroll-* names. + (mouse-scroll-calendar-left, mouse-scroll-calendar-right): + Remove. Use calendar-scroll-* directly instead. + 2007-07-26 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/advice.el (ad-interactive-p, ad-interactive-form): Remove.
--- a/lisp/calendar/calendar.el Fri Jul 27 06:23:45 2007 +0000 +++ b/lisp/calendar/calendar.el Fri Jul 27 06:28:39 2007 +0000 @@ -1493,19 +1493,19 @@ "Move the cursor backward ARG years." t) -(autoload 'scroll-calendar-left "cal-move" +(autoload 'calendar-scroll-left "cal-move" "Scroll the displayed calendar left by ARG months." t) -(autoload 'scroll-calendar-right "cal-move" +(autoload 'calendar-scroll-right "cal-move" "Scroll the displayed calendar window right by ARG months." t) -(autoload 'scroll-calendar-left-three-months "cal-move" +(autoload 'calendar-scroll-left-three-months "cal-move" "Scroll the displayed calendar window left by 3*ARG months." t) -(autoload 'scroll-calendar-right-three-months "cal-move" +(autoload 'calendar-scroll-right-three-months "cal-move" "Scroll the displayed calendar window right by 3*ARG months." t) @@ -2224,14 +2224,14 @@ downcase-region upcase-region kill-region copy-region-as-kill capitalize-region write-region)) (define-key map (vector 'remap c) 'calendar-not-implemented)) - (define-key map "<" 'scroll-calendar-right) - (define-key map "\C-x<" 'scroll-calendar-right) - (define-key map [prior] 'scroll-calendar-right-three-months) - (define-key map "\ev" 'scroll-calendar-right-three-months) - (define-key map ">" 'scroll-calendar-left) - (define-key map "\C-x>" 'scroll-calendar-left) - (define-key map [next] 'scroll-calendar-left-three-months) - (define-key map "\C-v" 'scroll-calendar-left-three-months) + (define-key map "<" 'calendar-scroll-right) + (define-key map "\C-x<" 'calendar-scroll-right) + (define-key map [prior] 'calendar-scroll-right-three-months) + (define-key map "\ev" 'calendar-scroll-right-three-months) + (define-key map ">" 'calendar-scroll-left) + (define-key map "\C-x>" 'calendar-scroll-left) + (define-key map [next] 'calendar-scroll-left-three-months) + (define-key map "\C-v" 'calendar-scroll-left-three-months) (define-key map "\C-b" 'calendar-backward-day) (define-key map "\C-p" 'calendar-backward-week) (define-key map "\e{" 'calendar-backward-month) @@ -2383,7 +2383,7 @@ 'help-echo "mouse-1: previous month" 'mouse-face 'mode-line-highlight 'keymap (make-mode-line-mouse-map 'mouse-1 - 'mouse-scroll-calendar-right)) + 'calendar-scroll-right)) "Calendar" (concat (propertize @@ -2412,7 +2412,7 @@ 'help-echo "mouse-1: next month" 'mouse-face 'mode-line-highlight 'keymap (make-mode-line-mouse-map - 'mouse-1 'mouse-scroll-calendar-left))) + 'mouse-1 'calendar-scroll-left))) "The mode line of the calendar buffer. This must be a list of items that evaluate to strings--those strings are @@ -2439,24 +2439,6 @@ (extract-calendar-year iso-date))) \"\"))") -(defun mouse-scroll-calendar-left (event) - "Scroll the displayed calendar left by one month. -Maintains the relative position of the cursor -with respect to the calendar as well as possible." - (interactive "e") - (save-selected-window - (select-window (posn-window (event-start event))) - (scroll-calendar-left 1))) - -(defun mouse-scroll-calendar-right (event) - "Scroll the displayed calendar right by one month. -Maintains the relative position of the cursor -with respect to the calendar as well as possible." - (interactive "e") - (save-selected-window - (select-window (posn-window (event-start event))) - (scroll-calendar-right 1))) - (defun mouse-calendar-other-month (event) "Display a three-month calendar centered around a specified month and year." (interactive "e")