summaryrefslogtreecommitdiff
path: root/lisp/uniquify.el
diff options
context:
space:
mode:
authorFrancesco Potortì <pot@gnu.org>2001-08-01 14:10:44 +0000
committerFrancesco Potortì <pot@gnu.org>2001-08-01 14:10:44 +0000
commitd06a07057a502843473a971e6834d684b41e7fdb (patch)
treebff94b45217e44c164a7aaa2dc54abb57fd0c664 /lisp/uniquify.el
parentcc46bfe76aad366eaae35729d8217f4faf9621df (diff)
downloademacs-d06a07057a502843473a971e6834d684b41e7fdb.tar.gz
(uniquify-rationalize-file-buffer-names): Add an
explicit test for " **lose**" buffers generated by find-alternate-file to avoid an error in particular conditions.
Diffstat (limited to 'lisp/uniquify.el')
-rw-r--r--lisp/uniquify.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index e3b7874de0a..4d393b963b1 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -202,10 +202,12 @@ file name elements. Arguments cause only a subset of buffers to be renamed."
newbuffile)))
(uniquify-buffer-file-name buffer)))
(rawname (and bfn (uniquify-file-name-nondirectory bfn)))
+ (bufname (buffer-name buffer))
(deserving (and rawname
+ (not (string= bufname " **lose**"))
(not (and uniquify-ignore-buffers-re
(string-match uniquify-ignore-buffers-re
- (buffer-name buffer))))
+ bufname)))
(or (not newbuffile)
(equal rawname newbuffile-nd))))
(min-proposed (if deserving
@@ -213,7 +215,7 @@ file name elements. Arguments cause only a subset of buffers to be renamed."
rawname bfn uniquify-min-dir-content))))
(if deserving
(push (list rawname bfn buffer min-proposed) fix-list)
- (push (list (buffer-name buffer)) uniquify-non-file-buffer-names))))
+ (push (list bufname) uniquify-non-file-buffer-names))))
;; selects buffers whose names may need changing, and others that
;; may conflict.
(setq fix-list