*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ecd9030..ce139f0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * dgnushack.el (dgnushack-compile): `icalendar--decode-isodatetime'
+       doesn't work properly on XEmacs.
+
 2013-08-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * message.el (message-ignored-news-headers): Delete X-Gnus-Delayed

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 7fc934b..3f73152 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -339,11 +339,9 @@ This means that every warning will be reported as an error."
     (unless (locate-library "epg")
       (setq files (delete "plstore.el" files)))
     ;; Temporary code until we fix pcase and defmethod stuff.
-    (when (or (and (featurep 'xemacs)
-                  (emacs-version>= 21 5))
-             (and (not (featurep 'xemacs))
-                  (or (< emacs-major-version 24)
-                      (< emacs-minor-version 3))))
+    (when (or (featurep 'xemacs)
+             (or (< emacs-major-version 24)
+                 (< emacs-minor-version 3)))
       (setq files (delete "gnus-icalendar.el" files)))
     (dolist (file files)
       (setq file (expand-file-name file srcdir))