** offby1@blarg.net, Nov 5: calendar gets wrong end for Daylight Savings Time

[gnu-emacs] / lisp / calendar / appt.el

diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 5c862ee6c292023d7562f8a1b23b7b5cbf077b6d..892c76bba0c542c252844cf7c45e8af4d2e2b6bd 100644 (file)
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -136,7 +136,9 @@ of the (obsolete) variables `appt-msg-window' and `appt-visible'."
   :type '(choice
           (const :tag "Separate window" window)
           (const :tag "Echo-area" echo)
-          (const :tag "No visible display" nil))
+          (const :tag "No visible display" nil)
+          (const :tag "Backwards compatibility setting - choose another value"
+                 ignore))
   :group 'appt
   :version "22.1")
 
@@ -392,8 +394,8 @@ displayed in a window:
                (if (and (< appt-comp-time appt-message-warning-time)
                         (> (+ cur-comp-time appt-message-warning-time)
                            appt-max-time))
-                   (setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time))
-                         appt-comp-time))
+                   (setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time)
+                         appt-comp-time)))
 
                ;; issue warning if the appointment time is
                ;; within appt-message-warning time