Changeset 4200 for trunk/lisp/ffap.el

Timestamp:

2007年04月07日 15時49分28秒 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/ffap.el (modified) (3 diffs)

trunk/lisp/ffap.el

@@ -1148 +1148 @@
-              string))
-         (abs (file-name-absolute-p name))
-
+
+
-    (unwind-protect
-        (cond
@@ -1165 +1166 @@
-               (ffap-file-exists-string (substring name (match-end 0)))))
-         ;; Accept remote names without actual checking (too slow):
-
-
-
-
-
-
-
+
-         ;; Ok, not remote, try the existence test even if it is absolute:
-         ((and abs (ffap-file-exists-string name)))
@@ -1194 +1189 @@
-                                  (ffap-file-exists-string try))))))
-            try))
+         ;; Try adding a leading "/" (common omission in ftp file names).
+         ;; Note that this uses oname, which still has any colon part.
+         ;; This should have a lower priority than the alist stuff,
+         ;; else it matches things like "ffap.el:1234:56:Warning".
+         ((and (not abs)
+               ffap-ftp-sans-slash-regexp
+               (string-match ffap-ftp-sans-slash-regexp oname)
+               (ffap-file-remote-p (concat "/" oname))))
-         ;; Alist failed?  Try to guess an active remote connection
-         ;; from buffer variables, and try once more, both as an