From df211784d690c15693a92b4c9e91dfa18351c98d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 8 Mar 1998 00:24:12 +0000 Subject: [PATCH] (rmail-next-same-subject): Ignore leading and trailing whitespace in this message's subject. (rmail-bury, rmail-quit): Use quit-window. --- lisp/mail/rmail.el | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index e9901a0526a..7de2b77d395 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -962,13 +962,12 @@ Instead, these commands are available: (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 @@ Instead, these commands are available: (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 @@ If N is negative, go backwards instead." (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")) -- 2.39.2