* 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 6ee9530616b770275a7dc68f4fabf418c2a87b41..15736b40b37bb23c9174fced87bbaf7ead46f1cb 100644 (file)
--- 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 d8d642261e49a45bfdd4e7b12827777256c45713..2d26cb5cc666583f9ff6ac7572c45d82dc7d1c9a 100644 (file)
--- 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