# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 798783757 0
# Node ID 03aaf11843d1b40cd77faebbda018269ccebd187
# Parent  c20207bd74a82f65d3ed4cceebca141f952b30b8
(rename-uniquely): Don't discard <NN> from end
if that is part of the visited file name.

diff -r c20207bd74a8 -r 03aaf11843d1 lisp/files.el
--- a/lisp/files.el	Tue Apr 25 04:09:47 1995 +0000
+++ b/lisp/files.el	Tue Apr 25 04:22:37 1995 +0000
@@ -1882,7 +1882,14 @@
 or multiple mail buffers, etc."
   (interactive)
   (save-match-data
-    (let* ((base-name (if (string-match "<[0-9]+>\\'" (buffer-name))
+    (let* ((base-name (if (and (string-match "<[0-9]+>\\'" (buffer-name))
+			       (not (and buffer-file-name
+					 (string= (buffer-name)
+						  (file-name-nondirectory
+						   buffer-file-name)))))
+			  ;; If the existing buffer name has a <NNN>,
+			  ;; which isn't part of the file name (if any),
+			  ;; then get rid of that.
 			  (substring (buffer-name) 0 (match-beginning 0))
 			(buffer-name)))
 	   (new-buf (generate-new-buffer base-name))