From a512e1a23400ab25b8ee64566001cc3d24aa81cd Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 10 Dec 2008 10:21:03 +0000 Subject: [PATCH] * net/tramp.el (top): Don't fail if there is no current message. --- lisp/ChangeLog | 4 ++++ lisp/net/tramp.el | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e26cdc62dd2..284745de5b9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-12-10 Juanma Barranquero + + * net/tramp.el (top): Don't fail if there is no current message. + 2008-12-10 Kenichi Handa * international/fontset.el (setup-default-fontset): Add an entry diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 83f87472dfd..031d2fecc32 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -7470,7 +7470,8 @@ Only works for Bourne-like shells." (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) -- 2.39.5