2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de79abf98a5..56f19a60829 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-30  Kevin Rodgers  <kevin.d.rodgers@gmail.com>  (tiny change)
+
+        * progmodes/grep.el (grep-read-files): Strip trailing <N> from
+        buffer names not visiting a file (e.g. cloned buffers).
+
 2009-08-30  Nick Roberts  <nickrob@snap.net.nz>
 
         * comint.el (comint-exec-1): Check command is non-null first.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 5c199016c65..bf626f6e308 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -748,7 +748,8 @@ substitution string.  Note dynamic scoping of variables.")
 
 (defun grep-read-files (regexp)
   "Read files arg for interactive grep."
-  (let* ((bn (or (buffer-file-name) (buffer-name)))
+  (let* ((bn (or (buffer-file-name)
+                 (replace-regexp-in-string "<[0-9]+>\\'" "" (buffer-name))))
          (fn (and bn
                   (stringp bn)
                   (file-name-nondirectory bn)))