aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2015-10-18 10:29:43 +0200
committerMichael Albinus2015-10-18 10:29:43 +0200
commitf8ff3937660f4192d72dec2da31fa5c582434d1f (patch)
treeae7b9dc0c69c67ecf6dcfb8870028e9bc2af2468
parent59c67f8181e849bea37919c757ac7691b27e1657 (diff)
downloademacs-f8ff3937660f4192d72dec2da31fa5c582434d1f.tar.gz
emacs-f8ff3937660f4192d72dec2da31fa5c582434d1f.zip
Minor edits in Tramp
* lisp/net/tramp-adb.el (directory-listing-before-filename-regexp): Declare it. * lisp/net/tramp-compat.el (directory-listing-before-filename-regexp): Remove declaration.
-rw-r--r--lisp/net/tramp-adb.el1
-rw-r--r--lisp/net/tramp-compat.el6
2 files changed, 1 insertions, 6 deletions
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 595e0ef6722..88dea6a7e35 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -36,6 +36,7 @@
36(require 'tramp) 36(require 'tramp)
37 37
38;; Pacify byte-compiler. 38;; Pacify byte-compiler.
39(defvar directory-listing-before-filename-regexp)
39(defvar directory-sep-char) 40(defvar directory-sep-char)
40 41
41;;;###tramp-autoload 42;;;###tramp-autoload
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index e6451956dc4..7157ac25fa2 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -105,12 +105,6 @@
105 (unless (boundp 'remote-file-name-inhibit-cache) 105 (unless (boundp 'remote-file-name-inhibit-cache)
106 (defvar remote-file-name-inhibit-cache nil)) 106 (defvar remote-file-name-inhibit-cache nil))
107 107
108 ;; `directory-listing-before-filename-regexp' does not exist in
109 ;; XEmacs. Since we use it only in tramp-adb.el, it doesn't harm to
110 ;; declare it here.
111 (unless (boundp 'directory-listing-before-filename-regexp)
112 (defvar directory-listing-before-filename-regexp nil))
113
114 ;; For not existing functions, or functions with a changed argument 108 ;; For not existing functions, or functions with a changed argument
115 ;; list, there are compiler warnings. We want to avoid them in 109 ;; list, there are compiler warnings. We want to avoid them in
116 ;; cases we know what we do. 110 ;; cases we know what we do.