diff options
| author | Eli Zaretskii | 2019-10-10 14:50:11 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-10-10 14:50:11 +0300 |
| commit | d129c10302a89ef54e871163e98579018df9e53b (patch) | |
| tree | 42439891e67a8b0957d20facb7e8c3b1ff01815e /src/frame.c | |
| parent | 288e00d69ac8d9907e8d6b8cccff2b3c914b2464 (diff) | |
| download | emacs-d129c10302a89ef54e871163e98579018df9e53b.tar.gz emacs-d129c10302a89ef54e871163e98579018df9e53b.zip | |
Fix initial value of frame-inhibit-implied-resize
* src/frame.c (syms_of_frame): Update doc string and default
value of frame-inhibit-implied-resize in GTK builds to include
'tab-bar-lines.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/frame.c b/src/frame.c index d72dfec0cf8..099db29598c 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -6290,18 +6290,22 @@ width by the width of one scroll bar provided this option is nil and | |||
| 6290 | keep it unchanged if this option is either t or a list containing | 6290 | keep it unchanged if this option is either t or a list containing |
| 6291 | `vertical-scroll-bars'. | 6291 | `vertical-scroll-bars'. |
| 6292 | 6292 | ||
| 6293 | The default value is \\='(tool-bar-lines) on Lucid, Motif and Windows | 6293 | The default value is \\='(tab-bar-lines) in GTK+, (which means that |
| 6294 | \(which means that adding/removing a tool bar does not change the frame | 6294 | adding/removing a tab bar does not change the frame height), |
| 6295 | height), nil on all other window systems including GTK+ (which means | 6295 | \\='(tab-bar-lines tool-bar-lines) on Lucid, Motif and Windows |
| 6296 | that changing any of the parameters listed above may change the size of | 6296 | \(which means that adding/removing a tool bar or tab bar does not |
| 6297 | the frame), and t otherwise (which means the frame size never changes | 6297 | change the frame height), nil on all other window systems (which |
| 6298 | implicitly when there's no window system support). | 6298 | means that changing any of the parameters listed above may change |
| 6299 | the size of the frame), and t otherwise (which means the frame size | ||
| 6300 | never changes implicitly when there's no window system support). | ||
| 6299 | 6301 | ||
| 6300 | Note that when a frame is not large enough to accommodate a change of | 6302 | Note that when a frame is not large enough to accommodate a change of |
| 6301 | any of the parameters listed above, Emacs may try to enlarge the frame | 6303 | any of the parameters listed above, Emacs may try to enlarge the frame |
| 6302 | even if this option is non-nil. */); | 6304 | even if this option is non-nil. */); |
| 6303 | #if defined (HAVE_WINDOW_SYSTEM) | 6305 | #if defined (HAVE_WINDOW_SYSTEM) |
| 6304 | #if defined (USE_LUCID) || defined (USE_MOTIF) || defined (HAVE_NTGUI) | 6306 | #if defined USE_GTK |
| 6307 | frame_inhibit_implied_resize = list1 (Qtab_bar_lines); | ||
| 6308 | #elif defined (USE_LUCID) || defined (USE_MOTIF) || defined (HAVE_NTGUI) | ||
| 6305 | frame_inhibit_implied_resize = list2 (Qtab_bar_lines, Qtool_bar_lines); | 6309 | frame_inhibit_implied_resize = list2 (Qtab_bar_lines, Qtool_bar_lines); |
| 6306 | #else | 6310 | #else |
| 6307 | frame_inhibit_implied_resize = Qnil; | 6311 | frame_inhibit_implied_resize = Qnil; |