diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2000-12-11 21:13:33 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2000-12-11 21:13:33 +0000 |
| commit | a3642e49097db87eb3144b61c5e2bda6c011d13c (patch) | |
| tree | 3d79cba2846adbe6104ea774867511cf24805cf4 | |
| parent | 44b5a125d347949d86c0e9209217a04c77c04c7b (diff) | |
| download | emacs-a3642e49097db87eb3144b61c5e2bda6c011d13c.tar.gz | |
(Fx_hide_tip): Fix last change.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xfns.c | 7 |
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 @@ 2000-12-11 Gerd Moellmann <gerd@gnu.org> + * xfns.c (Fx_hide_tip): Fix last change. + * xfns.c (Fx_hide_tip): Avoid unnecessary work when there's nothing to do. Bind inhibit-quit. (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.") if (!NILP (tip_timer)) { - Lisp_Object tem = tip_timer; + Lisp_Object tem; + struct gcpro gcpro1; + tem = tip_timer; + GCPRO1 (tem); tip_timer = Qnil; call1 (intern ("cancel-timer"), tem); + UNGCPRO; } if (FRAMEP (tip_frame)) @@ -10779,6 +10783,7 @@ Value is t is tooltip was open, nil otherwise.") tip_frame = Qnil; Fdelete_frame (frame, Qnil); deleted = Qt; + UNGCPRO; #ifdef USE_LUCID /* Bloodcurdling hack alert: The Lucid menu bar widget's |