diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-10-02 19:12:55 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-10-02 19:12:55 -0700 |
| commit | 0f810fbf3e409ad01353c8a62e727da4f5e42455 (patch) | |
| tree | fdc91a2afe1e42bc2a61ceee9862fc3b8f6957da /lisp | |
| parent | 3615c80cc0300ea032eb7379dd0055f13686957f (diff) | |
| download | emacs-0f810fbf3e409ad01353c8a62e727da4f5e42455.tar.gz | |
* lisp/gnus/nnmairix.el (nnmairix-replace-illegal-chars): Drop Emacs 20 code.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/gnus/nnmairix.el | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 24f71d5a674..446d3877d31 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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 --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index 9672c04b494..0b7f0a40bd3 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -1572,14 +1572,11 @@ See %s for details" proc nnmairix-mairix-output-buffer))) (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. |