/[emacs]/emacs/lisp/calendar/diary-lib.el
ViewVC logotype

Diff of /emacs/lisp/calendar/diary-lib.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.109 by gm, Tue Oct 25 07:33:34 2005 UTC revision 1.110 by monnier, Mon Nov 14 22:14:23 2005 UTC
# Line 378  If LIST-ONLY is non-nil don't modify or Line 378  If LIST-ONLY is non-nil don't modify or
378              (or (verify-visited-file-modtime diary-buffer)              (or (verify-visited-file-modtime diary-buffer)
379                  (revert-buffer t t))))                  (revert-buffer t t))))
380          ;; Setup things like the header-line-format and invisibility-spec.          ;; Setup things like the header-line-format and invisibility-spec.
381          (when (eq major-mode 'fundamental-mode) (diary-mode))          (when (eq major-mode default-major-mode) (diary-mode))
382          ;; d-s-p is passed to the diary display function.          ;; d-s-p is passed to the diary display function.
383          (let ((diary-saved-point (point)))          (let ((diary-saved-point (point)))
384            (save-excursion            (save-excursion
# Line 773  is created." Line 773  is created."
773          (pop-up-frames (window-dedicated-p (selected-window))))          (pop-up-frames (window-dedicated-p (selected-window))))
774      (with-current-buffer (or (find-buffer-visiting d-file)      (with-current-buffer (or (find-buffer-visiting d-file)
775                               (find-file-noselect d-file t))                               (find-file-noselect d-file t))
776        (when (eq major-mode 'fundamental-mode) (diary-mode))        (when (eq major-mode default-major-mode) (diary-mode))
777        (diary-unhide-everything)        (diary-unhide-everything)
778        (display-buffer (current-buffer)))))        (display-buffer (current-buffer)))))
779    
# Line 876  diary entries." Line 876  diary entries."
876          file-glob-attrs marks)          file-glob-attrs marks)
877      (with-current-buffer (find-file-noselect (diary-check-diary-file) t)      (with-current-buffer (find-file-noselect (diary-check-diary-file) t)
878        (save-excursion        (save-excursion
879          (when (eq major-mode 'fundamental-mode) (diary-mode))          (when (eq major-mode default-major-mode) (diary-mode))
880          (setq mark-diary-entries-in-calendar t)          (setq mark-diary-entries-in-calendar t)
881          (message "Marking diary entries...")          (message "Marking diary entries...")
882          (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))          (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
# Line 1671  If omitted, NONMARKING defaults to nil a Line 1671  If omitted, NONMARKING defaults to nil a
1671  `diary-file'."  `diary-file'."
1672    (let ((pop-up-frames (window-dedicated-p (selected-window))))    (let ((pop-up-frames (window-dedicated-p (selected-window))))
1673      (find-file-other-window (substitute-in-file-name (or file diary-file))))      (find-file-other-window (substitute-in-file-name (or file diary-file))))
1674    (when (eq major-mode 'fundamental-mode) (diary-mode))    (when (eq major-mode default-major-mode) (diary-mode))
1675    (widen)    (widen)
1676    (diary-unhide-everything)    (diary-unhide-everything)
1677    (goto-char (point-max))    (goto-char (point-max))

Legend:
Removed from v.1.109  
changed lines
  Added in v.1.110

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26