diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-11-14 22:14:23 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-11-14 22:14:23 +0000 |
| commit | 2f0e4846490677315fda2c2893d3c575051806fc (patch) | |
| tree | a61516194ce13bba657d45cd67e6f3b9d143e5ab /lisp | |
| parent | 670d3fce9d2df5fd60e77498981b553e878dbc8d (diff) | |
| download | emacs-2f0e4846490677315fda2c2893d3c575051806fc.tar.gz | |
(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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/calendar/diary-lib.el | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5667a43c2ff..ef5253d63a6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 896f0755ad8..98c8b6a5dd5 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -378,7 +378,7 @@ If LIST-ONLY is non-nil don't modify or display the buffer, only return a list." (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 @@ is created." (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 @@ diary entries." 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 @@ If omitted, NONMARKING defaults to nil and FILE defaults to `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)) |