Mercurial > emacs
comparison lisp/calendar/calendar.el @ 90068:eac554634bfa
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-79
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-735
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 25 Dec 2004 02:00:25 +0000 |
| parents | ff0e824afa37 9dadbbe9a381 |
| children | e4694597cbf4 |
comparison
equal
deleted
inserted
replaced
| 90067:b481c5870e10 | 90068:eac554634bfa |
|---|---|
| 1656 (autoload 'view-diary-entries "diary-lib" | 1656 (autoload 'view-diary-entries "diary-lib" |
| 1657 "Prepare and display a buffer with diary entries. | 1657 "Prepare and display a buffer with diary entries. |
| 1658 Searches your diary file for entries that match ARG days starting with | 1658 Searches your diary file for entries that match ARG days starting with |
| 1659 the date indicated by the cursor position in the displayed three-month | 1659 the date indicated by the cursor position in the displayed three-month |
| 1660 calendar." | 1660 calendar." |
| 1661 t) | |
| 1662 | |
| 1663 (autoload 'view-other-diary-entries "diary-lib" | |
| 1664 "Prepare and display buffer of diary entries from an alternative diary file. | |
| 1665 Searches for entries that match ARG days, starting with the date indicated | |
| 1666 by the cursor position in the displayed three-month calendar. | |
| 1667 D-FILE specifies the file to use as the diary file." | |
| 1661 t) | 1668 t) |
| 1662 | 1669 |
| 1663 (autoload 'calendar-sunrise-sunset "solar" | 1670 (autoload 'calendar-sunrise-sunset "solar" |
| 1664 "Local time of sunrise and sunset for date under cursor." | 1671 "Local time of sunrise and sunset for date under cursor." |
| 1665 t) | 1672 t) |