* nnshimbun.el (nnshimbun-request-expire-articles): Fix inhibiting the

[elisp/gnus.git-] / lisp / nnmail.el

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 912a232..227f61c 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -38,15 +38,6 @@
   (autoload 'gnus-error "gnus-util")
   (autoload 'gnus-buffer-live-p "gnus-util"))
 
-(eval-when-compile (require 'static))
-
-(static-condition-case nil
-    :symbol-for-testing-whether-colon-keyword-is-available-or-not
-  (void-variable
-   (defconst :user ':user)
-   (defconst :path ':path)
-   (defconst :predicate ':predicate)))
-
 (defgroup nnmail nil
   "Reading mail with Gnus."
   :group 'gnus)
@@ -1576,11 +1567,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
                                 (list
                                  :predicate
                                  `(lambda (file)
-                                    (string-match
-                                     ,(concat
-                                       (regexp-quote (concat group suffix))
-                                       "$")
-                                     file)))))))
+                                    (string-equal
+                                     ,(concat group suffix)
+                                     (file-name-nondirectory file))))))))
        (when nnmail-fetched-sources
          (if (member source nnmail-fetched-sources)
              (setq source nil)