From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 4 Jun 1996 15:31:01 +0000 (+0000)
Subject: (occur): Avoid "1 lines" in echo area.
X-Git-Tag: emacs-19.34~534
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65b4665c1f5c26c63d19492ed48f1242280726cc;p=emacs.git

(occur): Avoid "1 lines" in echo area.
---

diff --git a/lisp/replace.el b/lisp/replace.el
index 747adbe27e4..90c66fa47c0 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -448,11 +448,13 @@ It serves as a menu to find any of the occurrences in this buffer.
 	    ;; Put positions in increasing order to go with buffer.
 	    (setq occur-pos-list (nreverse occur-pos-list))
 	    (goto-char (point-min))
-	    (if (= (length occur-pos-list) 1)
-		(insert "1 line")
-	      (insert (format "%d lines" (length occur-pos-list))))
-	    (if (interactive-p)
-		(message "%d matching lines." (length occur-pos-list)))))))))
+	    (let ((message-string
+		   (if (= (length occur-pos-list) 1)
+		       "1 line"
+		     (format "%d lines" (length occur-pos-list)))))
+	      (insert message-string)
+	      (if (interactive-p)
+		  (message "%s matched" message-string)))))))))
 
 ;; It would be nice to use \\[...], but there is no reasonable way
 ;; to make that display both SPC and Y.