emacs: lisp/calendar/diary-lib.el comparison

comparison lisp/calendar/diary-lib.el @ 39615:4287ce76bf9f

(diary-entry-compare): When times are identical, compare the entries lexicographically.

author	Sam Steingold <sds@gnu.org>
date	Fri, 05 Oct 2001 15:53:02 +0000
parents	7a94f1c588c4
children	82d4ad3abe8c

comparison

equal deleted inserted replaced

-:fc453faec402
+:4287ce76bf9f
 (buffer-substring-no-properties
 (1+ date-start) (1- entry-start)))))))
 (setq d (cdr d)))
 (or entry-found
 (not diary-list-include-blanks)
 (setq diary-entries-list
 (append diary-entries-list
 (list (list date "" "")))))
 (setq date
 (calendar-gregorian-from-absolute
 (1+ (calendar-absolute-from-gregorian date))))
 (error "Your diary file is not readable!"))
 (error "You don't have a diary file!"))))
 (defcustom diary-mail-addr
 (if (boundp 'user-mail-address) user-mail-address nil)
 "*Email address that `diary-mail-entries' will send email to."
 :group 'diary
 :type '(choice string (const nil))
 :version "20.3")
 # diary-rem.sh -- repeatedly run the Emacs diary-reminder
 emacs -batch \\
 -eval \"(setq diary-mail-days 3 \\
 european-calendar-style t \\
 diary-mail-addr \\\"user@host.name\\\" )\" \\
 -l diary-lib -f diary-mail-entries
 at -f diary-rem.sh 0200 tomorrow
 You may have to tweak the syntax of the `at' command to suit your
 system.  Alternatively, you can specify a cron entry:
 0 1 * * * diary-rem.sh
 (defun diary-entry-compare (e1 e2)
 "Returns t if E1 is earlier than E2."
 (or (calendar-date-compare e1 e2)
 (and (calendar-date-equal (car e1) (car e2))
-(< (diary-entry-time (car (cdr e1)))
+(let* ((ts1 (cadr e1)) (t1 (diary-entry-time ts1))
-(diary-entry-time (car (cdr e2)))))))
+(ts2 (cadr e2)) (t2 (diary-entry-time ts2)))
+(or (< t1 t2)
+(and (= t1 t2)
+(string-lessp ts1 ts2)))))))
 (defcustom diary-unknown-time
 -9999
 "*Value returned by diary-entry-time when no time is found.
 The default value -9999 causes entries with no recognizable time to be placed
 before those with times; 9999 would place entries with no recognizable time
 after those with times."
 :type 'integer
 :group 'diary
 :version "20.3")
 (defun diary-entry-time (s)
 "Time at the beginning of the string S in a military-style integer.  For
 example, returns 1325 for 1:25pm.  Returns `diary-unknown-time' (default value
 -9999) if no time is recognized.  The recognized forms are XXXX, X:XX, or
 XX:XX (military time), and XXam, XXAM, XXpm, XXPM, XX:XXam, XX:XXAM XX:XXpm,
 or XX:XXPM."
 (let ((case-fold-search nil))
-(cond ((string-match;; Military time
+(cond ((string-match        ; Military time
 	    "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\):?\\([0-9][0-9]\\)\\(\\>\\|[^ap]\\)" s)
 	   (+ (* 100 (string-to-int
 		      (substring s (match-beginning 1) (match-end 1))))
 	      (string-to-int (substring s (match-beginning 2) (match-end 2)))))
-	  ((string-match;; Hour only  XXam or XXpm
+	  ((string-match        ; Hour only  XXam or XXpm
 	    "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)\\([ap]\\)m\\>" s)
 	   (+ (* 100 (% (string-to-int
 			   (substring s (match-beginning 1) (match-end 1)))
 			  12))
 	      (if (equal ?a (downcase (aref s (match-beginning 2))))
 		  0 1200)))
-	  ((string-match;; Hour and minute  XX:XXam or XX:XXpm
+	  ((string-match        ; Hour and minute  XX:XXam or XX:XXpm
 	    "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\):\\([0-9][0-9]\\)\\([ap]\\)m\\>" s)
 	   (+ (* 100 (% (string-to-int
 			   (substring s (match-beginning 1) (match-end 1)))
 			  12))
 	      (string-to-int (substring s (match-beginning 2) (match-end 2)))
 	      (if (equal ?a (downcase (aref s (match-beginning 3))))
 		  0 1200)))
-	  (t diary-unknown-time))));; Unrecognizable
+	  (t diary-unknown-time)))) ; Unrecognizable
-;; Unrecognizable
 (defun list-sexp-diary-entries (date)
 "Add sexp entries for DATE from the diary file to `diary-entries-list'.
 Also, Make them visible in the diary file.  Returns t if any entries were
 found.
 Text is assumed to be the name of the person; the date is
 the date of death on the *civil* calendar.  The diary entry
 will appear on the proper Hebrew-date anniversary and on the
 day before.  (If `european-calendar-style' is t, the order
 of the parameters should be changed to DAY, MONTH, YEAR.)
 %%(diary-rosh-hodesh)
 Diary entries will be made on the dates of Rosh Hodesh on
 the Hebrew calendar.  Note that since there is no text, it
 makes sense only if the fancy diary display is used.
 (concat (int-to-string days) (if (= 1 days) " day" " days")))
 " until "
 diary-entry)
 "*Pseudo-pattern giving form of reminder messages in the fancy diary
 display.
 Used by the function `diary-remind', a pseudo-pattern is a list of
 expressions that can involve the keywords `days' (a number), `date' (a list of
 month, day, year), and `diary-entry' (a string)."
 :type 'sexp
 :group 'diary)
 (defun add-to-diary-list (date string specifier)
 "Add the entry (DATE STRING SPECIFIER) to `diary-entries-list'.
 Do nothing if DATE or STRING is nil."
 (and date string
 (setq diary-entries-list
 (append diary-entries-list (list (list date string specifier))))))
 (defun make-diary-entry (string &optional nonmarking file)
 "Insert a diary entry STRING which may be NONMARKING in FILE.
 If omitted, NONMARKING defaults to nil and FILE defaults to diary-file."

Mercurial > emacs

comparison lisp/calendar/diary-lib.el @ 39615:4287ce76bf9f