aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/calendar/appt.el14
2 files changed, 8 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cefb061a5e6..bc25479537b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,6 +11,7 @@
112008-03-08 Glenn Morris <rgm@gnu.org> 112008-03-08 Glenn Morris <rgm@gnu.org>
12 12
13 * calendar/appt.el (appt): Move custom group here from calendar.el. 13 * calendar/appt.el (appt): Move custom group here from calendar.el.
14 (appt-disp-window, appt-convert-time): Doc fixes.
14 15
15 * calendar/cal-bahai.el (calendar-bahai-prompt-for-date) 16 * calendar/cal-bahai.el (calendar-bahai-prompt-for-date)
16 (calendar-bahai-mark-date-pattern): 17 (calendar-bahai-mark-date-pattern):
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index d8663e02afc..d081dd2e541 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -46,10 +46,10 @@
46;;; documentation of that function. 46;;; documentation of that function.
47;;; 47;;;
48;;; Today's appointment list is initialized from the diary when this 48;;; Today's appointment list is initialized from the diary when this
49;;; package is activated. Additionally, the appointments list is 49;;; package is activated. Additionally, the appointments list is
50;;; recreated automatically at 12:01am for those who do not logout 50;;; recreated automatically at 12:01am for those who do not logout
51;;; every day or are programming late. It is also updated when the 51;;; every day or are programming late. It is also updated when the
52;;; `diary-file' is saved. Calling `appt-check' with an argument forces 52;;; `diary-file' is saved. Calling `appt-check' with an argument forces
53;;; a re-initialization at any time. 53;;; a re-initialization at any time.
54;;; 54;;;
55;;; In order to add or delete items from today's list, without 55;;; In order to add or delete items from today's list, without
@@ -410,9 +410,9 @@ displayed in a window:
410 (sit-for 0))))))))) 410 (sit-for 0)))))))))
411 411
412(defun appt-disp-window (min-to-app new-time appt-msg) 412(defun appt-disp-window (min-to-app new-time appt-msg)
413 "Display appointment message APPT-MSG in a separate buffer. 413 "Display appointment due in MIN-TO-APP (a string) minutes.
414The appointment is due in MIN-TO-APP (a string) minutes. 414NEW-TIME is a string giving the date. Displays the appointment
415NEW-TIME is a string giving the date." 415message APPT-MSG in a separate buffer."
416 ;; Make sure we're not in the minibuffer before splitting the window. 416 ;; Make sure we're not in the minibuffer before splitting the window.
417 ;; FIXME this seems needlessly complicated? 417 ;; FIXME this seems needlessly complicated?
418 (when (minibufferp) 418 (when (minibufferp)
@@ -601,7 +601,7 @@ APPT-LIST is a list of the same format as `appt-time-msg-list'."
601 601
602 602
603(defun appt-convert-time (time2conv) 603(defun appt-convert-time (time2conv)
604 "Convert hour:min[am/pm] format to minutes from midnight. 604 "Convert hour:min[am/pm] format TIME2CONV to minutes from midnight.
605A period (.) can be used instead of a colon (:) to separate the 605A period (.) can be used instead of a colon (:) to separate the
606hour and minute parts." 606hour and minute parts."
607 ;; Formats that should be accepted: 607 ;; Formats that should be accepted: