Mercurial > emacs
changeset 104661:4144d6c5c447
(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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 28 Aug 2009 03:18:49 +0000 |
| parents | c22fc59b5684 |
| children | 790bd85e4cb0 |
| files | lisp/ChangeLog lisp/calendar/diary-lib.el |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Aug 28 02:41:23 2009 +0000 +++ b/lisp/ChangeLog Fri Aug 28 03:18:49 2009 +0000 @@ -1,3 +1,9 @@ +2009-08-28 Glenn Morris <rgm@gnu.org> + + * 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 <monnier@iro.umontreal.ca> * Makefile.in (update-elcfiles): Report left over elc files.
--- a/lisp/calendar/diary-lib.el Fri Aug 28 02:41:23 2009 +0000 +++ b/lisp/calendar/diary-lib.el Fri Aug 28 03:18:49 2009 +0000 @@ -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))