From: Gerd Möllmann Date: Mon, 20 Jan 2025 17:11:58 +0000 (+0100) Subject: Remove a false #ifdef HAVE_WINDOW_SYSTEM X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e55d4f956367dc456bd2d6827b58efa2f4103ce1;p=emacs.git Remove a false #ifdef HAVE_WINDOW_SYSTEM * src/xdiso.c (update_tab_bar)_ Don't use #ifdef HAVE_WINDOW_SYSTEM for setting the selected frame. That only makes a build without window system misbehave. (cherry picked from commit eaa79e25a6b34f5f3dca5961233498afbacaec58) --- diff --git a/src/xdisp.c b/src/xdisp.c index 830c1e3b95a..73e96bd45d7 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -14338,13 +14338,12 @@ update_tab_bar (struct frame *f, bool save_match_data) /* Since we only explicitly preserve selected_frame, check that selected_window would be redundant. */ XFRAME (selected_frame)->selected_window)); -#ifdef HAVE_WINDOW_SYSTEM + Lisp_Object frame; record_unwind_protect (restore_selected_window, selected_window); XSETFRAME (frame, f); selected_frame = frame; selected_window = FRAME_SELECTED_WINDOW (f); -#endif /* Build desired tab-bar items from keymaps. */ new_tab_bar