Synch to No Gnus 200407250058.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ba6884..bd42a12 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * rfc2047.el (rfc2047-encode-region): Don't infloop.  Suggested by
+       Hiroshi Fujishima <pooh@nature.tsukuba.ac.jp>.
+
 2004-07-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * flow-fill.el (fill-flowed): Remove space stuffing, and only do

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 46ee8be..d430a35 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -376,7 +376,7 @@ Dynamically bind `rfc2047-encoding-type' to change that."
                  ;; Skip one ASCII word, or encode continuous words
                  ;; in which all those contain non-ASCII characters.
                  (setq end nil)
-                 (while (not end)
+                 (while (not (or end (eobp)))
                    (when (looking-at "[\000-\177]+")
                      (setq begin (point)
                            end (match-end 0))