diff options
| author | Juri Linkov | 2019-10-14 22:14:15 +0300 |
|---|---|---|
| committer | Juri Linkov | 2019-10-14 22:14:15 +0300 |
| commit | 561570475e99e1591df0b200facde22983754cf6 (patch) | |
| tree | e5361f74b57b2020b102738aae3cc3a953f3e77a /src | |
| parent | ad30f1e5fc955d95ebc09016f3b95afc6f594010 (diff) | |
| download | emacs-561570475e99e1591df0b200facde22983754cf6.tar.gz emacs-561570475e99e1591df0b200facde22983754cf6.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 NS to include 'tab-bar-lines.
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/frame.c b/src/frame.c index f7e65be727d..cc76cf4f697 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -6290,24 +6290,19 @@ 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 | In NS that use the external tool bar and no tab bar, the default value | 6293 | In GTK+ and NS that use the external tool bar, the default value is |
| 6294 | is nil which means that changing any of the parameters listed above | 6294 | \\='(tab-bar-lines) which means that adding/removing a tab bar does |
| 6295 | may change the size of the frame. In GTK+ that use the external tool | 6295 | not change the frame height. On all other types of GUI frames, the |
| 6296 | bar, the default value is \\='(tab-bar-lines) which means that | 6296 | default value is \\='(tab-bar-lines tool-bar-lines) which means that |
| 6297 | adding/removing a tab bar does not change the frame height. On all | 6297 | adding/removing a tool bar or tab bar does not change the frame |
| 6298 | other types of GUI frames, the default value is \\='(tab-bar-lines | 6298 | height. Otherwise it's t which means the frame size never changes |
| 6299 | tool-bar-lines) which means that adding/removing a tool bar or tab bar | 6299 | implicitly when there's no window system support. |
| 6300 | does not change the frame height. Otherwise it's t which means the | ||
| 6301 | frame size never changes implicitly when there's no window | ||
| 6302 | system support. | ||
| 6303 | 6300 | ||
| 6304 | Note that when a frame is not large enough to accommodate a change of | 6301 | Note that when a frame is not large enough to accommodate a change of |
| 6305 | any of the parameters listed above, Emacs may try to enlarge the frame | 6302 | any of the parameters listed above, Emacs may try to enlarge the frame |
| 6306 | even if this option is non-nil. */); | 6303 | even if this option is non-nil. */); |
| 6307 | #if defined (HAVE_WINDOW_SYSTEM) | 6304 | #if defined (HAVE_WINDOW_SYSTEM) |
| 6308 | #if defined (HAVE_NS) | 6305 | #if defined (USE_GTK) || defined (HAVE_NS) |
| 6309 | frame_inhibit_implied_resize = Qnil; | ||
| 6310 | #elif defined (USE_GTK) | ||
| 6311 | frame_inhibit_implied_resize = list1 (Qtab_bar_lines); | 6306 | frame_inhibit_implied_resize = list1 (Qtab_bar_lines); |
| 6312 | #else | 6307 | #else |
| 6313 | frame_inhibit_implied_resize = list2 (Qtab_bar_lines, Qtool_bar_lines); | 6308 | frame_inhibit_implied_resize = list2 (Qtab_bar_lines, Qtool_bar_lines); |