[Emacs-diffs] /srv/bzr/emacs/trunk r108831: * lisp/net/ange-ftp.el (ange-ftp-expand-file-name): Use ange-ftp-ftp-name

[Stefan Monnier]

------------------------------------------------------------
revno: 108831
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-02 09:31:15 -0400
message:
  * lisp/net/ange-ftp.el (ange-ftp-expand-file-name): Use ange-ftp-ftp-name
  and file-name-absolute-p.
  (ange-ftp-file-exists-p): Use ange-ftp-file-exists-p for
  internal calls.
modified:
  lisp/ChangeLog
  lisp/net/ange-ftp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-02 08:00:05 +0000
+++ b/lisp/ChangeLog    2012-07-02 13:31:15 +0000
@@ -1,3 +1,10 @@
+2012-07-02  Stefan Monnier  <address@hidden>
+
+       * net/ange-ftp.el (ange-ftp-expand-file-name): Use ange-ftp-ftp-name
+       and file-name-absolute-p.
+       (ange-ftp-file-exists-p): Use ange-ftp-file-exists-p for
+       internal calls.
+
 2012-07-02  Paul Eggert  <address@hidden>
 
        Spelling fixes.
@@ -50,7 +57,7 @@
 
 2012-06-30  Stefan Monnier  <address@hidden>
 
-       * emacs-lisp/cl-lib.el: Require macroexp for its macros.
+       * emacs-lisp/cl-lib.el: Require macroexp.
 
 2012-06-30  Chong Yidong  <address@hidden>
 

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2012-07-02 08:00:05 +0000
+++ b/lisp/net/ange-ftp.el      2012-07-02 13:31:15 +0000
@@ -3143,21 +3143,15 @@
   "Documented as `expand-file-name'."
   (save-match-data
     (setq default (or default default-directory))
-    (cond ((eq (string-to-char name) ?~)
-          (ange-ftp-real-expand-file-name name))
-         ((eq (string-to-char name) ?/)
-          (ange-ftp-canonize-filename name))
-         ((and (eq system-type 'windows-nt)
-               (eq (string-to-char name) ?\\))
-          (ange-ftp-canonize-filename name))
-         ((and (eq system-type 'windows-nt)
-               (or (string-match "\\`[a-zA-Z]:" name)
-                   (string-match "\\`[a-zA-Z]:" default)))
-          (ange-ftp-real-expand-file-name name default))
-         ((zerop (length name))
-          (ange-ftp-canonize-filename default))
-         ((ange-ftp-canonize-filename
-           (concat (file-name-as-directory default) name))))))
+    (cond
+     ((ange-ftp-ftp-name name)
+      ;; `default' is irrelevant.
+      (ange-ftp-canonize-filename name))
+     ((file-name-absolute-p name)
+      ;; `name' is absolute but is not an ange-ftp name => not ange-ftp.
+      (ange-ftp-real-expand-file-name name "/"))
+     ((ange-ftp-canonize-filename
+       (concat (file-name-as-directory default) name))))))
 
 ;;; These are problems--they are currently not enabled.
 
@@ -3390,7 +3384,7 @@
       (if (ange-ftp-file-entry-p name)
          (let ((file-ent (ange-ftp-get-file-entry name)))
            (if (stringp file-ent)
-               (file-exists-p
+               (ange-ftp-file-exists-p
                 (ange-ftp-expand-symlink file-ent
                                          (file-name-directory
                                           (directory-file-name name))))