]> code.delx.au - gnu-emacs/commit
delx.au / code / gnu-emacs / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 4a70043 5e0314f)
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)
commit0479a1b62ceeb9586168146e2c8f49f2a5ebaf2f
tree1fd646daf290a63564bd8823b8a0ba32e8190ae3tree
parent4a7004369824ea46fd5222a3f57cf3ee67e988e0commit | diff
parent5e0314f6fabca1af214240177a28d3822d6ef3e5commit | diff
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 diff1 | diff2 | blob | history
doc/lispref/objects.texi diff1 | diff2 | blob | history
lisp/ChangeLog diff1 | diff2 | blob | history
lisp/emacs-lisp/smie.el diff1 | diff2 | blob | history
src/ChangeLog diff1 | diff2 | blob | history
src/gtkutil.c diff1 | diff2 | blob | history