[Emacs-diffs] /srv/bzr/emacs/trunk r111522: Sync window-point and point in calendar-redraw

[Leo Liu]

------------------------------------------------------------
revno: 111522
fixes bug: http://debbugs.gnu.org/13420
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Mon 2013-01-14 23:39:04 +0800
message:
  Sync window-point and point in calendar-redraw
modified:
  lisp/ChangeLog
  lisp/calendar/calendar.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-14 01:08:13 +0000
+++ b/lisp/ChangeLog    2013-01-14 15:39:04 +0000
@@ -1,3 +1,8 @@
+2013-01-14  Leo Liu  <address@hidden>
+
+       * calendar/calendar.el (calendar-redraw): Sync window-point and point.
+       (Bug#13420)
+
 2013-01-14  Glenn Morris  <address@hidden>
 
        * progmodes/compile.el (compilation-error-regexp-alist-alist):

=== modified file 'lisp/calendar/calendar.el'
--- a/lisp/calendar/calendar.el 2013-01-01 09:11:05 +0000
+++ b/lisp/calendar/calendar.el 2013-01-14 15:39:04 +0000
@@ -1562,11 +1562,13 @@
 (defun calendar-redraw ()
   "Redraw the calendar display, if `calendar-buffer' is live."
   (interactive)
-  (if (get-buffer calendar-buffer)
-      (with-current-buffer calendar-buffer
-        (let ((cursor-date (calendar-cursor-to-nearest-date)))
-          (calendar-generate-window displayed-month displayed-year)
-          (calendar-cursor-to-visible-date cursor-date)))))
+  (when (get-buffer calendar-buffer)
+    (with-current-buffer calendar-buffer
+      (let ((cursor-date (calendar-cursor-to-nearest-date)))
+        (calendar-generate-window displayed-month displayed-year)
+        (calendar-cursor-to-visible-date cursor-date))
+      (when (window-live-p (get-buffer-window))
+        (set-window-point (get-buffer-window) (point))))))
 
 (defvar calendar-mode-map
   (let ((map (make-keymap)))