(rmail-summary-by-topic): Doc fix.

Regexp-quote default argument taken from current subject.
(rmail-new-summary-1): Error if empty summary.  (Bug#2333)

2 files changed, 27 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8dfb3cc150..e2950b0ba5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2009-02-19  Glenn Morris  <[email protected]>
+
+	* mail/rmailsum.el (rmail-summary-by-topic): Doc fix.
+	Regexp-quote default argument taken from current subject.
+	(rmail-new-summary-1): Error if empty summary.  (Bug#2333)
+
+	* mail/rmail-spam-filter.el (rmail-get-new-mail-filter-spam):
+	Move here from rmail.el.  Be more careful about error-handling.
+	Restore the feature of temporarily setting all old messages
+	undeleted before expunging (removed 2009-02-18).
+
+	* mail/rmail.el (rsf-beep, rsf-sleep-after-message, rmail-spam-filter):
+	Don't declare.
+	(rmail-get-new-mail-filter-spam): Declare.  Move definition to
+	rmail-spam-filter.el.
+	(rmail-get-new-mail-1): Move the beep and sleep to
+	rmail-get-new-mail-filter-spam.
+
 2009-02-18  Martin Rudalics  <[email protected]>
 
 	* cus-edit.el (custom-group-value-create): Insert some
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 58288210c2..6821c1a344 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -150,12 +150,13 @@ Emacs will list the header line in the RMAIL-summary."
 ;;;###autoload
 (defun rmail-summary-by-topic (subject &optional whole-message)
   "Display a summary of all messages with the given SUBJECT.
-Normally checks the Subject field of headers;
-but if WHOLE-MESSAGE is non-nil (prefix arg given),
- look in the whole message.
+Normally checks just the Subject field of headers; but with prefix
+argument WHOLE-MESSAGE is non-nil, looks in the whole message.
 SUBJECT is a string of regexps separated by commas."
   (interactive
-   (let* ((subject (rmail-simplified-subject))
+   ;; We quote the default subject, because if it contains regexp
+   ;; special characters (eg "?"), it can fail to match itself.  (Bug#2333)
+   (let* ((subject (regexp-quote (rmail-simplified-subject)))
 	  (prompt (concat "Topics to summarize by (regexp"
 			  (if subject ", default current subject" "")
 			  "): ")))
@@ -282,18 +283,18 @@ message."
 			       rmail-new-summary-line-count)))
 		(setq summary-msgs (nreverse summary-msgs)))
 	    (narrow-to-region old-min old-max)))))
-
     ;; Temporarily, while summary buffer is unfinished,
     ;; we "don't have" a summary.
-    ;;
+    (setq rmail-summary-buffer nil)
+    (unless summary-msgs
+      (kill-buffer sumbuf)
+      (error "Nothing to summarize"))
     ;; I have not a clue what this clause is doing.  If you read this
     ;; chunk of code and have a clue, then please email that clue to
     ;; [email protected]
-    (setq rmail-summary-buffer nil)
     (if rmail-enable-mime
 	(with-current-buffer rmail-buffer
 	  (setq rmail-summary-buffer nil)))
-
     (save-excursion
       (let ((rbuf (current-buffer))
 	    (total rmail-total-messages))