aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-01-22 07:34:07 +0000
committerRichard M. Stallman2002-01-22 07:34:07 +0000
commitc392a090aaf152b6d2f99c4b52dc54c0cd09e3ab (patch)
treec73b2717da957fe24d51d84faa5d5c77b5f1b6e1
parent9f2e5ef39d8dea5ccf5374abe1dbf8cac33e701f (diff)
downloademacs-c392a090aaf152b6d2f99c4b52dc54c0cd09e3ab.tar.gz
emacs-c392a090aaf152b6d2f99c4b52dc54c0cd09e3ab.zip
(ange-ftp-canonize-filename): Avoid duplicate slash if DIR is just slash.
-rw-r--r--lisp/net/ange-ftp.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index ef4b65d5556..1cb56f9ad7a 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -3170,7 +3170,8 @@ logged in as user USER and cd'd to directory DIR."
3170 (rest (substring name (match-end 0))) 3170 (rest (substring name (match-end 0)))
3171 (dir (ange-ftp-expand-dir host user tilda))) 3171 (dir (ange-ftp-expand-dir host user tilda)))
3172 (if dir 3172 (if dir
3173 (setq name (concat dir rest)) 3173 (setq name (if (string-equal dir "/")
3174 rest (concat dir rest)))
3174 (error "User \"%s\" is not known" 3175 (error "User \"%s\" is not known"
3175 (substring tilda 1))))) 3176 (substring tilda 1)))))
3176 3177