# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 889316652 0
# Node ID 79e564f91938609309abc02cca1bb84f67abab69
# Parent  440d5927ef18dd0f1ff995dd379ed1b4eee25964
(rmail-next-same-subject): Ignore leading and
trailing whitespace in this message's subject.

(rmail-bury, rmail-quit): Use quit-window.

diff -r 440d5927ef18 -r 79e564f91938 lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Sun Mar 08 00:23:16 1998 +0000
+++ b/lisp/mail/rmail.el	Sun Mar 08 00:24:12 1998 +0000
@@ -962,13 +962,12 @@
   (interactive)
   (rmail-expunge-and-save)
   ;; Don't switch to the summary buffer even if it was recently visible.
-  (if rmail-summary-buffer
-      (progn
-	(replace-buffer-in-windows rmail-summary-buffer)
-	(bury-buffer rmail-summary-buffer)))
+  (when rmail-summary-buffer
+    (replace-buffer-in-windows rmail-summary-buffer)
+    (bury-buffer rmail-summary-buffer))
   (let ((obuf (current-buffer)))
     (replace-buffer-in-windows obuf)
-    (bury-buffer obuf)))
+    (quit-window)))
 
 (defun rmail-bury ()
   "Bury current Rmail buffer and its summary buffer."
@@ -979,10 +978,9 @@
     (if (rmail-summary-exists)
 	(let (window)
 	  (while (setq window (get-buffer-window rmail-summary-buffer))
-	    (set-window-buffer window (other-buffer rmail-summary-buffer)))
+	    (quit-window nil window))
 	  (bury-buffer rmail-summary-buffer)))
-    (switch-to-buffer (other-buffer (current-buffer)))
-    (bury-buffer buffer-to-bury)))
+    (quit-window)))
 
 (defun rmail-duplicate-message ()
   "Create a duplicated copy of the current message.
@@ -2279,8 +2277,12 @@
 	(i rmail-current-message)
 	(case-fold-search t)
 	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: *\\)?"
 				(regexp-quote subject)
 				"\n"))