Merge from origin/emacs-24
commit32a2c91658bd02c4e761030f93eb5f0415524104
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 04:03:45 +0000 (28 01:03 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 04:03:45 +0000 (28 01:03 -0300)
treeb097d4b6572f7300acdcb9461e72009b2d7bdebf
parentb0edd7c69d88f245981a05e2333b09e3171d4e6f
parent67edddfce60169c0d0e2d6d3dce1408f04febbf1
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.