[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el

[Eli Zaretskii]

Index: emacs/lisp/mail/rmail.el
diff -c emacs/lisp/mail/rmail.el:1.415 emacs/lisp/mail/rmail.el:1.416
*** emacs/lisp/mail/rmail.el:1.415      Sat Sep 24 13:43:59 2005
--- emacs/lisp/mail/rmail.el    Sat Dec 10 11:29:53 2005
***************
*** 3155,3167 ****
        search-regexp found)
      (if (string-match "\\`[ \t]+" subject)
        (setq subject (substring subject (match-end 0))))
!     (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"))
      (save-excursion
        (save-restriction
        (widen)
--- 3155,3172 ----
        search-regexp found)
      (if (string-match "\\`[ \t]+" subject)
        (setq subject (substring subject (match-end 0))))
!     (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))))
!     ;; 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)