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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/08/28 03:18:52

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : diary-lib.el 

Log message:
        (diary-list-entries, diary-goto-entry)
        (diary-show-all-entries, diary-mark-entries, diary-make-entry):
        Use default-value of major-mode rather than default-major-mode.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16032&r2=1.16033
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/diary-lib.el?cvsroot=emacs&r1=1.184&r2=1.185

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16032
retrieving revision 1.16033
diff -u -b -r1.16032 -r1.16033
--- ChangeLog   27 Aug 2009 19:49:58 -0000      1.16032
+++ ChangeLog   28 Aug 2009 03:18:49 -0000      1.16033
@@ -1,3 +1,9 @@
+2009-08-28  Glenn Morris  <address@hidden>
+
+       * calendar/diary-lib.el (diary-list-entries, diary-goto-entry)
+       (diary-show-all-entries, diary-mark-entries, diary-make-entry):
+       Use default-value of major-mode rather than default-major-mode.
+
 2009-08-27  Stefan Monnier  <address@hidden>
 
        * Makefile.in (update-elcfiles): Report left over elc files.

Index: calendar/diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -b -r1.184 -r1.185
--- calendar/diary-lib.el       22 Aug 2009 19:47:44 -0000      1.184
+++ calendar/diary-lib.el       28 Aug 2009 03:18:52 -0000      1.185
@@ -757,7 +757,7 @@
           (or (verify-visited-file-modtime diary-buffer)
               (revert-buffer t t)))
         ;; Setup things like the header-line-format and invisibility-spec.
-        (if (eq major-mode default-major-mode)
+        (if (eq major-mode (default-value 'major-mode))
             (diary-mode)
           ;; This kludge is to make customizations to
           ;; diary-header-line-flag after diary has been displayed
@@ -934,7 +934,7 @@
                (file-exists-p file)
                (find-file-other-window file)
                (progn
-                 (when (eq major-mode default-major-mode) (diary-mode))
+                 (when (eq major-mode (default-value 'major-mode)) 
(diary-mode))
                  (goto-char (point-min))
                  (if (re-search-forward (format "%s.*\\(%s\\)"
                                                 (regexp-quote (nth 2 locator))
@@ -1094,7 +1094,7 @@
                            (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))
+      (when (eq major-mode (default-value 'major-mode)) (diary-mode))
       (diary-unhide-everything)
       (display-buffer (current-buffer)))))
 
@@ -1289,7 +1289,7 @@
         file-glob-attrs)
     (with-current-buffer (find-file-noselect (diary-check-diary-file) t)
       (save-excursion
-        (when (eq major-mode default-major-mode) (diary-mode))
+        (when (eq major-mode (default-value 'major-mode)) (diary-mode))
         (setq calendar-mark-diary-entries-flag t)
         (message "Marking diary entries...")
         (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
@@ -1983,7 +1983,7 @@
   (let ((pop-up-frames (or 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))
+  (when (eq major-mode (default-value 'major-mode)) (diary-mode))
   (widen)
   (diary-unhide-everything)
   (goto-char (point-max))