diff options
| -rw-r--r-- | lisp/files.el | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/lisp/files.el b/lisp/files.el index 6054af1b4e8..fbb148322fd 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -2405,20 +2405,16 @@ This function is useful for creating multiple shell process buffers | |||
| 2405 | or multiple mail buffers, etc." | 2405 | or multiple mail buffers, etc." |
| 2406 | (interactive) | 2406 | (interactive) |
| 2407 | (save-match-data | 2407 | (save-match-data |
| 2408 | (let* ((base-name (if (and (string-match "<[0-9]+>\\'" (buffer-name)) | 2408 | (let ((base-name (buffer-name))) |
| 2409 | (not (and buffer-file-name | 2409 | (and (string-match "<[0-9]+>\\'" base-name) |
| 2410 | (string= (buffer-name) | 2410 | (not (and buffer-file-name |
| 2411 | (file-name-nondirectory | 2411 | (string= base-name |
| 2412 | buffer-file-name))))) | 2412 | (file-name-nondirectory buffer-file-name)))) |
| 2413 | ;; If the existing buffer name has a <NNN>, | 2413 | ;; If the existing buffer name has a <NNN>, |
| 2414 | ;; which isn't part of the file name (if any), | 2414 | ;; which isn't part of the file name (if any), |
| 2415 | ;; then get rid of that. | 2415 | ;; then get rid of that. |
| 2416 | (substring (buffer-name) 0 (match-beginning 0)) | 2416 | (setq base-name (substring base-name 0 (match-beginning 0)))) |
| 2417 | (buffer-name))) | 2417 | (rename-buffer (generate-new-buffer-name base-name)) |
| 2418 | (new-buf (generate-new-buffer base-name)) | ||
| 2419 | (name (buffer-name new-buf))) | ||
| 2420 | (kill-buffer new-buf) | ||
| 2421 | (rename-buffer name) | ||
| 2422 | (force-mode-line-update)))) | 2418 | (force-mode-line-update)))) |
| 2423 | 2419 | ||
| 2424 | (defun make-directory (dir &optional parents) | 2420 | (defun make-directory (dir &optional parents) |