diff options
| author | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
| commit | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch) | |
| tree | 9b9ac725394ee80891e2bff57b6407d0e491e71a /src/xfns.c | |
| parent | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff) | |
| parent | 32daa3cb54523006c88717cbeac87964cd687a1b (diff) | |
| download | emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfns.c b/src/xfns.c index d8bf9747191..2f8c9c25416 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -2062,7 +2062,7 @@ x_set_scroll_bar_default_width (struct frame *f) | |||
| 2062 | int unit = FRAME_COLUMN_WIDTH (f); | 2062 | int unit = FRAME_COLUMN_WIDTH (f); |
| 2063 | #ifdef USE_TOOLKIT_SCROLL_BARS | 2063 | #ifdef USE_TOOLKIT_SCROLL_BARS |
| 2064 | #ifdef USE_GTK | 2064 | #ifdef USE_GTK |
| 2065 | int minw = xg_get_default_scrollbar_width (); | 2065 | int minw = xg_get_default_scrollbar_width (f); |
| 2066 | #else | 2066 | #else |
| 2067 | int minw = 16; | 2067 | int minw = 16; |
| 2068 | #endif | 2068 | #endif |
| @@ -2083,7 +2083,7 @@ x_set_scroll_bar_default_height (struct frame *f) | |||
| 2083 | int height = FRAME_LINE_HEIGHT (f); | 2083 | int height = FRAME_LINE_HEIGHT (f); |
| 2084 | #ifdef USE_TOOLKIT_SCROLL_BARS | 2084 | #ifdef USE_TOOLKIT_SCROLL_BARS |
| 2085 | #ifdef USE_GTK | 2085 | #ifdef USE_GTK |
| 2086 | int min_height = xg_get_default_scrollbar_height (); | 2086 | int min_height = xg_get_default_scrollbar_height (f); |
| 2087 | #else | 2087 | #else |
| 2088 | int min_height = 16; | 2088 | int min_height = 16; |
| 2089 | #endif | 2089 | #endif |