Mercurial > emacs

changeset 26677:b6b1fe18ecf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(appt-convert-time): Handle "12:MMam", remove extraneous string-match.
author Gerd Moellmann <gerd@gnu.org>
date Thu, 02 Dec 1999 07:55:46 +0000
parents 7a63aad2605d
children 54fc79fa7000
files lisp/calendar/appt.el
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/calendar/appt.el	Wed Dec 01 23:41:44 1999 +0000
+++ b/lisp/calendar/appt.el	Thu Dec 02 07:55:46 1999 +0000
@@ -477,6 +477,7 @@
         (setq tmp-msg-list (cdr tmp-msg-list))
         (if test-input
             (setq appt-time-msg-list (delq element appt-time-msg-list)))))
+    (appt-check)
     (message "")))
                  
 
@@ -614,10 +615,10 @@
   
     ;; convert the time appointment time into 24 hour time
   
-    (if (and (string-match  "[p][m]" time2conv) (< hr 12))
-        (progn
-          (string-match "[0-9]?[0-9]:" time2conv)
-          (setq hr (+ 12 hr))))
+    (cond ((and (string-match "pm" time2conv) (< hr 12))
+	   (setq hr (+ 12 hr)))
+	  ((and (string-match "am" time2conv) (= hr 12))
+           (setq hr 0)))
   
     ;; convert the actual time
     ;; into minutes for comparison