aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2012-12-27 20:00:57 +0100
committerMichael Albinus2012-12-27 20:00:57 +0100
commit10ffd0be89b965dea5d2baa93447963b3074d8c1 (patch)
treeadf1f7d875afde6e7981a06df0dcc8e26f4f87ba
parent60f5e585bd5a94ddce429a5271640293afa53089 (diff)
downloademacs-10ffd0be89b965dea5d2baa93447963b3074d8c1.tar.gz
emacs-10ffd0be89b965dea5d2baa93447963b3074d8c1.zip
* net/tramp.el (tramp-handle-file-accessible-directory-p): New defun.
* net/tramp-adb.el (tramp-adb-file-name-handler-alist): * net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): * net/tramp-sh.el (tramp-sh-file-name-handler-alist): Add handler for `file-accessible-directory-p'. (Bug#13275)
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/net/tramp-adb.el1
-rw-r--r--lisp/net/tramp-gvfs.el2
-rw-r--r--lisp/net/tramp-sh.el1
-rw-r--r--lisp/net/tramp.el5
5 files changed, 17 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5dd9faa3f3..e14a5ccf725 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
12012-12-27 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp.el (tramp-handle-file-accessible-directory-p): New defun.
4
5 * net/tramp-adb.el (tramp-adb-file-name-handler-alist):
6 * net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
7 * net/tramp-sh.el (tramp-sh-file-name-handler-alist): Add handler
8 for `file-accessible-directory-p'. (Bug#13275)
9
12012-12-27 Sam Steingold <sds@gnu.org> 102012-12-27 Sam Steingold <sds@gnu.org>
2 11
3 * progmodes/cperl-mode.el (cperl-calculate-indent): Do not stagger 12 * progmodes/cperl-mode.el (cperl-calculate-indent): Do not stagger
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 79de7ab07bb..f31bd6b3d2d 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -82,6 +82,7 @@
82 (file-name-as-directory . tramp-handle-file-name-as-directory) 82 (file-name-as-directory . tramp-handle-file-name-as-directory)
83 (file-regular-p . tramp-handle-file-regular-p) 83 (file-regular-p . tramp-handle-file-regular-p)
84 (file-remote-p . tramp-handle-file-remote-p) 84 (file-remote-p . tramp-handle-file-remote-p)
85 (file-accessible-directory-p . tramp-handle-file-accessible-directory-p)
85 (file-directory-p . tramp-adb-handle-file-directory-p) 86 (file-directory-p . tramp-adb-handle-file-directory-p)
86 (file-symlink-p . tramp-handle-file-symlink-p) 87 (file-symlink-p . tramp-handle-file-symlink-p)
87 ;; FIXME: This is too sloppy. 88 ;; FIXME: This is too sloppy.
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index be83e56d699..b95653f3297 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -384,7 +384,7 @@ Every entry is a list (NAME ADDRESS).")
384 (dired-uncache . tramp-handle-dired-uncache) 384 (dired-uncache . tramp-handle-dired-uncache)
385 ;; `executable-find' is not official yet. performed by default handler. 385 ;; `executable-find' is not official yet. performed by default handler.
386 (expand-file-name . tramp-gvfs-handle-expand-file-name) 386 (expand-file-name . tramp-gvfs-handle-expand-file-name)
387 ;; `file-accessible-directory-p' performed by default handler. 387 (file-accessible-directory-p . tramp-handle-file-accessible-directory-p)
388 (file-acl . tramp-gvfs-handle-file-acl) 388 (file-acl . tramp-gvfs-handle-file-acl)
389 (file-attributes . tramp-gvfs-handle-file-attributes) 389 (file-attributes . tramp-gvfs-handle-file-attributes)
390 (file-directory-p . tramp-gvfs-handle-file-directory-p) 390 (file-directory-p . tramp-gvfs-handle-file-directory-p)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 97270f09327..67459b4f9ca 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -935,6 +935,7 @@ This is used to map a mode number to a permission string.")
935 (file-name-nondirectory . tramp-handle-file-name-nondirectory) 935 (file-name-nondirectory . tramp-handle-file-name-nondirectory)
936 (file-truename . tramp-sh-handle-file-truename) 936 (file-truename . tramp-sh-handle-file-truename)
937 (file-exists-p . tramp-sh-handle-file-exists-p) 937 (file-exists-p . tramp-sh-handle-file-exists-p)
938 (file-accessible-directory-p . tramp-handle-file-accessible-directory-p)
938 (file-directory-p . tramp-sh-handle-file-directory-p) 939 (file-directory-p . tramp-sh-handle-file-directory-p)
939 (file-executable-p . tramp-sh-handle-file-executable-p) 940 (file-executable-p . tramp-sh-handle-file-executable-p)
940 (file-readable-p . tramp-sh-handle-file-readable-p) 941 (file-readable-p . tramp-sh-handle-file-readable-p)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index bc220a33b2a..904d3098b7f 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2757,6 +2757,11 @@ User is always nil."
2757 (if (or dir-p (file-directory-p dir)) dir (file-name-directory dir)) nil 2757 (if (or dir-p (file-directory-p dir)) dir (file-name-directory dir)) nil
2758 (tramp-flush-directory-property v localname))) 2758 (tramp-flush-directory-property v localname)))
2759 2759
2760(defun tramp-handle-file-accessible-directory-p (filename)
2761 "Like `file-accessible-directory-p' for Tramp files."
2762 (and (file-directory-p filename)
2763 (file-executable-p filename)))
2764
2760(defun tramp-handle-file-exists-p (filename) 2765(defun tramp-handle-file-exists-p (filename)
2761 "Like `file-exists-p' for Tramp files." 2766 "Like `file-exists-p' for Tramp files."
2762 (not (null (file-attributes filename)))) 2767 (not (null (file-attributes filename))))