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

2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7874910c813..c11ecb7e3ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-29  Martin Rudalics  <rudalics@gmx.at>
+
+        * gtkutil.c (update_theme_scrollbar_width): Don't round up
+        scroll bar width with GTK3 (Bug#20182).
+
 2015-03-28  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xsmfns.c (smc_save_yourself_CB): Return if Vinvocation_name or
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;
 }