diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-29 14:14:15 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-29 14:14:15 -0700 |
| commit | 0479a1b62ceeb9586168146e2c8f49f2a5ebaf2f (patch) | |
| tree | 1fd646daf290a63564bd8823b8a0ba32e8190ae3 /src/gtkutil.c | |
| parent | 4a7004369824ea46fd5222a3f57cf3ee67e988e0 (diff) | |
| parent | 5e0314f6fabca1af214240177a28d3822d6ef3e5 (diff) | |
| download | emacs-0479a1b62ceeb9586168146e2c8f49f2a5ebaf2f.tar.gz | |
Merge from origin/emacs-24
5e0314f * smie.el (smie*ward-sexp-command): Don't pretend the arg is optional
13cf575 Don't round up scroll bar width with GTK3 (Bug#20182).
921dd0d * doc/lispref/objects.texi (Equality Predicates): Fix typo in example.
Conflicts:
doc/lispref/ChangeLog
lisp/ChangeLog
src/ChangeLog
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 6f1707894c1..061af7baa9a 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3516,7 +3516,9 @@ update_theme_scrollbar_width (void) gtk_widget_destroy (wscroll); g_object_unref (G_OBJECT (wscroll)); w += 2*b; +#ifndef HAVE_GTK3 if (w < 16) w = 16; +#endif scroll_bar_width_for_theme = w; } |