From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 18 Oct 2015 08:29:43 +0000 (+0200)
Subject: Minor edits in Tramp
X-Git-Tag: emacs-25.0.90~1097
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/f8ff3937660f4192d72dec2da31fa5c582434d1f

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.
---

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 595e0ef672..88dea6a7e3 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -36,6 +36,7 @@
 (require 'tramp)
 
 ;; Pacify byte-compiler.
+(defvar directory-listing-before-filename-regexp)
 (defvar directory-sep-char)
 
 ;;;###tramp-autoload
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index e6451956dc..7157ac25fa 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -105,12 +105,6 @@
   (unless (boundp 'remote-file-name-inhibit-cache)
     (defvar remote-file-name-inhibit-cache nil))
 
-  ;; `directory-listing-before-filename-regexp' does not exist in
-  ;; XEmacs.  Since we use it only in tramp-adb.el, it doesn't harm to
-  ;; declare it here.
-  (unless (boundp 'directory-listing-before-filename-regexp)
-      (defvar directory-listing-before-filename-regexp nil))
-
   ;; For not existing functions, or functions with a changed argument
   ;; list, there are compiler warnings.  We want to avoid them in
   ;; cases we know what we do.