From: yamaoka <yamaoka>
Date: Mon, 12 Jul 2004 11:19:52 +0000 (+0000)
Subject: Synch to No Gnus 200407121119.
X-Git-Tag: t-gnus-6_17_4-quimby-~823
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82e4a80b3c0ff0f1a74adf05d58d1e1824d6b623;p=elisp%2Fgnus.git-

Synch to No Gnus 200407121119.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1cfbc35..d629dc5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,8 @@
 2004-07-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* rfc2047.el (rfc2047-encode-region): Fix last change.
+
+2004-07-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 	From David Hedbor <dhedbor@real.com>.
 
 	* nnmail.el (nnmail-split-lowercase-expanded): New user option.
diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index bcbf9ae..81a3699 100644
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -380,23 +380,22 @@ Dynamically bind `rfc2047-encoding-type' to change that."
 		    (when (looking-at "[\000-\177]+")
 		      (setq begin (point)
 			    end (match-end 0))
-		      (if (progn
-			    (while (and (re-search-forward "[ \t\n]\\|\\Sw"
-							   end 'move)
-					(eq ?\\ (char-syntax (char-before))))
-			      ;; Skip backslash-quoted characters.
-			      (forward-char))
-			    (< (point) end))
-			  (progn
-			    (setq end (match-beginning 0))
-			    (if rfc2047-encode-encoded-words
-				(progn
-				  (goto-char begin)
-				  (when (search-forward "=?" end 'move)
-				    (goto-char (match-beginning 0))
-				    (setq end nil)))
-			      (goto-char end)))
-			(setq end nil)))
+		      (when (progn
+			      (while (and (or (re-search-forward
+					       "[ \t\n]\\|\\Sw" end 'move)
+					      (setq end nil))
+					  (eq ?\\ (char-syntax (char-before))))
+				;; Skip backslash-quoted characters.
+				(forward-char))
+			      end)
+			(setq end (match-beginning 0))
+			(if rfc2047-encode-encoded-words
+			    (progn
+			      (goto-char begin)
+			      (when (search-forward "=?" end 'move)
+				(goto-char (match-beginning 0))
+				(setq end nil)))
+			  (goto-char end))))
 		    (unless end
 		      (setq end t)
 		      (when (looking-at encodable-regexp)