aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-10-14 01:28:36 +0000
committerRichard M. Stallman2002-10-14 01:28:36 +0000
commit5da10d404b53cfffee1b6d8469e3ea674a739258 (patch)
tree1b7bd5382f03fd7da6dc8c2fbb388a2e3fa720f6
parent1b0d40de85b5af240a3afec74a80397459d747cb (diff)
downloademacs-5da10d404b53cfffee1b6d8469e3ea674a739258.tar.gz
emacs-5da10d404b53cfffee1b6d8469e3ea674a739258.zip
(uniquify-get-proposed-name): Don't use directory-sep-char.
-rw-r--r--lisp/uniquify.el17
1 files changed, 8 insertions, 9 deletions
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 27001fc17aa..25f931868e9 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -298,21 +298,20 @@ in `uniquify-list-buffers-directory-modes', otherwise returns nil."
298 (cond 298 (cond
299 ((null extra-string) base) 299 ((null extra-string) base)
300 ((string-equal base "") ;Happens for dired buffers on the root directory. 300 ((string-equal base "") ;Happens for dired buffers on the root directory.
301 (mapconcat 'identity extra-string (string directory-sep-char))) 301 (mapconcat 'identity extra-string "/"))
302 ((eq uniquify-buffer-name-style 'reverse) 302 ((eq uniquify-buffer-name-style 'reverse)
303 (let ((dirsep (string directory-sep-char))) 303 (mapconcat 'identity
304 (mapconcat 'identity 304 (cons base (nreverse extra-string))
305 (cons base (nreverse extra-string)) 305 (or uniquify-separator "\\")))
306 (or uniquify-separator "\\"))))
307 ((eq uniquify-buffer-name-style 'forward) 306 ((eq uniquify-buffer-name-style 'forward)
308 (mapconcat 'identity (nconc extra-string (list base)) 307 (mapconcat 'identity (nconc extra-string (list base))
309 (string directory-sep-char))) 308 "/"))
310 ((eq uniquify-buffer-name-style 'post-forward) 309 ((eq uniquify-buffer-name-style 'post-forward)
311 (concat base (or uniquify-separator "|") 310 (concat base (or uniquify-separator "|")
312 (mapconcat 'identity extra-string (string directory-sep-char)))) 311 (mapconcat 'identity extra-string "/")))
313 ((eq uniquify-buffer-name-style 'post-forward-angle-brackets) 312 ((eq uniquify-buffer-name-style 'post-forward-angle-brackets)
314 (concat base "<" (mapconcat 'identity extra-string 313 (concat base "<" (mapconcat 'identity extra-string "/")
315 (string directory-sep-char)) ">")) 314 ">"))
316 (t (error "Bad value for uniquify-buffer-name-style: %s" 315 (t (error "Bad value for uniquify-buffer-name-style: %s"
317 uniquify-buffer-name-style))))) 316 uniquify-buffer-name-style)))))
318 317