[Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el

[Stefan Monnier]

Index: emacs/lisp/calendar/cal-menu.el
diff -c emacs/lisp/calendar/cal-menu.el:1.62 
emacs/lisp/calendar/cal-menu.el:1.63
*** emacs/lisp/calendar/cal-menu.el:1.62        Sat Oct  8 04:49:27 2005
--- emacs/lisp/calendar/cal-menu.el     Tue Nov  1 19:55:19 2005
***************
*** 38,47 ****
  
  ;;; Code:
  
- (defvar date)
  (defvar displayed-month)
  (defvar displayed-year)
- (defvar event)
  
  (eval-when-compile (require 'calendar))
  
--- 38,45 ----
***************
*** 325,333 ****
  (autoload 'check-calendar-holidays "holidays")
  (autoload 'diary-list-entries "diary-lib")
  
! (defun calendar-mouse-holidays ()
    "Pop up menu of holidays for mouse selected date."
!   (interactive)
    (let* ((date (calendar-event-to-date))
           (l (mapcar 'list (check-calendar-holidays date)))
           (selection
--- 323,331 ----
  (autoload 'check-calendar-holidays "holidays")
  (autoload 'diary-list-entries "diary-lib")
  
! (defun calendar-mouse-holidays (&optional event)
    "Pop up menu of holidays for mouse selected date."
!   (interactive "e")
    (let* ((date (calendar-event-to-date))
           (l (mapcar 'list (check-calendar-holidays date)))
           (selection
***************
*** 340,351 ****
               (if l l '("None")))))))
      (and selection (call-interactively selection))))
  
! (defun calendar-mouse-view-diary-entries (&optional date diary)
    "Pop up menu of diary entries for mouse-selected date.
  Use optional DATE and alternative file DIARY.
  
  Any holidays are shown if `holidays-in-diary-buffer' is t."
!   (interactive)
    (let* ((date (if date date (calendar-event-to-date)))
           (diary-file (if diary diary diary-file))
           (diary-list-include-blanks nil)
--- 338,349 ----
               (if l l '("None")))))))
      (and selection (call-interactively selection))))
  
! (defun calendar-mouse-view-diary-entries (&optional date diary event)
    "Pop up menu of diary entries for mouse-selected date.
  Use optional DATE and alternative file DIARY.
  
  Any holidays are shown if `holidays-in-diary-buffer' is t."
!   (interactive "i\ni\ne")
    (let* ((date (if date date (calendar-event-to-date)))
           (diary-file (if diary diary diary-file))
           (diary-list-include-blanks nil)
***************
*** 490,499 ****
      (calendar-mouse-goto-date (calendar-event-to-date))
      (cal-tex-cursor-year-landscape nil)))
  
! (defun calendar-mouse-print-dates ()
    "Pop up menu of equivalent dates to mouse selected date."
!   (interactive)
!   (let ((date (calendar-event-to-date))
          (selection
           (cal-menu-x-popup-menu
            event
--- 488,497 ----
      (calendar-mouse-goto-date (calendar-event-to-date))
      (cal-tex-cursor-year-landscape nil)))
  
! (defun calendar-mouse-print-dates (&optional event)
    "Pop up menu of equivalent dates to mouse selected date."
!   (interactive "e")
!   (let* ((date (calendar-event-to-date))
          (selection
           (cal-menu-x-popup-menu
            event
***************
*** 524,531 ****
              (list
               (list (format "Chinese date: %s"
                             (calendar-chinese-date-string date))))
! ;            (list '("Chinese date (select to echo Chinese date)"
! ;                    . calendar-mouse-chinese-date))
              (let ((c (calendar-coptic-date-string date)))
                (if (not (string-equal c ""))
                    (list (list (format "Coptic date: %s" c)))))
--- 522,529 ----
              (list
               (list (format "Chinese date: %s"
                             (calendar-chinese-date-string date))))
!             ;; (list '("Chinese date (select to echo Chinese date)"
!             ;;         . calendar-mouse-chinese-date))
              (let ((c (calendar-coptic-date-string date)))
                (if (not (string-equal c ""))
                    (list (list (format "Coptic date: %s" c)))))
***************
*** 580,586 ****
    (let* ((selection
            (cal-menu-x-popup-menu
             event
!            (list (calendar-date-string date t nil)
                   (list
                    ""
                    '("Daily (1 page)" . cal-tex-mouse-day)
--- 578,584 ----
    (let* ((selection
            (cal-menu-x-popup-menu
             event
!            (list (calendar-date-string (calendar-event-to-date t) t nil)
                   (list
                    ""
                    '("Daily (1 page)" . cal-tex-mouse-day)
***************
*** 603,609 ****
    (let* ((selection
            (cal-menu-x-popup-menu
             event
!            (list (calendar-date-string date t nil)
                   (list
                    ""
                    '("Filofax Daily (one-day-per-page)" .
--- 601,607 ----
    (let* ((selection
            (cal-menu-x-popup-menu
             event
!            (list (calendar-date-string (calendar-event-to-date t) t nil)
                   (list
                    ""
                    '("Filofax Daily (one-day-per-page)" .
***************
*** 639,643 ****
  
  (provide 'cal-menu)
  
! ;;; arch-tag: aa81cf73-ce89-48a4-97ec-9ef861e87fe9
  ;;; cal-menu.el ends here
--- 637,641 ----
  
  (provide 'cal-menu)
  
! ;; arch-tag: aa81cf73-ce89-48a4-97ec-9ef861e87fe9
  ;;; cal-menu.el ends here