From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 23 Mar 2015 17:14:01 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~96
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bfed046df118533fc599449d48e59a3100e6439d;p=emacs.git

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

bfed046df118533fc599449d48e59a3100e6439d