# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 944121346 0
# Node ID b6b1fe18ecf5204cb52c5267151865f37d367a8d
# Parent  7a63aad2605d2798328d72ca74b6d0a9d1ceb539
(appt-convert-time): Handle "12:MMam",
remove extraneous string-match.

diff -r 7a63aad2605d -r b6b1fe18ecf5 lisp/calendar/appt.el
--- 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