[Emacs-diffs] /srv/bzr/emacs/trunk r101747: * lisp/gnus/nnmairix.el (nnmairix-replace-illegal-chars): Drop Emacs 20 code.

[Glenn Morris]

------------------------------------------------------------
revno: 101747
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-02 19:12:55 -0700
message:
  * lisp/gnus/nnmairix.el (nnmairix-replace-illegal-chars): Drop Emacs 20 code.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnmairix.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-03 02:09:53 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-03 02:12:55 +0000
@@ -1,5 +1,7 @@
 2010-10-03  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/gnus/nnmairix.el'
--- a/lisp/gnus/nnmairix.el     2010-09-30 08:39:23 +0000
+++ b/lisp/gnus/nnmairix.el     2010-10-03 02:12:55 +0000
@@ -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.