aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2006-04-19 09:55:40 +0000
committerRomain Francoise2006-04-19 09:55:40 +0000
commitf948ab6c52bc24c462d3fb91dfc73fd03921ba83 (patch)
treefcf9e6676f1fee27f226d5ba0dbba5a9446e5d29
parent0fea1d10293b4c6d35c1e55b68cd26e91445213c (diff)
downloademacs-f948ab6c52bc24c462d3fb91dfc73fd03921ba83.tar.gz
emacs-f948ab6c52bc24c462d3fb91dfc73fd03921ba83.zip
(rmail-convert-to-babyl-format): Use second group from
`rmail-mime-charset-pattern'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/rmail.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22690ba2694..ed4d769906c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-04-19 Romain Francoise <romain@orebokech.com>
2
3 * mail/rmail.el (rmail-convert-to-babyl-format): Use second group
4 from `rmail-mime-charset-pattern'.
5
12006-04-18 Dan Nicolaescu <dann@ics.uci.edu> 62006-04-18 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * progmodes/python.el (python-mode): Fix typo. 8 * progmodes/python.el (python-mode): Fix typo.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index a400efc5cc8..faeec5abf02 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1994,7 +1994,7 @@ is non-nil if the user has supplied the password interactively.
1994 (re-search-backward 1994 (re-search-backward
1995 rmail-mime-charset-pattern 1995 rmail-mime-charset-pattern
1996 start t)))) 1996 start t))))
1997 (intern (downcase (match-string 1)))))) 1997 (intern (downcase (match-string 2))))))
1998 (rmail-decode-region start (point) mime-charset))))) 1998 (rmail-decode-region start (point) mime-charset)))))
1999 ;; Add an X-Coding-System: header if we don't have one. 1999 ;; Add an X-Coding-System: header if we don't have one.
2000 (save-excursion 2000 (save-excursion
@@ -2155,7 +2155,7 @@ is non-nil if the user has supplied the password interactively.
2155 (re-search-backward 2155 (re-search-backward
2156 rmail-mime-charset-pattern 2156 rmail-mime-charset-pattern
2157 start t)))) 2157 start t))))
2158 (intern (downcase (match-string 1)))))) 2158 (intern (downcase (match-string 2))))))
2159 (rmail-decode-region start (point) mime-charset))) 2159 (rmail-decode-region start (point) mime-charset)))
2160 (save-excursion 2160 (save-excursion
2161 (goto-char start) 2161 (goto-char start)