Commit 2f0e4846 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(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.
parent 670d3fce
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> 2005-11-14 Romain Francoise <romain@orebokech.com>
   
* dired-x.el: If `vm-visit-folder' doesn't exist, define it as a * dired-x.el: If `vm-visit-folder' doesn't exist, define it as a
......
...@@ -378,7 +378,7 @@ If LIST-ONLY is non-nil don't modify or display the buffer, only return a list." ...@@ -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) (or (verify-visited-file-modtime diary-buffer)
(revert-buffer t t)))) (revert-buffer t t))))
;; Setup things like the header-line-format and invisibility-spec. ;; 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. ;; d-s-p is passed to the diary display function.
(let ((diary-saved-point (point))) (let ((diary-saved-point (point)))
(save-excursion (save-excursion
...@@ -773,7 +773,7 @@ is created." ...@@ -773,7 +773,7 @@ is created."
(pop-up-frames (window-dedicated-p (selected-window)))) (pop-up-frames (window-dedicated-p (selected-window))))
(with-current-buffer (or (find-buffer-visiting d-file) (with-current-buffer (or (find-buffer-visiting d-file)
(find-file-noselect d-file t)) (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) (diary-unhide-everything)
(display-buffer (current-buffer))))) (display-buffer (current-buffer)))))
...@@ -876,7 +876,7 @@ diary entries." ...@@ -876,7 +876,7 @@ diary entries."
file-glob-attrs marks) file-glob-attrs marks)
(with-current-buffer (find-file-noselect (diary-check-diary-file) t) (with-current-buffer (find-file-noselect (diary-check-diary-file) t)
(save-excursion (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) (setq mark-diary-entries-in-calendar t)
(message "Marking diary entries...") (message "Marking diary entries...")
(setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))) (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
...@@ -1671,7 +1671,7 @@ If omitted, NONMARKING defaults to nil and FILE defaults to ...@@ -1671,7 +1671,7 @@ If omitted, NONMARKING defaults to nil and FILE defaults to
`diary-file'." `diary-file'."
(let ((pop-up-frames (window-dedicated-p (selected-window)))) (let ((pop-up-frames (window-dedicated-p (selected-window))))
(find-file-other-window (substitute-in-file-name (or file diary-file)))) (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) (widen)
(diary-unhide-everything) (diary-unhide-everything)
(goto-char (point-max)) (goto-char (point-max))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment