Backport change:

2004-04-03  Colin Rafferty  <colin.rafferty@morganstanley.com>

	* wl-highlight.el (wl-highlight-message): Change to strict regexp
	for the separator line and quote mail-header-separator.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 26f7ef1..59d3855 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-03  Colin Rafferty  <colin.rafferty@morganstanley.com>
+
+       * wl-highlight.el (wl-highlight-message): Change to strict regexp
+       for the separator line and quote mail-header-separator.
+
 2004-01-01  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * wl-demo.el (wl-demo-copyright-notice): Add 2004.

diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el
index eea611c..e4fde9d 100644 (file)
--- a/wl/wl-highlight.el
+++ b/wl/wl-highlight.el
@@ -1122,7 +1122,7 @@ interpreted as cited text.)"
            ;; If this search fails then the narrowing performed above
            ;; is sufficient
            (if (re-search-forward (format
-                                   "^$\\|%s"
+                                   "^\\(%s\\)?$"
                                    (regexp-quote mail-header-separator))
                                   nil t)
                (narrow-to-region (point-min) (match-beginning 0)))
@@ -1158,7 +1158,7 @@ interpreted as cited text.)"
          (let (prefix prefix-face-alist pair end)
            (while (not (eobp))
              (cond
-              ((looking-at mail-header-separator)
+              ((looking-at (concat "^" (regexp-quote mail-header-separator) "$"))
                (put-text-property (match-beginning 0) (match-end 0)
                                   'face 'wl-highlight-header-separator-face)
                (goto-char (match-end 0)))