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

1 files changed, 21 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8e84a3c729..fd346f05afb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2015-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/smie.el (smie-backward-sexp-command)
+        (smie-forward-sexp-command): Don't pretend the arg is optional
+        (bug#20205).
+
+2015-03-29  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re):
+        Detect regexps after `!'.  (Bug#19285)
+
+        * progmodes/ruby-mode.el (ruby-font-lock-keywords):
+        Use `font-lock-constant-face' for nil, true and false.
+        Highlight `self' as a keyword.  (Bug#17733)
+
+2015-03-29  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+        * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re):
+        Expect beginning of regexp also after open brace or vertical bar.
+        (Bug#20026)
+
 2015-03-28  Jan Djärv  <jan.h.d@swipnet.se>
 
         * emacs-lisp/package.el (package-refresh-contents): Fix spelling