Mercurial > emacs
comparison lisp/calendar/diary-lib.el @ 96047:65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
(calendar-set-mark):
* calendar/diary-lib.el (diary-insert-entry):
* calendar/solar.el (calendar-sunrise-sunset): Use it.
* calendar/cal-menu.el (calendar-mouse-sunrise/sunset)
(calendar-mouse-insert-diary-entry, calendar-mouse-set-mark): Delete.
(cal-menu-context-mouse-menu): Use calendar-set-mark, diary-insert-entry,
and calendar-sunrise-sunset instead, to get proper key-shortcuts.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 17 Jun 2008 15:42:19 +0000 |
| parents | 57ade7d79485 |
| children | 58d55b9662d9 |
comparison
equal
deleted
inserted
replaced
| 96046:422d57d537d7 | 96047:65c4c935e492 |
|---|---|
| 1996 | 1996 |
| 1997 ;;;###cal-autoload | 1997 ;;;###cal-autoload |
| 1998 (define-obsolete-function-alias 'make-diary-entry 'diary-make-entry "23.1") | 1998 (define-obsolete-function-alias 'make-diary-entry 'diary-make-entry "23.1") |
| 1999 | 1999 |
| 2000 ;;;###cal-autoload | 2000 ;;;###cal-autoload |
| 2001 (defun diary-insert-entry (arg) | 2001 (defun diary-insert-entry (arg &optional event) |
| 2002 "Insert a diary entry for the date indicated by point. | 2002 "Insert a diary entry for the date indicated by point. |
| 2003 Prefix argument ARG makes the entry nonmarking." | 2003 Prefix argument ARG makes the entry nonmarking." |
| 2004 (interactive "P") | 2004 (interactive |
| 2005 (diary-make-entry (calendar-date-string (calendar-cursor-to-date t) t t) | 2005 (list current-prefix-arg last-nonmenu-event)) |
| 2006 (diary-make-entry (calendar-date-string (calendar-cursor-to-date t event) t t) | |
| 2006 arg)) | 2007 arg)) |
| 2007 | 2008 |
| 2008 ;;;###cal-autoload | 2009 ;;;###cal-autoload |
| 2009 (define-obsolete-function-alias 'insert-diary-entry 'diary-insert-entry "23.1") | 2010 (define-obsolete-function-alias 'insert-diary-entry 'diary-insert-entry "23.1") |
| 2010 | 2011 |