aboutsummaryrefslogtreecommitdiffstats
path: root/src/widget.c
diff options
context:
space:
mode:
authorStephen Leake2019-04-11 14:00:02 -0700
committerStephen Leake2019-04-11 14:00:02 -0700
commit7ba7def5caf7ec9d9bebffff489f0a658229fbda (patch)
treee0cfcb59937ca0528fb81769d7d48a904a91f5dc /src/widget.c
parent7768581172e11be52b1fcd8224f4594e126bbdb7 (diff)
parentde238b39e335c6814283faa171b35145f124edf2 (diff)
downloademacs-7ba7def5caf7ec9d9bebffff489f0a658229fbda.tar.gz
emacs-7ba7def5caf7ec9d9bebffff489f0a658229fbda.zip
Merge commit 'de238b39e335c6814283faa171b35145f124edf2'
Diffstat (limited to 'src/widget.c')
-rw-r--r--src/widget.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/widget.c b/src/widget.c
index c695bd5f305..508974dd46f 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -297,7 +297,6 @@ update_wm_hints (EmacsFrame ew)
297 int char_height; 297 int char_height;
298 int base_width; 298 int base_width;
299 int base_height; 299 int base_height;
300 int min_rows = 0, min_cols = 0;
301 300
302 /* This happens when the frame is just created. */ 301 /* This happens when the frame is just created. */
303 if (! wmshell) return; 302 if (! wmshell) return;
@@ -323,8 +322,8 @@ update_wm_hints (EmacsFrame ew)
323 XtNbaseHeight, (XtArgVal) base_height, 322 XtNbaseHeight, (XtArgVal) base_height,
324 XtNwidthInc, (XtArgVal) (frame_resize_pixelwise ? 1 : cw), 323 XtNwidthInc, (XtArgVal) (frame_resize_pixelwise ? 1 : cw),
325 XtNheightInc, (XtArgVal) (frame_resize_pixelwise ? 1 : ch), 324 XtNheightInc, (XtArgVal) (frame_resize_pixelwise ? 1 : ch),
326 XtNminWidth, (XtArgVal) (base_width + min_cols * cw), 325 XtNminWidth, (XtArgVal) base_width,
327 XtNminHeight, (XtArgVal) (base_height + min_rows * ch), 326 XtNminHeight, (XtArgVal) base_height,
328 NULL); 327 NULL);
329} 328}
330 329