Merged in changes from CVS trunk. Plus added lisp/term tweaks.

Patches applied:

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
   tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
   Add CVS metadata files.

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
   Update from CVS.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/coding.h b/src/coding.h
index 4081b7f2028..158ebbf289f 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -1,7 +1,7 @@
 /* Header for coding system handler.
-   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
    Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -628,7 +628,7 @@ extern int code_convert_region P_ ((int, int, int, int, struct coding_system *,
 extern Lisp_Object run_pre_post_conversion_on_str P_ ((Lisp_Object,
                                                        struct coding_system *,
                                                        int));
-extern void run_pre_write_conversin_on_c_str P_ ((unsigned char **, int *, 
+extern void run_pre_write_conversin_on_c_str P_ ((unsigned char **, int *,
                                                   int, int,
                                                   struct coding_system *));
 
@@ -666,7 +666,7 @@ extern Lisp_Object eol_mnemonic_undecided;
 
 #ifdef emacs
 extern Lisp_Object Qfile_coding_system;
-extern Lisp_Object Qcall_process, Qcall_process_region, Qprocess_argument;
+extern Lisp_Object Qcall_process, Qcall_process_region;
 extern Lisp_Object Qstart_process, Qopen_network_stream;
 extern Lisp_Object Qwrite_region;