diff options
| author | Paul Eggert | 2011-06-15 11:07:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-15 11:07:38 -0700 |
| commit | ff672d2c8785de6faba84a400fb8153e9fa07cd2 (patch) | |
| tree | 4c5dc68b7a92e54c86e47f3bd9a804c14be57091 /src/xfns.c | |
| parent | e69dafade3ccd5c2997a3f6fd6c7bea29e75ad8e (diff) | |
| parent | b96e6cde3e311cd79f8ad134291d41c8c64cc6ad (diff) | |
| download | emacs-ff672d2c8785de6faba84a400fb8153e9fa07cd2.tar.gz emacs-ff672d2c8785de6faba84a400fb8153e9fa07cd2.zip | |
Merge from trunk.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index f847e41855e..abc273c2bdf 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1700,7 +1700,7 @@ x_set_scroll_bar_default_width (struct frame *f) | |||
| 1700 | int wid = FRAME_COLUMN_WIDTH (f); | 1700 | int wid = FRAME_COLUMN_WIDTH (f); |
| 1701 | #ifdef USE_TOOLKIT_SCROLL_BARS | 1701 | #ifdef USE_TOOLKIT_SCROLL_BARS |
| 1702 | #ifdef USE_GTK | 1702 | #ifdef USE_GTK |
| 1703 | int minw = xg_get_default_scrollbar_width (f); | 1703 | int minw = xg_get_default_scrollbar_width (); |
| 1704 | #else | 1704 | #else |
| 1705 | int minw = 16; | 1705 | int minw = 16; |
| 1706 | #endif | 1706 | #endif |