lisp/ChangeLog.2: ChangeLog fixes

[gnus] / lisp / dgnushack.el

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 7fc934b..5c29eef 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,5 +1,5 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Version: 4.19
@@ -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))