# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1228904463 0
# Node ID 5d2112103019411bea99cc95b0198d209d7e92db
# Parent  da90832da2382092ead5f943624df8ca6ec32121
* net/tramp.el (top): Don't fail if there is no current message.

diff -r da90832da238 -r 5d2112103019 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Dec 10 10:02:50 2008 +0000
+++ b/lisp/ChangeLog	Wed Dec 10 10:21:03 2008 +0000
@@ -1,3 +1,7 @@
+2008-12-10  Juanma Barranquero  <lekktu@gmail.com>
+
+	* net/tramp.el (top): Don't fail if there is no current message.
+
 2008-12-10  Kenichi Handa  <handa@m17n.org>
 
 	* international/fontset.el (setup-default-fontset): Add an entry
diff -r da90832da238 -r 5d2112103019 lisp/net/tramp.el
--- a/lisp/net/tramp.el	Wed Dec 10 10:02:50 2008 +0000
+++ b/lisp/net/tramp.el	Wed Dec 10 10:21:03 2008 +0000
@@ -7470,7 +7470,8 @@
       (unload-feature 'tramp 'force)
     (error nil)))
 
-(when (and load-in-progress (string-match "Loading tramp..." (current-message)))
+(when (and load-in-progress (string-match "Loading tramp..."
+					  (or (current-message) "")))
   (message "Loading tramp...done"))
 
 (provide 'tramp)