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
This commit is contained in:
Paul Eggert 2015-03-29 14:14:15 -07:00
commit 0479a1b62c
6 changed files with 36 additions and 4 deletions

View file

@ -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))