aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-12-11 21:13:33 +0000
committerGerd Moellmann2000-12-11 21:13:33 +0000
commita3642e49097db87eb3144b61c5e2bda6c011d13c (patch)
tree3d79cba2846adbe6104ea774867511cf24805cf4 /src
parent44b5a125d347949d86c0e9209217a04c77c04c7b (diff)
downloademacs-a3642e49097db87eb3144b61c5e2bda6c011d13c.tar.gz
emacs-a3642e49097db87eb3144b61c5e2bda6c011d13c.zip
(Fx_hide_tip): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xfns.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 871b0e72ce0..e450bebd4d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12000-12-11 Gerd Moellmann <gerd@gnu.org> 12000-12-11 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xfns.c (Fx_hide_tip): Fix last change.
4
3 * xfns.c (Fx_hide_tip): Avoid unnecessary work when there's 5 * xfns.c (Fx_hide_tip): Avoid unnecessary work when there's
4 nothing to do. Bind inhibit-quit. 6 nothing to do. Bind inhibit-quit.
5 (tip_frame): Make it a Lisp_Object. 7 (tip_frame): Make it a Lisp_Object.
diff --git a/src/xfns.c b/src/xfns.c
index 03130eb1e1f..930269c738f 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -10764,9 +10764,13 @@ Value is t is tooltip was open, nil otherwise.")
10764 10764
10765 if (!NILP (tip_timer)) 10765 if (!NILP (tip_timer))
10766 { 10766 {
10767 Lisp_Object tem = tip_timer; 10767 Lisp_Object tem;
10768 struct gcpro gcpro1;
10769 tem = tip_timer;
10770 GCPRO1 (tem);
10768 tip_timer = Qnil; 10771 tip_timer = Qnil;
10769 call1 (intern ("cancel-timer"), tem); 10772 call1 (intern ("cancel-timer"), tem);
10773 UNGCPRO;
10770 } 10774 }
10771 10775
10772 if (FRAMEP (tip_frame)) 10776 if (FRAMEP (tip_frame))
@@ -10779,6 +10783,7 @@ Value is t is tooltip was open, nil otherwise.")
10779 tip_frame = Qnil; 10783 tip_frame = Qnil;
10780 Fdelete_frame (frame, Qnil); 10784 Fdelete_frame (frame, Qnil);
10781 deleted = Qt; 10785 deleted = Qt;
10786 UNGCPRO;
10782 10787
10783#ifdef USE_LUCID 10788#ifdef USE_LUCID
10784 /* Bloodcurdling hack alert: The Lucid menu bar widget's 10789 /* Bloodcurdling hack alert: The Lucid menu bar widget's