2000-10-10 08:44:13 ShengHuo ZHU <zsh@cs.rochester.edu>

	* rfc2047.el (rfc2047-fold-region): "=?=" is not a break point.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8d360b..4f25443 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-10 08:44:13  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * rfc2047.el (rfc2047-fold-region): "=?=" is not a break point.
+
 2000-10-10 00:00:28  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * webmail.el (webmail-init): Use mm-disable-multibyte-mule4.

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 63a6736..717cf2b 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -286,13 +286,15 @@ Should be called narrowed to the head of the message."
     (narrow-to-region b e)
     (goto-char (point-min))
     (let ((break nil)
+         (qword-break nil)
          (bol (save-restriction
                 (widen)
                 (gnus-point-at-bol))))
       (while (not (eobp))
-       (when (and break (> (- (point) bol) 76))
-         (goto-char break)
-         (setq break nil)
+       (when (and (or break qword-break) (> (- (point) bol) 76))
+         (goto-char (or break qword-break))
+         (setq break nil
+               qword-break nil)
          (insert "\n ")
          (setq bol (1- (point)))
          ;; Don't break before the first non-LWSP characters.
@@ -302,7 +304,8 @@ Should be called narrowed to the head of the message."
         ((eq (char-after) ?\n)
          (forward-char 1)
          (setq bol (point)
-               break nil)
+               break nil
+               qword-break nil)
          (skip-chars-forward " \t")
          (unless (or (eobp) (eq (char-after) ?\n))
            (forward-char 1)))
@@ -312,17 +315,18 @@ Should be called narrowed to the head of the message."
          (skip-chars-forward " \t")
          (setq break (1- (point))))
         ((not break)
-         (if (not (looking-at "=\\?"))
+         (if (not (looking-at "=\\?[^=]"))
              (if (eq (char-after) ?=)
                  (forward-char 1)
                (skip-chars-forward "^ \t\n\r="))
-           (setq break (point))
+           (setq qword-break (point))
            (skip-chars-forward "^ \t\n\r")))
         (t
          (skip-chars-forward "^ \t\n\r"))))
-      (when (and break (> (- (point) bol) 76))
-       (goto-char break)
-       (setq break nil)
+      (when (and (or break qword-break) (> (- (point) bol) 76))
+       (goto-char (or break qword-break))
+       (setq break nil
+             qword-break nil)
        (insert "\n ")
        (setq bol (1- (point)))
        ;; Don't break before the first non-LWSP characters.