diff options
| author | Karl Heuer | 1994-06-21 00:42:12 +0000 |
|---|---|---|
| committer | Karl Heuer | 1994-06-21 00:42:12 +0000 |
| commit | ec5c4af4d2eee1648110d7d9bd8fd8b9620db5df (patch) | |
| tree | 9e85ef66c6b0bd52527a7e95711cc050d158bb82 | |
| parent | 51ce6acd24fb92723024e58e9fa3e19b440982c7 (diff) | |
| download | emacs-ec5c4af4d2eee1648110d7d9bd8fd8b9620db5df.tar.gz emacs-ec5c4af4d2eee1648110d7d9bd8fd8b9620db5df.zip | |
(x_window): Delete duplicate computation.
Change type of reference argument from int to short.
| -rw-r--r-- | src/xfns.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/xfns.c b/src/xfns.c index 3a5c0883383..43398848084 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1927,21 +1927,15 @@ x_window (f, window_prompting, minibuffer_only) | |||
| 1927 | char *tem, shell_position[32]; | 1927 | char *tem, shell_position[32]; |
| 1928 | Arg al[2]; | 1928 | Arg al[2]; |
| 1929 | int ac = 0; | 1929 | int ac = 0; |
| 1930 | int ibw; | ||
| 1931 | int menubar_size | 1930 | int menubar_size |
| 1932 | = (f->display.x->menubar_widget | 1931 | = (f->display.x->menubar_widget |
| 1933 | ? (f->display.x->menubar_widget->core.height | 1932 | ? (f->display.x->menubar_widget->core.height |
| 1934 | + f->display.x->menubar_widget->core.border_width) | 1933 | + f->display.x->menubar_widget->core.border_width) |
| 1935 | : 0); | 1934 | : 0); |
| 1936 | 1935 | ||
| 1937 | XtVaGetValues (pane_widget, | ||
| 1938 | XtNinternalBorderWidth, &ibw, | ||
| 1939 | NULL); | ||
| 1940 | menubar_size += ibw; | ||
| 1941 | |||
| 1942 | if (FRAME_EXTERNAL_MENU_BAR (f)) | 1936 | if (FRAME_EXTERNAL_MENU_BAR (f)) |
| 1943 | { | 1937 | { |
| 1944 | int ibw; | 1938 | short ibw; |
| 1945 | XtVaGetValues (pane_widget, XtNinternalBorderWidth, &ibw, NULL); | 1939 | XtVaGetValues (pane_widget, XtNinternalBorderWidth, &ibw, NULL); |
| 1946 | menubar_size += ibw; | 1940 | menubar_size += ibw; |
| 1947 | } | 1941 | } |