(calendar-forward-day): Fix 2008-06-21 change -

always move cursor to new date.  (Bug#3338)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 108e28a5242242ad20923076671dab2fef12290e..f0a62d93681ddca8660a44948d8d49e809d69719 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * calendar/cal-move.el (calendar-forward-day): Fix 2008-06-21 change -
+       always move cursor to new date.  (Bug#3338)
+
 2009-05-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * textmodes/tex-mode.el (tex-uptodate-p): Accept [1{/var/foo}] as

diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index 749fe9f8c97d6afcfdbd34c6f743c827e6006555..534e7c1ecc72a8a318193a905098075ce50147e0 100644 (file)
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -230,14 +230,15 @@ Moves backward if ARG is negative."
              (+ (calendar-absolute-from-gregorian cursor-date) arg)))
            (new-display-month (calendar-extract-month new-cursor-date))
            (new-display-year (calendar-extract-year new-cursor-date)))
-      ;; Put the new month on the screen, if needed, and go to the new date.
-      (if (calendar-date-is-visible-p new-cursor-date)
-          (calendar-cursor-to-visible-date new-cursor-date)
+      ;; Put the new month on the screen, if needed.
+      (unless (calendar-date-is-visible-p new-cursor-date)
         ;; The next line gives smoother scrolling IMO (one month at a
         ;; time rather than two).
         (calendar-increment-month new-display-month new-display-year
                                   (if (< arg 0) 1 -1))
-        (calendar-other-month new-display-month new-display-year))))
+        (calendar-other-month new-display-month new-display-year))
+      ;; Go to the new date.
+      (calendar-cursor-to-visible-date new-cursor-date)))
   (run-hooks 'calendar-move-hook))
 
 ;;;###cal-autoload