aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Potortì2001-08-01 14:10:44 +0000
committerFrancesco Potortì2001-08-01 14:10:44 +0000
commitd06a07057a502843473a971e6834d684b41e7fdb (patch)
treebff94b45217e44c164a7aaa2dc54abb57fd0c664
parentcc46bfe76aad366eaae35729d8217f4faf9621df (diff)
downloademacs-d06a07057a502843473a971e6834d684b41e7fdb.tar.gz
emacs-d06a07057a502843473a971e6834d684b41e7fdb.zip
(uniquify-rationalize-file-buffer-names): Add an
explicit test for " **lose**" buffers generated by find-alternate-file to avoid an error in particular conditions.
-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."
202 newbuffile))) 202 newbuffile)))
203 (uniquify-buffer-file-name buffer))) 203 (uniquify-buffer-file-name buffer)))
204 (rawname (and bfn (uniquify-file-name-nondirectory bfn))) 204 (rawname (and bfn (uniquify-file-name-nondirectory bfn)))
205 (bufname (buffer-name buffer))
205 (deserving (and rawname 206 (deserving (and rawname
207 (not (string= bufname " **lose**"))
206 (not (and uniquify-ignore-buffers-re 208 (not (and uniquify-ignore-buffers-re
207 (string-match uniquify-ignore-buffers-re 209 (string-match uniquify-ignore-buffers-re
208 (buffer-name buffer)))) 210 bufname)))
209 (or (not newbuffile) 211 (or (not newbuffile)
210 (equal rawname newbuffile-nd)))) 212 (equal rawname newbuffile-nd))))
211 (min-proposed (if deserving 213 (min-proposed (if deserving
@@ -213,7 +215,7 @@ file name elements. Arguments cause only a subset of buffers to be renamed."
213 rawname bfn uniquify-min-dir-content)))) 215 rawname bfn uniquify-min-dir-content))))
214 (if deserving 216 (if deserving
215 (push (list rawname bfn buffer min-proposed) fix-list) 217 (push (list rawname bfn buffer min-proposed) fix-list)
216 (push (list (buffer-name buffer)) uniquify-non-file-buffer-names)))) 218 (push (list bufname) uniquify-non-file-buffer-names))))
217 ;; selects buffers whose names may need changing, and others that 219 ;; selects buffers whose names may need changing, and others that
218 ;; may conflict. 220 ;; may conflict.
219 (setq fix-list 221 (setq fix-list