[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el

[Stefan Monnier]

Index: emacs/lisp/calendar/diary-lib.el
diff -c emacs/lisp/calendar/diary-lib.el:1.109 
emacs/lisp/calendar/diary-lib.el:1.110
*** emacs/lisp/calendar/diary-lib.el:1.109      Tue Oct 25 07:33:34 2005
--- emacs/lisp/calendar/diary-lib.el    Mon Nov 14 22:14:23 2005
***************
*** 378,384 ****
              (or (verify-visited-file-modtime diary-buffer)
                  (revert-buffer t t))))
          ;; Setup things like the header-line-format and invisibility-spec.
!         (when (eq major-mode 'fundamental-mode) (diary-mode))
          ;; d-s-p is passed to the diary display function.
          (let ((diary-saved-point (point)))
            (save-excursion
--- 378,384 ----
              (or (verify-visited-file-modtime diary-buffer)
                  (revert-buffer t t))))
          ;; Setup things like the header-line-format and invisibility-spec.
!         (when (eq major-mode default-major-mode) (diary-mode))
          ;; d-s-p is passed to the diary display function.
          (let ((diary-saved-point (point)))
            (save-excursion
***************
*** 773,779 ****
          (pop-up-frames (window-dedicated-p (selected-window))))
      (with-current-buffer (or (find-buffer-visiting d-file)
                               (find-file-noselect d-file t))
!       (when (eq major-mode 'fundamental-mode) (diary-mode))
        (diary-unhide-everything)
        (display-buffer (current-buffer)))))
  
--- 773,779 ----
          (pop-up-frames (window-dedicated-p (selected-window))))
      (with-current-buffer (or (find-buffer-visiting d-file)
                               (find-file-noselect d-file t))
!       (when (eq major-mode default-major-mode) (diary-mode))
        (diary-unhide-everything)
        (display-buffer (current-buffer)))))
  
***************
*** 876,882 ****
          file-glob-attrs marks)
      (with-current-buffer (find-file-noselect (diary-check-diary-file) t)
        (save-excursion
!         (when (eq major-mode 'fundamental-mode) (diary-mode))
          (setq mark-diary-entries-in-calendar t)
          (message "Marking diary entries...")
          (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
--- 876,882 ----
          file-glob-attrs marks)
      (with-current-buffer (find-file-noselect (diary-check-diary-file) t)
        (save-excursion
!         (when (eq major-mode default-major-mode) (diary-mode))
          (setq mark-diary-entries-in-calendar t)
          (message "Marking diary entries...")
          (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
***************
*** 1671,1677 ****
  `diary-file'."
    (let ((pop-up-frames (window-dedicated-p (selected-window))))
      (find-file-other-window (substitute-in-file-name (or file diary-file))))
!   (when (eq major-mode 'fundamental-mode) (diary-mode))
    (widen)
    (diary-unhide-everything)
    (goto-char (point-max))
--- 1671,1677 ----
  `diary-file'."
    (let ((pop-up-frames (window-dedicated-p (selected-window))))
      (find-file-other-window (substitute-in-file-name (or file diary-file))))
!   (when (eq major-mode default-major-mode) (diary-mode))
    (widen)
    (diary-unhide-everything)
    (goto-char (point-max))