8 files changed, 33 insertions, 24 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8440647737c..28431e9a08d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2013-08-17  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el:
+        * net/tramp-adb.el:
+        * net/tramp-cmds.el:
+        * net/tramp-ftp.el:
+        * net/tramp-gvfs.el:
+        * net/tramp-gw.el:
+        * net/tramp-sh.el: Don't wrap external variable declarations by
+        `eval-when-compile'.
+
 2013-08-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 42fa3165847..8ddbe254380 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -37,9 +37,8 @@
 (require 'time-date)
 
 ;; Pacify byte-compiler.
-(eval-when-compile
-  (defvar directory-sep-char)
-  (defvar dired-move-to-filename-regexp))
+(defvar directory-sep-char)
+(defvar dired-move-to-filename-regexp)
 
 (defcustom tramp-adb-program "adb"
   "Name of the Android Debug Bridge program."
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index d377bfc8ec2..937db34a346 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -31,9 +31,8 @@
 (require 'tramp)
 
 ;; Pacify byte-compiler.
-(eval-when-compile
-  (defvar reporter-eval-buffer)
-  (defvar reporter-prompt-for-summary-p))
+(defvar reporter-eval-buffer)
+(defvar reporter-prompt-for-summary-p)
 
 (defun tramp-list-tramp-buffers ()
   "Return a list of all Tramp connection buffers."
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index fbc02911d93..9e1be06a2b1 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -33,10 +33,10 @@
 ;; Pacify byte-compiler.
 (eval-when-compile
   (require 'cl)
-  (require 'custom)
-  (defvar ange-ftp-ftp-name-arg)
-  (defvar ange-ftp-ftp-name-res)
-  (defvar ange-ftp-name-format))
+  (require 'custom))
+(defvar ange-ftp-ftp-name-arg)
+(defvar ange-ftp-ftp-name-res)
+(defvar ange-ftp-name-format)
 
 ;; Disable Ange-FTP from file-name-handler-alist.
 ;; To handle EFS, the following functions need to be dealt with:
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 7c41499a2e9..f70074ba6e9 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -107,8 +107,8 @@
 ;; Pacify byte-compiler.
 (eval-when-compile
   (require 'cl)
-  (require 'custom)
-  (defvar ls-lisp-use-insert-directory-program))
+  (require 'custom))
+(defvar ls-lisp-use-insert-directory-program)
 
 ;;;###tramp-autoload
 (defcustom tramp-gvfs-methods '("dav" "davs" "obex" "synce")
diff --git a/lisp/net/tramp-gw.el b/lisp/net/tramp-gw.el
index 7d221618f42..53dbdbc45d4 100644
--- a/lisp/net/tramp-gw.el
+++ b/lisp/net/tramp-gw.el
@@ -36,8 +36,8 @@
 ;; Pacify byte-compiler.
 (eval-when-compile
   (require 'cl)
-  (require 'custom)
-  (defvar socks-noproxy))
+  (require 'custom))
+(defvar socks-noproxy)
 
 ;; We don't add the following methods to `tramp-methods', in order to
 ;; exclude them from file name completion.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 6e96616d2d3..e41ed36f597 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -31,10 +31,10 @@
 ;; Pacify byte-compiler.
 (eval-when-compile
   (require 'cl)
-  (require 'dired)
-  (defvar directory-sep-char)
-  (defvar tramp-gw-tunnel-method)
-  (defvar tramp-gw-socks-method))
+  (require 'dired))
+(defvar directory-sep-char)
+(defvar tramp-gw-tunnel-method)
+(defvar tramp-gw-socks-method)
 
 (defcustom tramp-inline-compress-start-size 4096
   "The minimum size of compressing where inline transfer.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 29df2bb6577..cd7d17b130c 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -61,12 +61,12 @@
 
 ;; Pacify byte-compiler.
 (eval-when-compile
-  (require 'cl)
-  (defvar bkup-backup-directory-info)
-  (defvar directory-sep-char)
-  (defvar eshell-path-env)
-  (defvar file-notify-descriptors)
-  (defvar outline-regexp))
+  (require 'cl))
+(defvar bkup-backup-directory-info)
+(defvar directory-sep-char)
+(defvar eshell-path-env)
+(defvar file-notify-descriptors)
+(defvar outline-regexp)
 
 ;;; User Customizable Internal Variables: