Recenter for the calendar (bug#78205)

* lisp/calendar/cal-move.el (calendar-recenter-last-op): New
variable to track last recenter operation.
(calendar-recenter): New command to recenter the calendar.
* lisp/calendar/calendar.el (calendar-mode-map): Keybinding for
this command.
* doc/emacs/calendar.texi (Scroll Calendar): Document this
command.
* etc/NEWS: Announce this command.

(cherry picked from commit 0469f41ac2e8f78bfbf9500b335fa32195c0482e)

diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 55798eae16e6d506fb0a323341b63a144238a4b5..56f297db5d08fa4f55e69feb1dd36c1621cef4a3 100644 (file)
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -258,6 +258,8 @@ Scroll forward by three months (@code{calendar-scroll-left-three-months}).
 @itemx @key{PageUp}
 @itemx @key{prior}
 Scroll backward by three months (@code{calendar-scroll-right-three-months}).
+@item C-l
+Recenter the date at point.
 @end table
 
 @kindex > @r{(Calendar mode)}
@@ -293,6 +295,15 @@ calendar backward by a year.
 (or @key{prior}) are equivalent to @kbd{C-v} and @kbd{M-v}, just as
 they are in other modes.
 
+@kindex C-l @r{(Calendar mode)}
+@findex calendar-recenter
+  The command @kbd{C-l} (@code{calendar-recenter}) scrolls the calendar
+on display so that the month of the date at point is centered
+horizontally.  Next invocation of this command puts that month on the
+leftmost position, and another invocation puts it on the rightmost
+position.  Subsequent invocations reuse the same order in a cyclical
+manner.
+
 @node Counting Days
 @section Counting Days
 

diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index b0a8917209fd385de8d2af6eeb1a670621a90284..aad05f572d619abbb7fc9585f35451a4bea271f1 100644 (file)
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -217,6 +217,39 @@ EVENT is an event like `last-nonmenu-event'."
                      last-nonmenu-event))
   (calendar-scroll-left (* -3 arg) event))
 
+(defvar calendar-recenter-last-op nil
+  "Last calendar recenter operation performed.")
+
+;;;###cal-autoload
+(defun calendar-recenter ()
+  "Scroll the calendar so that the month of the date at point is centered.
+Next invocation puts this month on the leftmost position, and another
+invocation puts this month on the rightmost position.  Subsequent
+invocations reuse the same order in a cyclical manner."
+  (interactive)
+  (let ((positions '(center first last))
+        (cursor-month (calendar-extract-month
+                       (calendar-cursor-to-nearest-date))))
+    ;; Update global last position upon repeat.
+    (setq calendar-recenter-last-op
+          (if (eq this-command last-command)
+              (car (or (cdr (memq calendar-recenter-last-op positions))
+                       positions))
+            (car positions)))
+    ;; Like most functions in calendar, a span of three displayed months
+    ;; is implied here.
+    (cond ((eq calendar-recenter-last-op 'center)
+           (cond ((= cursor-month (1- displayed-month))
+                  (calendar-scroll-right))
+                 ((= cursor-month (1+ displayed-month))
+                  (calendar-scroll-left))))
+          ;; Other sub-cases should not happen as we should be centered
+          ;; from here.
+          ((eq calendar-recenter-last-op 'first)
+           (calendar-scroll-left))
+          ((eq calendar-recenter-last-op 'last)
+           (calendar-scroll-right 2)))))
+
 ;;;###cal-autoload
 (defun calendar-forward-day (arg)
   "Move the cursor forward ARG days.

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index c9924aefd2987be53ed562c066767ddb23b51510..4e3c6f2d2697fcfe060ed317e53cbea1ed309582 100644 (file)
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1593,6 +1593,7 @@ Otherwise, use the selected window of EVENT's frame."
     (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-l"  'calendar-recenter)
     (define-key map "\C-b"  'calendar-backward-day)
     (define-key map "\C-p"  'calendar-backward-week)
     (define-key map "\e{"   'calendar-backward-month)