# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 976790122 0
# Node ID e1e4704de6edc8ee38b4a9a145406a6af8ca0af1
# Parent  ed447b1eada2054f5e46df77ff1d9323a87be0a9
(tooltip-show): If an error is signaled in
x-show-tip, display that error, and display the help in the
echo area.

diff -r ed447b1eada2 -r e1e4704de6ed lisp/tooltip.el
--- a/lisp/tooltip.el	Thu Dec 14 05:44:18 2000 +0000
+++ b/lisp/tooltip.el	Thu Dec 14 10:35:22 2000 +0000
@@ -308,12 +308,18 @@
   "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.