aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGerd Moellmann2001-01-04 14:10:01 +0000
committerGerd Moellmann2001-01-04 14:10:01 +0000
commitf3b05e994e627e48fea81ff48551571803d35568 (patch)
treee8b425e8549b005e7235ae7d57fb917d7604a6c7 /lisp
parent2621f5a96f7a359fc4a9ab827138fe4fc1d6f189 (diff)
downloademacs-f3b05e994e627e48fea81ff48551571803d35568.tar.gz
emacs-f3b05e994e627e48fea81ff48551571803d35568.zip
Fix last change.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/tooltip.el8
2 files changed, 12 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40bb86fc5b9..0534cee8953 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12001-01-04 Gerd Moellmann <gerd@gnu.org>
2
3 * tooltip.el (tooltip-frame-parameters): Remove colors.
4 (tooltip): New face
5 (tooltip-set-param): New function.
6 (tooltip-show): Set up color frame parameters from face `tooltip'.
7 Display the tooltip text in face `tooltip'.
8
12001-01-03 Dave Love <fx@gnu.org> 92001-01-03 Dave Love <fx@gnu.org>
2 10
3 * dired-x.el: Doc fixes. Maintainer change. 11 * dired-x.el: Doc fixes. Maintainer change.
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 408943f0048..f9d58802d7e 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -331,13 +331,13 @@ change the existing association. Value is the resulting alist."
331 (fg (face-attribute 'tooltip :foreground)) 331 (fg (face-attribute 'tooltip :foreground))
332 (bg (face-attribute 'tooltip :background))) 332 (bg (face-attribute 'tooltip :background)))
333 (unless (eq 'unspecified fg) 333 (unless (eq 'unspecified fg)
334 (tooltip-set-param params 'foreground-color fg)) 334 (setq params (tooltip-set-param params 'foreground-color fg)))
335 (unless (eq 'unspecified bg) 335 (unless (eq 'unspecified bg)
336 (tooltip-set-param params 'background-color bg) 336 (setq params (tooltip-set-param params 'background-color bg))
337 (tooltip-set-param params 'border-color bg)) 337 (setq params (tooltip-set-param params 'border-color bg)))
338 (x-show-tip (propertize text 'face 'tooltip) 338 (x-show-tip (propertize text 'face 'tooltip)
339 (selected-frame) 339 (selected-frame)
340 tooltip-frame-parameters 340 params
341 nil 341 nil
342 tooltip-x-offset 342 tooltip-x-offset
343 tooltip-y-offset)) 343 tooltip-y-offset))