[Emacs-diffs] master 0479a1b 1/3: Merge from origin/emacs-24

[Paul Eggert]

branch: master
commit 0479a1b62ceeb9586168146e2c8f49f2a5ebaf2f
Merge: 4a70043 5e0314f
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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
---
 doc/lispref/ChangeLog    |    4 ++++
 doc/lispref/objects.texi |    4 ++--
 lisp/ChangeLog           |   21 +++++++++++++++++++++
 lisp/emacs-lisp/smie.el  |    4 ++--
 src/ChangeLog            |    5 +++++
 src/gtkutil.c            |    2 ++
 6 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9e1b7b0..c24bb64 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-29  Glenn Morris  <address@hidden>
+
+       * objects.texi (Equality Predicates): Fix typo in example.
+
 2015-03-25  Stefan Monnier  <address@hidden>
 
        * positions.texi (Excursions, Narrowing): `save-excursion' does not
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index b28b3b0..f4beca8 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -2135,12 +2135,12 @@ that for two strings to be equal, they have the same 
text properties.
 
 @example
 @group
-(equal "asdf" (propertize "asdf" '(asdf t)))
+(equal "asdf" (propertize "asdf" 'asdf t))
      @result{} t
 @end group
 @group
 (equal-including-properties "asdf"
-                            (propertize "asdf" '(asdf t)))
+                            (propertize "asdf" 'asdf t))
      @result{} nil
 @end group
 @end example
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8e84a3..fd346f0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2015-03-29  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/package.el (package-refresh-contents): Fix spelling
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 48bded4..1bc5eb2 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -837,12 +837,12 @@ Possible return values:
 
 ;;; Miscellaneous commands using the precedence parser.
 
-(defun smie-backward-sexp-command (&optional n)
+(defun smie-backward-sexp-command (n)
   "Move backward through N logical elements."
   (interactive "^p")
   (smie-forward-sexp-command (- n)))
 
-(defun smie-forward-sexp-command (&optional n)
+(defun smie-forward-sexp-command (n)
   "Move forward through N logical elements."
   (interactive "^p")
   (let ((forw (> n 0))
diff --git a/src/ChangeLog b/src/ChangeLog
index 7874910..c11ecb7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-29  Martin Rudalics  <address@hidden>
+
+       * gtkutil.c (update_theme_scrollbar_width): Don't round up
+       scroll bar width with GTK3 (Bug#20182).
+
 2015-03-28  Jan Djärv  <address@hidden>
 
        * xsmfns.c (smc_save_yourself_CB): Return if Vinvocation_name or
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6f17078..061af7b 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;
 }