From: John Paul Wallington <jpw@pobox.com>
Date: Sun, 11 Apr 2004 04:57:44 +0000 (+0000)
Subject: * replace.el (occur-engine): Distinguish between one and several
X-Git-Tag: ttn-vms-21-2-B4~6915
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dbed3cd3c02a9528123896291d2e849d37053e48;p=emacs.git

* replace.el (occur-engine): Distinguish between one and several
matches in the matches per buffer heading.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ee9530616b..15736b40b37 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-11  John Paul Wallington  <jpw@gnu.org>
+
+	* replace.el (occur-engine): Distinguish between one and several
+	matches in the matches per buffer heading.
+
 2004-04-11  Kim F. Storm  <storm@cua.dk>
 
 	* ido.el (ido-confirm-unique-completion): New defcustom.
diff --git a/lisp/replace.el b/lisp/replace.el
index d8d642261e4..2d26cb5cc66 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -916,8 +916,9 @@ See also `multi-occur'."
 		(goto-char headerpt)
 		(let ((beg (point))
 		      end)
-		  (insert (format "%d matches for \"%s\" in buffer: %s\n"
-				  matches regexp (buffer-name buf)))
+		  (insert (format "%d match%s for \"%s\" in buffer: %s\n"
+				  matches (if (= matches 1) "" "es")
+				  regexp (buffer-name buf)))
 		  (setq end (point))
 		  (add-text-properties beg end
 				       (append