# HG changeset patch # User Glenn Morris # Date 1205549974 0 # Node ID e2f0046a8cb4b2ccfe4b047bc12f49b36ade361d # Parent 4151ef80cb37f567329024a6f8a5853f370e037e (appt-check, appt-delete, appt-make-list): Use caar. diff -r 4151ef80cb37 -r e2f0046a8cb4 lisp/calendar/appt.el --- a/lisp/calendar/appt.el Sat Mar 15 02:59:15 2008 +0000 +++ b/lisp/calendar/appt.el Sat Mar 15 02:59:34 2008 +0000 @@ -78,8 +78,6 @@ ;; Make sure calendar is loaded when we compile this. (require 'calendar) -(defvar diary-selective-display) - (defgroup appt nil "Appointment notification." @@ -248,6 +246,8 @@ (if appt-audible (beep 1)))) +(defvar diary-selective-display) + (defun appt-check (&optional force) "Check for an appointment and update any reminder display. If optional argument FORCE is non-nil, reparse the diary file for @@ -358,7 +358,7 @@ ;; message issued, get the first time off of the list and ;; calculate the number of minutes until the appointment. (if (and appt-issue-message appt-time-msg-list) - (let ((appt-comp-time (car (car (car appt-time-msg-list))))) + (let ((appt-comp-time (caar (car appt-time-msg-list)))) (setq min-to-app (- appt-comp-time cur-comp-time)) (while (and appt-time-msg-list @@ -366,7 +366,7 @@ (setq appt-time-msg-list (cdr appt-time-msg-list)) (if appt-time-msg-list (setq appt-comp-time - (car (car (car appt-time-msg-list)))))) + (caar (car appt-time-msg-list))))) ;; If we have an appointment between midnight and ;; `appt-message-warning-time' minutes after midnight, ;; we must begin to issue a message before midnight. @@ -494,7 +494,7 @@ ;; doublequotes around it. (prin1-to-string (substring-no-properties - (car (cdr element)) 0)) + (cadr element) 0)) " from list? ")) (test-input (y-or-n-p prompt-string))) (setq tmp-msg-list (cdr tmp-msg-list)) @@ -556,7 +556,7 @@ ;; Parse the entries for today. (while (and entry-list (calendar-date-equal - (calendar-current-date) (car (car entry-list)))) + (calendar-current-date) (caar entry-list))) (let ((time-string (cadr (car entry-list)))) (while (string-match appt-time-regexp time-string) (let* ((beg (match-beginning 0)) @@ -589,12 +589,12 @@ (cur-hour (nth 2 now)) (cur-min (nth 1 now)) (cur-comp-time (+ (* cur-hour 60) cur-min)) - (appt-comp-time (car (caar appt-time-msg-list)))) + (appt-comp-time (caar (car appt-time-msg-list)))) (while (and appt-time-msg-list (< appt-comp-time cur-comp-time)) (setq appt-time-msg-list (cdr appt-time-msg-list)) (if appt-time-msg-list - (setq appt-comp-time (car (caar appt-time-msg-list)))))))))) + (setq appt-comp-time (caar (car appt-time-msg-list)))))))))) (defun appt-sort-list (appt-list)