]> code.delx.au - gnu-emacs/commitdiff
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 Mar 2015 21:14:15 +0000 (14:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 Mar 2015 21:14:15 +0000 (14:14 -0700)
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


No differences found