Show
Ignore:
Timestamp:
2005年11月26日 08時33分26秒 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • vendor/emacs-CVS_HEAD/lisp/calendar/diary-lib.el

    r3939 r3988  
    379379                (revert-buffer t t)))) 
    380380        ;; Setup things like the header-line-format and invisibility-spec. 
    381         (when (eq major-mode 'fundamental-mode) (diary-mode)) 
     381        (when (eq major-mode default-major-mode) (diary-mode)) 
    382382        ;; d-s-p is passed to the diary display function. 
    383383        (let ((diary-saved-point (point))) 
     
    453453                             (while (looking-at " \\|\^I") 
    454454                               (re-search-forward "\^M\\|\n" nil 'move)) 
    455                              (unless (eobp) (backward-char 1)) 
     455                             (unless (and (eobp) (not (bolp))) 
     456                               (backward-char 1)) 
    456457                             (unless list-only 
    457458                               (remove-overlays date-start (point) 
     
    774775    (with-current-buffer (or (find-buffer-visiting d-file) 
    775776                             (find-file-noselect d-file t)) 
    776       (when (eq major-mode 'fundamental-mode) (diary-mode)) 
     777      (when (eq major-mode default-major-mode) (diary-mode)) 
    777778      (diary-unhide-everything) 
    778779      (display-buffer (current-buffer))))) 
     
    877878    (with-current-buffer (find-file-noselect (diary-check-diary-file) t) 
    878879      (save-excursion 
    879         (when (eq major-mode 'fundamental-mode) (diary-mode)) 
     880        (when (eq major-mode default-major-mode) (diary-mode)) 
    880881        (setq mark-diary-entries-in-calendar t) 
    881882        (message "Marking diary entries...") 
     
    16721673  (let ((pop-up-frames (window-dedicated-p (selected-window)))) 
    16731674    (find-file-other-window (substitute-in-file-name (or file diary-file)))) 
    1674   (when (eq major-mode 'fundamental-mode) (diary-mode)) 
     1675  (when (eq major-mode default-major-mode) (diary-mode)) 
    16751676  (widen) 
    16761677  (diary-unhide-everything)