# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1003874468 0
# Node ID 618f0d7df7a0e2820586531398ac37c9c5efb63e
# Parent  afee33bfd42a4ff8107da801371828a9696167dc
(uniquify-get-proposed-name): Fix (.. "usr" "/usr" 0).

diff -r afee33bfd42a -r 618f0d7df7a0 lisp/uniquify.el
--- a/lisp/uniquify.el	Tue Oct 23 18:55:49 2001 +0000
+++ b/lisp/uniquify.el	Tue Oct 23 22:01:08 2001 +0000
@@ -279,7 +279,7 @@
 		file)
 	      extra-string)))
     (when (zerop n)
-      (if (and filename
+      (if (and filename extra-string
 	       (setq filename (file-name-directory filename))
 	       (equal filename
 		      (file-name-directory (directory-file-name filename))))