Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-219
   Update from CVS

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/vc-hooks.el
Simple merge

diff --cc lisp/vc.el
Simple merge