From: Karl Heuer <kwzh@gnu.org>
Date: Tue, 18 Nov 1997 21:22:28 +0000 (+0000)
Subject: Improve previous change.
X-Git-Tag: emacs-20.3~2799
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4877ba13d7971e10bf8b35e6c675f06bd9c46d2a;p=emacs.git

Improve previous change.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 4bad2115fb3..4ca92b13275 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1433,11 +1433,8 @@ Optional DEFAULT is password to start with."
 		      (case-fold-search t)
 		      (quoted-printable-header-field-end
 		       (save-excursion
-			 ;; Back up to end of previous line, in case the
-			 ;; Content-Transfer-Encoding field comes first.
-			 (forward-char -1)
 			 (re-search-forward
-			  "\ncontent-transfer-encoding\\(\n?[\t ]\\)*:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*"
+			  "^content-transfer-encoding:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*"
 			  header-end t)))
 		      (size
 		       ;; Get the numeric value from the Content-Length field.
@@ -1488,7 +1485,7 @@ Optional DEFAULT is password to start with."
 		       ;; Change "quoted-printable" to "8bit",
 		       ;; to reflect the decoding we just did.
 		       (goto-char quoted-printable-header-field-end)
-		       (zap-to-char -1 ?:)
+		       (delete-region (point) (search-backward ":"))
 		       (insert ": 8bit"))))
 
 	       (save-excursion