diff options
| author | Glenn Morris | 2011-05-12 18:35:11 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-05-12 18:35:11 -0700 |
| commit | 4accbca6e956418ee0a6535cd25a03ed1b8d441f (patch) | |
| tree | 51cf4ba7061e65e70f48bd7e253a9360260440dc | |
| parent | 5233edd7e8b9b5bfdb200b5fa287689a65ff794f (diff) | |
| download | emacs-4accbca6e956418ee0a6535cd25a03ed1b8d441f.tar.gz emacs-4accbca6e956418ee0a6535cd25a03ed1b8d441f.zip | |
* lisp/calendar/appt.el (appt-time-msg-list): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/calendar/appt.el | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0eda5afc12d..8d8b1bf7899 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | 2011-05-13 Glenn Morris <rgm@gnu.org> | 1 | 2011-05-13 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * calendar/appt.el (appt-make-list): Simplify. | 3 | * calendar/appt.el (appt-make-list): Simplify. |
| 4 | (appt-time-msg-list): Doc fix. | ||
| 4 | 5 | ||
| 5 | 2011-05-12 Andreas Schwab <schwab@linux-m68k.org> | 6 | 2011-05-12 Andreas Schwab <schwab@linux-m68k.org> |
| 6 | 7 | ||
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index 366117277d3..d961e43cda2 100644 --- a/lisp/calendar/appt.el +++ b/lisp/calendar/appt.el | |||
| @@ -167,16 +167,16 @@ Only relevant if reminders are being displayed in a window." | |||
| 167 | 167 | ||
| 168 | ;; TODO Turn this into an alist? It would be easier to add more | 168 | ;; TODO Turn this into an alist? It would be easier to add more |
| 169 | ;; optional elements. | 169 | ;; optional elements. |
| 170 | ;; TODO There should be a way to set WARNTIME (and other properties) | 170 | ;; Why is the first element (MINUTES) rather than just MINUTES? |
| 171 | ;; from the diary-file. Implementing that would be a good reason | 171 | ;; It may just inherit from diary-entries-list, where we have |
| 172 | ;; to change this to an alist. | 172 | ;; ((MONTH DAY YEAR) ENTRY) |
| 173 | (defvar appt-time-msg-list nil | 173 | (defvar appt-time-msg-list nil |
| 174 | "The list of appointments for today. | 174 | "The list of appointments for today. |
| 175 | Use `appt-add' and `appt-delete' to add and delete appointments. | 175 | Use `appt-add' and `appt-delete' to add and delete appointments. |
| 176 | The original list is generated from today's `diary-entries-list', and | 176 | The original list is generated from today's `diary-entries-list', and |
| 177 | can be regenerated using the function `appt-check'. | 177 | can be regenerated using the function `appt-check'. |
| 178 | Each element of the generated list has the form | 178 | Each element of the generated list has the form |
| 179 | \(MINUTES STRING [FLAG] [WARNTIME]) | 179 | \((MINUTES) STRING [FLAG] [WARNTIME]) |
| 180 | where MINUTES is the time in minutes of the appointment after midnight, | 180 | where MINUTES is the time in minutes of the appointment after midnight, |
| 181 | and STRING is the description of the appointment. | 181 | and STRING is the description of the appointment. |
| 182 | FLAG and WARNTIME are not always present. A non-nil FLAG | 182 | FLAG and WARNTIME are not always present. A non-nil FLAG |
| @@ -548,6 +548,8 @@ Any appointments made with `appt-add' are not affected by this function." | |||
| 548 | ;; Get the whole string for this appointment. | 548 | ;; Get the whole string for this appointment. |
| 549 | (appt-time-string | 549 | (appt-time-string |
| 550 | (substring time-string beg end)) | 550 | (substring time-string beg end)) |
| 551 | ;; FIXME why the list? It makes the first | ||
| 552 | ;; element (MINUTES) rather than MINUTES. | ||
| 551 | (appt-time (list (appt-convert-time only-time))) | 553 | (appt-time (list (appt-convert-time only-time))) |
| 552 | (time-msg (append | 554 | (time-msg (append |
| 553 | (list appt-time appt-time-string) | 555 | (list appt-time appt-time-string) |