]> code.delx.au - gnu-emacs/commitdiff
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Mar 2015 17:14:01 +0000 (10:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Mar 2015 17:14:01 +0000 (10:14 -0700)
The following commits were skipped:

17ad6f8 Fix problems caused by calling 'recenter' in auto-revert  (Bug#20122)
1c4900d Backport: ruby-mode: Detect regexps after `!'
f74843a Backport: ruby-mode: Change faces used for self, true, false and nil
a5d1f94 Backport: ruby-mode: Expect regexp after { or | too


Trivial merge