# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1286071975 25200
# Node ID 57c62fb00e3977c9f19e610abc79f9cd9a04100b
# Parent  38ee498456a46aaed9e42d92c82ea13c58b56805
* lisp/gnus/nnmairix.el (nnmairix-replace-illegal-chars): Drop Emacs 20 code.

diff -r 38ee498456a4 -r 57c62fb00e39 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Oct 02 19:09:53 2010 -0700
+++ b/lisp/gnus/ChangeLog	Sat Oct 02 19:12:55 2010 -0700
@@ -1,5 +1,7 @@
 2010-10-03  Glenn Morris  <rgm@gnu.org>
 
+	* nnmairix.el (nnmairix-replace-illegal-chars): Drop Emacs 20 code.
+
 	* smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code.
 
 	* gnus-art.el (gnus-next-page-map): Drop Emacs 20 compat cruft.
diff -r 38ee498456a4 -r 57c62fb00e39 lisp/gnus/nnmairix.el
--- a/lisp/gnus/nnmairix.el	Sat Oct 02 19:09:53 2010 -0700
+++ b/lisp/gnus/nnmairix.el	Sat Oct 02 19:12:55 2010 -0700
@@ -1572,14 +1572,11 @@
 (defun nnmairix-replace-illegal-chars (header)
   "Replace illegal characters in HEADER for mairix query."
   (when header
-    (if (> emacs-major-version 20)
-	(while (string-match "[^-.@/,& [:alnum:]]" header)
-	  (setq header (replace-match "" t t header)))
-      (while (string-match "[[]{}:<>]" header)
-	(setq header (replace-match "" t t header))))
+    (while (string-match "[^-.@/,& [:alnum:]]" header)
+      (setq header (replace-match "" t t header)))
     (while (string-match "[-& ]" header)
       (setq header (replace-match "," t t header)))
-  header))
+    header))
 
 (defun nnmairix-group-toggle-parameter (group parameter description &optional par)
   "Toggle on GROUP a certain PARAMETER.