(calendar-scroll-left, calendar-scroll-right, calendar-scroll-left-three-months)

(calendar-scroll-right-three-months): Clean up namespace.
(scroll-calendar-left, scroll-calendar-right, scroll-calendar-left-three-months)
(scroll-calendar-right-three-months): Add compatibility aliases.

2 files changed, 27 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 378d0c3fe22..a8e9dac3f5e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * calendar/cal-move.el (calendar-scroll-left, calendar-scroll-right)
+        (calendar-scroll-left-three-months)
+        (calendar-scroll-right-three-months): Clean up namespace.
+        (scroll-calendar-left, scroll-calendar-right)
+        (scroll-calendar-left-three-months)
+        (scroll-calendar-right-three-months): Add compatibility aliases.
+
 2007-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/advice.el (ad-interactive-p, ad-interactive-form): Remove.
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index 02760b34e93..87f577ccb28 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -85,7 +85,7 @@ Movement is forward is ARG is negative."
   (interactive "p")
   (calendar-forward-month (* -12 arg)))
 
-(defun scroll-calendar-left (&optional arg)
+(defun calendar-scroll-left (&optional arg)
   "Scroll the displayed calendar left by 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."
@@ -106,26 +106,26 @@ position of the cursor with respect to the calendar as well as possible."
             (t (list month 1 year)))))))
   (run-hooks 'calendar-move-hook))
 
-(defun scroll-calendar-right (&optional arg)
+(defun calendar-scroll-right (&optional arg)
   "Scroll the displayed calendar window right by 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")
-  (scroll-calendar-left (- (or arg 1))))
+  (calendar-scroll-left (- (or arg 1))))
 
-(defun scroll-calendar-left-three-months (arg)
+(defun calendar-scroll-left-three-months (arg)
   "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")
-  (scroll-calendar-left (* 3 arg)))
+  (calendar-scroll-left (* 3 arg)))
 
-(defun scroll-calendar-right-three-months (arg)
+(defun calendar-scroll-right-three-months (arg)
   "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")
-  (scroll-calendar-left (* -3 arg)))
+  (calendar-scroll-left (* -3 arg)))
 
 (defun calendar-cursor-to-nearest-date ()
   "Move the cursor to the closest date.
@@ -345,7 +345,17 @@ Negative DAY counts backward from end of year."
       (+ 1 day (calendar-absolute-from-gregorian (list 12 31 year))))))
   (or noecho (calendar-print-day-of-year)))
 
+;; Backward compatibility.
+(define-obsolete-function-alias
+  'scroll-calendar-left 'calendar-scroll-left "23.1")
+(define-obsolete-function-alias
+  'scroll-calendar-right 'calendar-scroll-right "23.1")
+(define-obsolete-function-alias
+  'scroll-calendar-left-three-months 'calendar-scroll-left-three-months "23.1")
+(define-obsolete-function-alias
+  'scroll-calendar-right-three-months 'calendar-scroll-right-three-months "23.1")
+
 (provide 'cal-move)
 
-;;; arch-tag: d0883c46-7e16-4914-8ff8-8f67e699b781
+;; arch-tag: d0883c46-7e16-4914-8ff8-8f67e699b781
 ;;; cal-move.el ends here