From 52e6352b8150519a2a0b7bee2deaa86953f861ad Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 30 Apr 2022 18:20:19 +0200 Subject: [PATCH] Fix compilation after recent x-show-tooltip-timeout changes * src/dispnew.c (syms_of_display): Move x-show-tooltip-timeout to a common file to avoid breaking other systems. --- src/dispnew.c | 4 ++++ src/xfns.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dispnew.c b/src/dispnew.c index 2aba0edfe8f..1dd64be4ead 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6721,6 +6721,10 @@ See `buffer-display-table' for more information. */); beginning of the next redisplay). */ redisplay_dont_pause = true; + DEFVAR_LISP ("x-show-tooltip-timeout", Vx_show_tooltip_timeout, + doc: /* The default timeout (in seconds) for `x-show-tip'. */); + Vx_show_tooltip_timeout = make_fixnum (5); + DEFVAR_LISP ("tab-bar-position", Vtab_bar_position, doc: /* Specify on which side from the tool bar the tab bar shall be. Possible values are t (below the tool bar), nil (above the tool bar). diff --git a/src/xfns.c b/src/xfns.c index 8f17ee67cd0..06a0d4728cf 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -9727,10 +9727,6 @@ eliminated in future versions of Emacs. */); } #endif - DEFVAR_LISP ("x-show-tooltip-timeout", Vx_show_tooltip_timeout, - doc: /* The default timeout (in seconds) for `x-show-tip'. */); - Vx_show_tooltip_timeout = make_fixnum (5); - /* X window properties. */ defsubr (&Sx_change_window_property); defsubr (&Sx_delete_window_property); -- 2.39.2