# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1134214193 0
# Node ID b845fff9455cc50647ebf51d007ace2edbad3fb7
# Parent  4d92860b8e50648f2049da5ca481c64993a72356
(rmail-next-same-subject): Handle multiple "Re: " strings and long subject
lines that were broken into multiple lines at arbitrary places.

diff -r 4d92860b8e50 -r b845fff9455c lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Sat Dec 10 10:29:22 2005 +0000
+++ b/lisp/mail/rmail.el	Sat Dec 10 11:29:53 2005 +0000
@@ -3155,13 +3155,18 @@
 	search-regexp found)
     (if (string-match "\\`[ \t]+" subject)
 	(setq subject (substring subject (match-end 0))))
-    (if (string-match "Re:[ \t]*" subject)
+    (if (string-match "\\`\\(Re:[ \t]*\\)+" subject)
 	(setq subject (substring subject (match-end 0))))
     (if (string-match "[ \t]+\\'" subject)
 	(setq subject (substring subject 0 (match-beginning 0))))
-    (setq search-regexp (concat "^Subject: *\\(Re:[ \t]*\\)?"
-				(regexp-quote subject)
-				"[ \t]*\n"))
+    ;; If Subject is long, mailers will break it into several lines at
+    ;; arbitrary places, so replace whitespace with a regexp that will
+    ;; match any sequence of spaces, TABs, and newlines.
+    (setq subject (regexp-quote subject))
+    (setq subject
+	  (replace-regexp-in-string "[ \t\n]+" "[ \t\n]+" subject t t))
+    (setq search-regexp (concat "^Subject: *\\(Re:[ \t]*\\)*"
+				subject "[ \t]*\n"))
     (save-excursion
       (save-restriction
 	(widen)