[Emacs-diffs] /srv/bzr/emacs/trunk r102816: * lisp/calendar/diary-lib.el (diary-mode): Refresh *Calendar* after

[Stefan Monnier]

------------------------------------------------------------
revno: 102816
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-01-10 18:31:47 -0500
message:
  * lisp/calendar/diary-lib.el (diary-mode): Refresh *Calendar* after
  refreshing the diary buffer.
modified:
  lisp/ChangeLog
  lisp/calendar/diary-lib.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-10 22:05:42 +0000
+++ b/lisp/ChangeLog    2011-01-10 23:31:47 +0000
@@ -1,14 +1,19 @@
+2011-01-10  Stefan Monnier  <address@hidden>
+
+       * calendar/diary-lib.el (diary-mode): Refresh *Calendar* after
+       refreshing the diary buffer.
+
 2011-01-10  Ken Manheimer  <address@hidden>
 
-       allout.el: Add 2011 to the file copyright.
+       * allout.el: Add 2011 to the file copyright.
        (allout-encrypt-string): Prevent encryption from adding an extra
        newline at the end of the topic body.
        (allout-version): Increment to 2.3.
 
 2011-01-10  Michael Albinus  <address@hidden>
 
-       * net/dbus.el (dbus-unregister-service): Complete doc.  Fix
-       call of dbus-error signal.
+       * net/dbus.el (dbus-unregister-service): Complete doc.
+       Fix call of dbus-error signal.
        (dbus-register-property): Use `dont-register' keyword.
 
 2011-01-10  Jan Moringen  <address@hidden>
@@ -20,8 +25,8 @@
 
 2011-01-09  Chong Yidong  <address@hidden>
 
-       * progmodes/idlw-help.el (idlwave-help-link): Inherit from link
-       face.  Suggested by Joakim Verona.
+       * progmodes/idlw-help.el (idlwave-help-link): Inherit from link face.
+       Suggested by Joakim Verona.
 
        * comint.el (comint-highlight-prompt): Inherit minibuffer-prompt.
 
@@ -32,8 +37,8 @@
        Merge into a single function `widget-toggle-value-create'.
 
        * cus-edit.el (custom-variable-value-create, custom-visibility)
-       (custom-face-edit-value-create, custom-face-value-create): Replace
-       :on-image and :off-image widget properties with :on-glyph and
+       (custom-face-edit-value-create, custom-face-value-create):
+       Replace :on-image and :off-image widget properties with :on-glyph and
        :off-glyph, for consistency with the `visibility' widget.
 
 2011-01-09  Andreas Schwab  <address@hidden>
@@ -168,7 +173,7 @@
 
 2011-01-04  Jan Moringen  <address@hidden>
 
-       * net/dbus.el (dbus-register-property): Added optional parameter
+       * net/dbus.el (dbus-register-property): Add optional parameter
        dont-register-service.  Updated docstring accordingly.
 
 2011-01-04  Andreas Schwab  <address@hidden>
@@ -337,8 +342,8 @@
 
 2010-12-30  Tassilo Horn  <address@hidden>
 
-       * doc-view.el (doc-view-mode, doc-view-toggle-display): Use
-       normal-mode without doc-view-mode bindings in auto-mode-alist as
+       * doc-view.el (doc-view-mode, doc-view-toggle-display):
+       Use normal-mode without doc-view-mode bindings in auto-mode-alist as
        fallback instead of hard coding fundamental mode.
 
 2010-12-30  Tassilo Horn  <address@hidden>
@@ -533,8 +538,8 @@
 
 2010-12-16  Leo  <address@hidden>
 
-       * eshell/eshell.el (eshell-directory-name): Use
-       locate-user-emacs-file (Bug#7578).
+       * eshell/eshell.el (eshell-directory-name):
+       Use locate-user-emacs-file (Bug#7578).
 
 2010-12-15  Glenn Morris  <address@hidden>
 
@@ -559,8 +564,8 @@
        (tramp-handle-insert-file-contents): Do not set permanent-local
        property.
 
-       * net/tramp-cache.el (tramp-persistency-file-name): Use
-       `locate-user-emacs-file' if fboundp.
+       * net/tramp-cache.el (tramp-persistency-file-name):
+       Use `locate-user-emacs-file' if fboundp.
 
        * net/tramp-sh.el (tramp-methods): Add "ksu".
        (tramp-default-user-alist): Add "ksu".  Use `regexp-opt' for

=== modified file 'lisp/calendar/diary-lib.el'
--- a/lisp/calendar/diary-lib.el        2010-12-13 15:27:36 +0000
+++ b/lisp/calendar/diary-lib.el        2011-01-10 23:31:47 +0000
@@ -1,7 +1,7 @@
 ;;; diary-lib.el --- diary functions
 
 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <address@hidden>
@@ -2346,6 +2346,9 @@
        '(diary-font-lock-keywords t))
   (add-to-invisibility-spec '(diary . nil))
   (add-hook 'after-save-hook 'diary-redraw-calendar nil t)
+  ;; In case the file was modified externally, refresh the calendar
+  ;; after refreshing the diary buffer.
+  (add-hook 'after-revert-hook 'diary-redraw-calendar nil t)
   (if diary-header-line-flag
       (setq header-line-format diary-header-line-format)))