Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-263
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-264
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-265
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-99
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-100
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-555

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc man/emacs.texi
Simple merge

diff --cc src/minibuf.c
Simple merge