2 files changed, 5 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fea6a86e8e5..0f562a8aad1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,8 +3,8 @@
         * calendar/diary-lib.el (diary-header-line-format): Add a custom
         :set function.
         (diary-list-entries): Only switch to diary-mode from
-        default-major-mode (reverts 2007-03-21 change).  Otherwise, set
-        header-line-format, in case of any customization.
+        default-major-mode (reverts 2007-03-21 change).  Otherwise, if in
+        diary-mode set header-line-format, in case of any customization.
 
 2007-04-18  Levin Du  <zslevin@gmail.com>  (tiny change)
 
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 5838851246f..ee93b60eb98 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -446,8 +446,9 @@ If LIST-ONLY is non-nil don't modify or display the buffer, only return a list."
           ;; clobbers file local variables.
           ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-03/msg00363.html
           ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00404.html
-          (setq header-line-format (and diary-header-line-flag
-                                        diary-header-line-format)))
+          (if (eq major-mode 'diary-mode)
+              (setq header-line-format (and diary-header-line-flag
+                                            diary-header-line-format))))
         ;; d-s-p is passed to the diary display function.
         (let ((diary-saved-point (point)))
           (save-excursion