(tooltip-show): If an error is signaled in

x-show-tip, display that error, and display the help in the
echo area.

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 9ad338418c2764f7ad06ce7778d53ab7e3ba3dc2..dada23d0c2eb46b8fe267e0123344aa2fba990c1 100644 (file)
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -308,12 +308,18 @@ ACTIVATEP non-nil means activate mouse motion events."
   "Show a tooltip window at the current mouse position displaying TEXT."
   (if tooltip-use-echo-area
       (message "%s" text)
-    (x-show-tip text
-               (selected-frame)
-               tooltip-frame-parameters
-               nil
-               tooltip-x-offset
-               tooltip-y-offset)))
+    (condition-case error
+       (x-show-tip text
+                   (selected-frame)
+                   tooltip-frame-parameters
+                   nil
+                   tooltip-x-offset
+                   tooltip-y-offset)
+      (error 
+       (message "Error while displaying tooltip: %s" error)
+       (sit-for 1)
+       (message "%s" text)))))
+
 
 (defun tooltip-hide (&optional ignored-arg)
   "Hide a tooltip, if one is displayed.