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/cal-menu.el

    r3939 r3988  
    3939;;; Code: 
    4040 
    41 (defvar date) 
    4241(defvar displayed-month) 
    4342(defvar displayed-year) 
    44 (defvar event) 
    4543 
    4644(eval-when-compile (require 'calendar)) 
     
    326324(autoload 'diary-list-entries "diary-lib") 
    327325 
    328 (defun calendar-mouse-holidays (
     326(defun calendar-mouse-holidays (&optional event
    329327  "Pop up menu of holidays for mouse selected date." 
    330   (interactive
     328  (interactive "e"
    331329  (let* ((date (calendar-event-to-date)) 
    332330         (l (mapcar 'list (check-calendar-holidays date))) 
     
    341339    (and selection (call-interactively selection)))) 
    342340 
    343 (defun calendar-mouse-view-diary-entries (&optional date diary
     341(defun calendar-mouse-view-diary-entries (&optional date diary event
    344342  "Pop up menu of diary entries for mouse-selected date. 
    345343Use optional DATE and alternative file DIARY. 
    346344 
    347345Any holidays are shown if `holidays-in-diary-buffer' is t." 
    348   (interactive
     346  (interactive "i\ni\ne"
    349347  (let* ((date (if date date (calendar-event-to-date))) 
    350348         (diary-file (if diary diary diary-file)) 
     
    491489    (cal-tex-cursor-year-landscape nil))) 
    492490 
    493 (defun calendar-mouse-print-dates (
     491(defun calendar-mouse-print-dates (&optional event
    494492  "Pop up menu of equivalent dates to mouse selected date." 
    495   (interactive
    496   (let ((date (calendar-event-to-date)) 
     493  (interactive "e"
     494  (let* ((date (calendar-event-to-date)) 
    497495        (selection 
    498496         (cal-menu-x-popup-menu 
     
    525523             (list (format "Chinese date: %s" 
    526524                           (calendar-chinese-date-string date)))) 
    527 ;            (list '("Chinese date (select to echo Chinese date)" 
    528 ;                    . calendar-mouse-chinese-date)) 
     525            ;; (list '("Chinese date (select to echo Chinese date)" 
     526            ;;         . calendar-mouse-chinese-date)) 
    529527            (let ((c (calendar-coptic-date-string date))) 
    530528              (if (not (string-equal c "")) 
     
    581579          (cal-menu-x-popup-menu 
    582580           event 
    583            (list (calendar-date-string date t nil) 
     581           (list (calendar-date-string (calendar-event-to-date t) t nil) 
    584582                 (list 
    585583                  "" 
     
    604602          (cal-menu-x-popup-menu 
    605603           event 
    606            (list (calendar-date-string date t nil) 
     604           (list (calendar-date-string (calendar-event-to-date t) t nil) 
    607605                 (list 
    608606                  "" 
     
    640638(provide 'cal-menu) 
    641639 
    642 ;;; arch-tag: aa81cf73-ce89-48a4-97ec-9ef861e87fe9 
     640;; arch-tag: aa81cf73-ce89-48a4-97ec-9ef861e87fe9 
    643641;;; cal-menu.el ends here