--- a/lisp/gnus/gnus-score.el	Mon Aug 13 08:45:53 2007 +0200
+++ b/lisp/gnus/gnus-score.el	Mon Aug 13 08:46:35 2007 +0200
@@ -392,7 +392,7 @@
 	    (if mimic (error "%c %c" prefix hchar) (error "")))
 
 	  (when (/= (downcase tchar) tchar)
-	    ;; It was a majuscle, so we end reading and the the default.
+	    ;; It was a majuscle, so we end reading and use the default.
 	    (if mimic (message "%c %c %c" prefix hchar tchar)
 	      (message ""))
 	    (setq pchar (or pchar ?p)))
@@ -551,7 +551,7 @@
 	((eq type 'f)
 	 (setq match (gnus-simplify-subject-fuzzy match))))
   (let ((score (gnus-score-default score))
-	(header (downcase header))
+	(header (format "%s" (downcase header)))
 	new)
     (and prompt (setq match (read-string 
 			     (format "Match %s on %s, %s: " 
@@ -566,6 +566,9 @@
 				 (int-to-string match)
 			       match))))
 
+    ;; Get rid of string props.
+    (setq match (format "%s" match))
+
     ;; If this is an integer comparison, we transform from string to int. 
     (and (eq (nth 2 (assoc header gnus-header-index)) 'gnus-score-integer)
 	 (setq match (string-to-int match)))
@@ -709,7 +712,7 @@
   "Automatically expunge articles with score below SCORE."
   (interactive 
    (list (or (and current-prefix-arg (prefix-numeric-value current-prefix-arg))
-	     (string-to-int (read-string "Expunge below: ")))))
+	     (string-to-int (read-string "Set expunge below: ")))))
   (setq score (or score gnus-summary-default-score 0))
   (gnus-score-set 'expunge (list score))
   (gnus-score-set 'touched '(t)))
@@ -720,11 +723,11 @@
   (setq score (gnus-score-default score))
   (when (gnus-buffer-live-p gnus-summary-buffer)
     (save-excursion
-      (set-buffer gnus-summary-buffer)
       (save-restriction
 	(goto-char (point-min))
 	(let ((id (mail-fetch-field "message-id")))
 	  (when id
+	    (set-buffer gnus-summary-buffer)
 	    (gnus-summary-score-entry
 	     "references" (concat id "[ \t]*$") 'r
 	     score (current-time-string) nil t)))))))
@@ -735,11 +738,11 @@
   (setq score (gnus-score-default score))
   (when (gnus-buffer-live-p gnus-summary-buffer)
     (save-excursion
-      (set-buffer gnus-summary-buffer)
       (save-restriction
 	(goto-char (point-min))
 	(let ((id (mail-fetch-field "message-id")))
 	  (when id
+	    (set-buffer gnus-summary-buffer)
 	    (gnus-summary-score-entry
 	     "references" id 's
 	     score (current-time-string))))))))