aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2023-02-17 09:40:32 +0200
committerEli Zaretskii2023-02-17 09:40:32 +0200
commitb44a7ff85dc8074735c5a8baa1fdea9d47c35ffa (patch)
tree73900aebcb7b702de00be124fd4585b87eff3945 /src
parentf1f571e72ae10285762d3a941e56f7c4048272af (diff)
downloademacs-b44a7ff85dc8074735c5a8baa1fdea9d47c35ffa.tar.gz
emacs-b44a7ff85dc8074735c5a8baa1fdea9d47c35ffa.zip
Allow 'icon-title-format' to have the value t
* src/xdisp.c (gui_consider_frame_title, syms_of_xdisp): If the value of 'icon-title-format' is t, use 'frame-title-format' instead. (Bug#61496) * etc/NEWS: * doc/lispref/frames.texi (Frame Titles): Document the new handling of the value t. (Basic Parameters): Fix the documentation of the 'title' and 'name' frame parameters.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 5c5ecaa2bcb..1f630de7586 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13424,7 +13424,8 @@ gui_consider_frame_title (Lisp_Object frame)
13424 13424
13425 Fselect_window (f->selected_window, Qt); 13425 Fselect_window (f->selected_window, Qt);
13426 set_buffer_internal_1 (XBUFFER (XWINDOW (f->selected_window)->contents)); 13426 set_buffer_internal_1 (XBUFFER (XWINDOW (f->selected_window)->contents));
13427 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format; 13427 fmt = (FRAME_ICONIFIED_P (f) && !EQ (Vicon_title_format, Qt)
13428 ? Vicon_title_format : Vframe_title_format);
13428 13429
13429 mode_line_target = MODE_LINE_TITLE; 13430 mode_line_target = MODE_LINE_TITLE;
13430 title_start = MODE_LINE_NOPROP_LEN (0); 13431 title_start = MODE_LINE_NOPROP_LEN (0);
@@ -36608,9 +36609,11 @@ which no explicit name has been set (see `modify-frame-parameters'). */);
36608 DEFVAR_LISP ("icon-title-format", Vicon_title_format, 36609 DEFVAR_LISP ("icon-title-format", Vicon_title_format,
36609 doc: /* Template for displaying the title bar of an iconified frame. 36610 doc: /* Template for displaying the title bar of an iconified frame.
36610\(Assuming the window manager supports this feature.) 36611\(Assuming the window manager supports this feature.)
36611This variable has the same structure as `mode-line-format' (which see), 36612If the value is a string, it should have the same structure
36612and is used only on frames for which no explicit name has been set 36613as `mode-line-format' (which see), and is used only on frames
36613\(see `modify-frame-parameters'). */); 36614for which no explicit name has been set \(see `modify-frame-parameters').
36615If the value is t, that means use `frame-title-format' for
36616iconified frames. */);
36614 /* Do not nest calls to pure_list. This works around a bug in 36617 /* Do not nest calls to pure_list. This works around a bug in
36615 Oracle Developer Studio 12.6. */ 36618 Oracle Developer Studio 12.6. */
36616 Lisp_Object icon_title_name_format 36619 Lisp_Object icon_title_name_format