# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1134975884 0
# Node ID 547f2b420666afc4bce1226c937fb2b9fa31f102
# Parent  b94a4bf1aca6f839bbbe1790c28f8429999fbea9
Copyright fixed

diff -r b94a4bf1aca6 -r 547f2b420666 lisp/composite.el
--- a/lisp/composite.el	Mon Dec 19 06:02:52 2005 +0000
+++ b/lisp/composite.el	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,8 @@
 ;;; composite.el --- support character composition
 
-;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1999, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: mule, multilingual, character composition
 
diff -r b94a4bf1aca6 -r 547f2b420666 lisp/ps-bdf.el
--- a/lisp/ps-bdf.el	Mon Dec 19 06:02:52 2005 +0000
+++ b/lisp/ps-bdf.el	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,9 @@
 ;;; ps-bdf.el --- BDF font file handler for ps-print
 
-;; Copyright (C) 1998, 1999, 2001, 2003 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1998, 1999, 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2001, 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: wp, BDF, font, PostScript
 ;; Maintainer: Kenichi Handa <handa@etl.go.jp>
diff -r b94a4bf1aca6 -r 547f2b420666 src/category.c
--- a/src/category.c	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/category.c	Mon Dec 19 07:04:44 2005 +0000
@@ -1,6 +1,8 @@
 /* GNU Emacs routines to deal with category tables.
-   Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
+   Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 1999
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/category.h
--- a/src/category.h	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/category.h	Mon Dec 19 07:04:44 2005 +0000
@@ -1,6 +1,7 @@
 /* Declarations having to do with Emacs category tables.
-   Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-     Licensed to the Free Software Foundation.
+   Copyright (C) 1995, 1998, 1999
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/ccl.c
--- a/src/ccl.c	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/ccl.c	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,8 @@
 /* CCL (Code Conversion Language) interpreter.
-   Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/ccl.h
--- a/src/ccl.h	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/ccl.h	Mon Dec 19 07:04:44 2005 +0000
@@ -1,6 +1,7 @@
 /* Header for CCL (Code Conversion Language) interpreter.
-   Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
+   Copyright (C) 1995, 1998, 2000
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/charset.c
--- a/src/charset.c	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/charset.c	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,8 @@
 /* Basic multilingual character support.
-   Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/charset.h
--- a/src/charset.h	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/charset.h	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,8 @@
 /* Header for multibyte character handler.
-   Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2003
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/coding.c
--- a/src/coding.c	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/coding.c	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,8 @@
 /* Coding system handler (conversion, detection, and etc).
-   Copyright (C) 1995,97,1998,2002,2003  Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, 2005
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/coding.h
--- a/src/coding.h	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/coding.h	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,8 @@
 /* Header for coding system handler.
-   Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
    Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2000
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/composite.c
--- a/src/composite.c	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/composite.c	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,8 @@
 /* Composite sequence support.
-   Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/composite.h
--- a/src/composite.h	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/composite.h	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,8 @@
 /* Header for composite sequence handler.
-   Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/fontset.c
--- a/src/fontset.c	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/fontset.c	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,8 @@
 /* Fontset handler.
-   Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
    Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 2005
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
diff -r b94a4bf1aca6 -r 547f2b420666 src/fontset.h
--- a/src/fontset.h	Mon Dec 19 06:02:52 2005 +0000
+++ b/src/fontset.h	Mon Dec 19 07:04:44 2005 +0000
@@ -1,7 +1,8 @@
 /* Header for fontset handler.
-   Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.