2000-10-05 11:43:25 ShengHuo ZHU <zsh@cs.rochester.edu>

	* rfc2047.el (rfc2047-encode-region): Merge only if regions are
	adjacent.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4d291b..35099d6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-05 11:43:25  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * rfc2047.el (rfc2047-encode-region): Merge only if regions are
+       adjacent.
+
 2000-10-05 09:41:33  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-util.el (mm-multibyte-p): In XEmacs, it is (feature 'mule).

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 0b10d04..3fceca3 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -224,7 +224,8 @@ Should be called narrowed to the head of the message."
   (let ((words (rfc2047-dissect-region b e))
        beg end current word)
     (while (setq word (pop words))
-      (if (equal (nth 2 word) current)
+      (if (and (eq (nth 2 word) current)
+              (eq beg (nth 1 word)))
          (setq beg (nth 0 word))
        (when current
          (if (and (eq beg (nth 1 word)) (nth 2 word))