| commit | bfed046df118533fc599449d48e59a3100e6439d | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Mon, 23 Mar 2015 17:14:01 +0000 (23 10:14 -0700) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Mon, 23 Mar 2015 17:14:01 +0000 (23 10:14 -0700) | ||
| tree | 106628eb812555c6fdbe7e93767c30b71b1b3e22 | treesnapshot (tar.gz zip) |
| parent | a50c95dbd24eb0e56ad0eb0f8ff2c013b5f92285 | commitdiff |
| parent | 17ad6f839e1c435ea944a0cda0b682687f194c7a | commitdiff |
Merge from origin/emacs-24
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
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