From: Glenn Morris <rgm@gnu.org>
Date: Sat, 17 May 2008 20:10:06 +0000 (+0000)
Subject: (top-level): Load auth-source when compiling.
X-Git-Tag: emacs-pretest-23.0.90~5464
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bcb04d981a77dff646af0d844ac7240824147927;p=emacs.git

(top-level): Load auth-source when compiling.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0c77499698..821fb8580a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-05-17  Glenn Morris  <rgm@gnu.org>
 
+	* net/tramp.el (top-level): Load auth-source when compiling.
+
 	* progmodes/fortran.el (fortran-font-lock-keywords-2): Add .eqv., .neqv.
 
 2008-05-17  Andreas Schwab  <schwab@suse.de>
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index fb124389278..a026b45c4d2 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -87,9 +87,10 @@
 (require 'shell)
 (require 'advice)
 
-(if (featurep 'xemacs)
-    (load "auth-source" 'noerror)
-  (require 'auth-source nil 'noerror))
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (load "auth-source" 'noerror)
+    (require 'auth-source nil 'noerror)))
 
 ;; Requiring 'tramp-cache results in an endless loop.
 (autoload 'tramp-get-file-property "tramp-cache")