Merged in changes from CVS HEAD

Patches applied:

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

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

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

diff --cc lisp/vc.el
index 383ffa6,a41a480..33bb04e
--- 1/lisp/vc.el
--- 2/lisp/vc.el
+++ b/lisp/vc.el
@@@ -7,7 -7,7 +7,7 @@@
  ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
  ;; Keywords: tools
  
- ;; $Id: vc.el,v 1.363 2004/01/21 11:05:51 uid65624 Exp $
 -;; $Id: vc.el,v 1.364 2004/01/22 23:34:33 uid65624 Exp $
++;; $Id: vc.el,v 1.365 2004/01/23 11:20:55 uid65624 Exp $
  
  ;; This file is part of GNU Emacs.