From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Wed, 28 Jan 2015 04:03:45 +0000 (-0300)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2572^2~47
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/32a2c91658bd02c4e761030f93eb5f0415524104

Merge from origin/emacs-24

The following commits were skipped:

67edddf More fixes to support multi-line search in comint
18a89a0 Better support for multi-line shell input.
---

32a2c91658bd02c4e761030f93eb5f0415524104