# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1132006463 0
# Node ID cfc510b6c9e636b2cbb2fdd806ba8523933a0372
# Parent  ccb8ee5226d68bef862ff754313e732053e6af21
(diary-list-entries, diary-show-all-entries)
(mark-diary-entries, make-diary-entry): Check default-major-mode rather
than fundamental-mode to see if the mode was set.

diff -r ccb8ee5226d6 -r cfc510b6c9e6 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Nov 14 21:04:26 2005 +0000
+++ b/lisp/ChangeLog	Mon Nov 14 22:14:23 2005 +0000
@@ -1,3 +1,9 @@
+2005-11-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* calendar/diary-lib.el (diary-list-entries, diary-show-all-entries)
+	(mark-diary-entries, make-diary-entry): Check default-major-mode rather
+	than fundamental-mode to see if the mode was set.
+
 2005-11-14  Romain Francoise  <romain@orebokech.com>
 
 	* dired-x.el: If `vm-visit-folder' doesn't exist, define it as a
diff -r ccb8ee5226d6 -r cfc510b6c9e6 lisp/calendar/diary-lib.el
--- a/lisp/calendar/diary-lib.el	Mon Nov 14 21:04:26 2005 +0000
+++ b/lisp/calendar/diary-lib.el	Mon Nov 14 22:14:23 2005 +0000
@@ -378,7 +378,7 @@
             (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))
+        (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,7 +773,7 @@
         (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))
+      (when (eq major-mode default-major-mode) (diary-mode))
       (diary-unhide-everything)
       (display-buffer (current-buffer)))))
 
@@ -876,7 +876,7 @@
         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))
+        (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,7 +1671,7 @@
 `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))
+  (when (eq major-mode default-major-mode) (diary-mode))
   (widen)
   (diary-unhide-everything)
   (goto-char (point-max))