[Emacs-diffs] emacs/lisp ChangeLog net/tramp.el

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/12/10 10:21:08

Modified files:
        lisp           : ChangeLog 
        lisp/net       : tramp.el 

Log message:
        * net/tramp.el (top): Don't fail if there is no current message.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14928&r2=1.14929
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.216&r2=1.217

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14928
retrieving revision 1.14929
diff -u -b -r1.14928 -r1.14929
--- ChangeLog   10 Dec 2008 06:05:52 -0000      1.14928
+++ ChangeLog   10 Dec 2008 10:21:03 -0000      1.14929
@@ -1,3 +1,7 @@
+2008-12-10  Juanma Barranquero  <address@hidden>
+
+       * net/tramp.el (top): Don't fail if there is no current message.
+
 2008-12-10  Kenichi Handa  <address@hidden>
 
        * international/fontset.el (setup-default-fontset): Add an entry

Index: net/tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -b -r1.216 -r1.217
--- net/tramp.el        4 Dec 2008 20:43:23 -0000       1.216
+++ net/tramp.el        10 Dec 2008 10:21:06 -0000      1.217
@@ -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)