aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus2008-06-08 11:09:23 +0000
committerMichael Albinus2008-06-08 11:09:23 +0000
commit4c808a5caa661d081f5fda8d05e3dc68835316f5 (patch)
tree322e41c2494b857afdd662cef5ef2283c21242dd /lisp
parent32d956a88601d0130721a9f4acab4898a959240d (diff)
downloademacs-4c808a5caa661d081f5fda8d05e3dc68835316f5.tar.gz
emacs-4c808a5caa661d081f5fda8d05e3dc68835316f5.zip
* uniquify.el (uniquify-get-proposed-name): Handle remote files.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/uniquify.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8985f40db8d..58ecb708be7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-06-08 Michael Albinus <michael.albinus@gmx.de>
2
3 * uniquify.el (uniquify-get-proposed-name): Handle remote files.
4
12008-05-26 Stefan Monnier <monnier@iro.umontreal.ca> 52008-05-26 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * tar-mode.el (tar-header-block-summarize): Ensure one space around 7 * tar-mode.el (tar-header-block-summarize): Ensure one space around
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 07772bd6cda..a5614fd269c 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -360,7 +360,8 @@ in `uniquify-list-buffers-directory-modes', otherwise returns nil."
360 (setq dirname (directory-file-name dirname))) 360 (setq dirname (directory-file-name dirname)))
361 (setq n (1- n)) 361 (setq n (1- n))
362 (push (if (zerop (length file)) ;nil or "". 362 (push (if (zerop (length file)) ;nil or "".
363 (prog1 "" (setq dirname nil)) ;Could be `dirname' iso "". 363 (prog1 (or (file-remote-p dirname) "")
364 (setq dirname nil)) ;Could be `dirname' iso "".
364 file) 365 file)
365 extra-string))) 366 extra-string)))
366 (when (zerop n) 367 (when (zerop n)