Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 615-621)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 197-199)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166

10 files changed, 150 insertions, 69 deletions

diff --git a/leim/CXTERM-DIC/CCDOSPY.tit b/leim/CXTERM-DIC/CCDOSPY.tit
index cca16b62d09..1c94c44b1ac 100644
--- a/leim/CXTERM-DIC/CCDOSPY.tit
+++ b/leim/CXTERM-DIC/CCDOSPY.tit
@@ -1,4 +1,23 @@
-# $Id: CCDOSPY.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
+# Header added for Emacs
+#
+# This file is included in the directory contrib/clients/cxterm of the
+# distribution of X11R6.  As the file itself does't contain copyright
+# and license notices, the following statements in the section 6 of
+# the file .../cxterm/README covers it.
+#
+# X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG.
+# X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG.
+# 
+# Permission to use, copy, modify, and distribute this software and
+# its documentation for any purpose is hereby granted without fee,
+# provided that this entire copyright and permission notice appear
+# in all such copies, and that the name of the authors may not be
+# used to endorse or promote products derived from this material
+# without specific prior written permission.  The authors make no
+# representations about the suitability of this software for any
+# purpose.  It is provided "as is" without express or implied warranty.
+#
+# End of header added for Emacs
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
diff --git a/leim/CXTERM-DIC/README b/leim/CXTERM-DIC/README
index bda7055a2b5..d8731740a79 100644
--- a/leim/CXTERM-DIC/README
+++ b/leim/CXTERM-DIC/README
@@ -1,58 +1,35 @@
 All *.tit files in this directory are dictionary files to use with
 the program cxterm.  Their source and copyright status are categorised
-into these four.
+into these four groups.
 
 (1) QJ-b5.tit (renamed from .../cxterm/dict/big5/QJ.tit)
     QJ.tit (copied from .../cxterm/dict/gb/QJ.tit)
 
-These are verbatim copies of what included in the directory
+They are verbatim copies of those included in the directory
 contrib/clients/cxterm of the distribution of X11R6.  Each file
-contains a copyright notice.
+contains a license notice.
 
 (2) CCDOSPY.tit (copied from .../cxterm/dict/gb/CCDOSPY.tit)
     PY-b5.tit (renamed from .../cxterm/dict/big5/PY.tit)
     SW.tit (copied from .../cxterm/dict/gb/SW.tit)
     TONEPY.tit (copied from .../cxterm/dict/gb/TONEPY.tit)
 
-These are verbatim copies of what included in the directory
-contrib/clients/cxterm of the distribution of X11R6.  As those files
-themselves don't contain copyright notices, the section 6 of the file
-.../cxterm/README should cover them.
-
-============================================================
-6. COPYRIGHTS AND TERMS
-
-This copyright and permission notice outlines the rights and
-restrictions covering most parts of this distribution of cxterm.
-Cxterm is modified from xterm, which is copyrighted by MIT.
-Some individual files are covered by other copyrights.  Utils
-parts are redistributed software covered by their own copyrights
-and terms.  Please see individual file's copyright notices.
-
-X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG.
-X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG.
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose is hereby granted without fee,
-provided that this entire copyright and permission notice appear
-in all such copies, and that the name of the authors may not be
-used to endorse or promote products derived from this material
-without specific prior written permission.  The authors make no
-representations about the suitability of this software for any
-purpose.  It is provided "as is" without express or implied warranty.
-============================================================
+They are copies of those included in the directory
+contrib/clients/cxterm of the distribution of X11R6.  As the original
+files don't contain copyright and license notices, a proper notice is
+extracted from .../cxterm/README and added at the head of each file.
 
 (3) 4Corner.tit
     ARRAY30.tit
     ETZY.tit
     ZOZY.tit
 
-These are the versions modified by the original authors from what
+They are versions modified by the original authors from those
 distributed with X11R5 to include proper copyright notices.  Each file
-contains a copyright notice.
+contains a license notice.
 
 (4) ECDICT.tit, Punct-b5.tit, Punct.tit
 
-These are verbatim copies of what distributed at
-ftp://ftp.ifcss.org/pub/software/.  Each file contains a copyright
+They are verbatim copies of those distributed at
+ftp://ftp.ifcss.org/pub/software/.  Each file contains a license
 notice.
diff --git a/leim/CXTERM-DIC/SW.tit b/leim/CXTERM-DIC/SW.tit
index b32c73762d4..f9d640e23da 100644
--- a/leim/CXTERM-DIC/SW.tit
+++ b/leim/CXTERM-DIC/SW.tit
@@ -1,4 +1,23 @@
-# $Id: SW.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
+# Header added for Emacs
+#
+# This file is included in the directory contrib/clients/cxterm of the
+# distribution of X11R6.  As the file itself does't contain copyright
+# and license notices, the following statements in the section 6 of
+# the file .../cxterm/README covers it.
+#
+# X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG.
+# X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG.
+# 
+# Permission to use, copy, modify, and distribute this software and
+# its documentation for any purpose is hereby granted without fee,
+# provided that this entire copyright and permission notice appear
+# in all such copies, and that the name of the authors may not be
+# used to endorse or promote products derived from this material
+# without specific prior written permission.  The authors make no
+# representations about the suitability of this software for any
+# purpose.  It is provided "as is" without express or implied warranty.
+#
+# End of header added for Emacs
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
diff --git a/leim/CXTERM-DIC/TONEPY.tit b/leim/CXTERM-DIC/TONEPY.tit
index 46b8df61bbe..8ada4971d83 100644
--- a/leim/CXTERM-DIC/TONEPY.tit
+++ b/leim/CXTERM-DIC/TONEPY.tit
@@ -1,4 +1,23 @@
-# $Id: TONEPY.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
+# Header added for Emacs
+#
+# This file is included in the directory contrib/clients/cxterm of the
+# distribution of X11R6.  As the file itself does't contain copyright
+# and license notices, the following statements in the section 6 of
+# the file .../cxterm/README covers it.
+#
+# X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG.
+# X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG.
+# 
+# Permission to use, copy, modify, and distribute this software and
+# its documentation for any purpose is hereby granted without fee,
+# provided that this entire copyright and permission notice appear
+# in all such copies, and that the name of the authors may not be
+# used to endorse or promote products derived from this material
+# without specific prior written permission.  The authors make no
+# representations about the suitability of this software for any
+# purpose.  It is provided "as is" without express or implied warranty.
+#
+# End of header added for Emacs
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 53879b2aef6..a52cb044489 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-30  Kenichi Handa  <handa@m17n.org>
+
+        * CXTERM-DIC/CCDOSPY.tit, CXTERM-DIC/PY-b5.tit, CXTERM-DIC/SW.tit,
+        CXTERM-DIC/TONEPY.tit: Add copyright and license notices.
+
+        * MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: Add copyright and
+        license notices.
+        
 2007-01-24  Kenichi Handa  <handa@m17n.org>
 
         * MISC-DIC/README: New file.
diff --git a/leim/MISC-DIC/README b/leim/MISC-DIC/README
index fbc061801aa..95efbd4d27b 100644
--- a/leim/MISC-DIC/README
+++ b/leim/MISC-DIC/README
@@ -1,46 +1,27 @@
 The source and copyright status of dictionary files in this directory
-are categorised into these three.
+are categorised into these three groups.
 
 (1) cangjie-table.b5
     cangjie-table.cns
 
-These are verbatim copies of what distributed by the author Christian
-Wittern himself.  Each file contains a copyright notice.
+They are verbatim copies of those distributed by the author Christian
+Wittern himself.  Each file contains a license notice.
 
 (2) CTLau.html
     CTLau-b5.html
 
-These are verbatim copies of what distributed at the authors home page
-<umunhum.stanford.edu/~lee/chicomp/> Each file contains a copyright
-notice.
+They are verbatim copies of those distributed at the author's home
+page <umunhum.stanford.edu/~lee/chicomp/>. Each file contains a
+license notice.
 
 (3) pinyin.map
     ziranma.cin
 
-These are verbatim copies of what distributed with a free packaged
+They are copies of those distributed with a free package
 called CCE at:
         http://ftp.debian.org/debian/dists/potato/main
                 /source/utils/cce_0.36.orig.tar.gz
 
-As those files themselves don't contain copyright notices, the
-copyright notice of the package itself should cover them.
-
-============================================================
-            Copyright (C) 1999, Rui He, herui@cs.duke.edu
-
-
-                 CCE(Console Chinese Environment) 0.32
-
-CCE is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation; either version 1, or (at your option) any later version.
-
-CCE is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-details.
-
-You should have received a copy of the GNU General Public License along with
-CCE; see the file COPYING.  If not, write to the Free Software Foundation,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")
-============================================================
+As the original files don't contain copyright and license notices, a
+proper notice is extracted from the file Copyright and added at the
+head of each file.
diff --git a/leim/MISC-DIC/pinyin.map b/leim/MISC-DIC/pinyin.map
index ff6b1a79728..47078e50282 100644
--- a/leim/MISC-DIC/pinyin.map
+++ b/leim/MISC-DIC/pinyin.map
@@ -1,3 +1,32 @@
+% Header added for Emacs

+%

+% This file is included in the free package called CCE.  It is

+% available at:

+%       http://ftp.debian.org/debian/dists/potato/main

+%               /source/utils/cce_0.36.orig.tar.gz

+%

+% As the file itself doesn't contain copyright and license notices,

+% the following statements of the file cce/Copyright covers it.

+%

+%             Copyright (C) 1999, Rui He, herui@cs.duke.edu

+%

+%

+%                  CCE(Console Chinese Environment) 0.32

+%

+% CCE is free software; you can redistribute it and/or modify it under the

+% terms of the GNU General Public License as published by the Free Software

+% Foundation; either version 1, or (at your option) any later version.

+%

+% CCE is distributed in the hope that it will be useful, but WITHOUT ANY

+% WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS

+% FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more

+% details.

+%

+% You should have received a copy of the GNU General Public License along with

+% CCE; see the file COPYING.  If not, write to the Free Software Foundation,

+% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

+%

+% End of header added for Emacs

 a       °¢°¡ºÇëçàÄï¹ß¹

 ai      °®°§°¤°­°£°©°¬°¦°«°¥°¨°ª°¯êÓö°ÞßàÈè¨æÈïÍàÉíÁ

 an      °²°¸°´°µ°¶°³ÚÏ÷ö°°°±âÖèñðÆ°·ï§ÞîáíÛû

diff --git a/leim/MISC-DIC/ziranma.cin b/leim/MISC-DIC/ziranma.cin
index 91122fc4fdb..fe380e9dc49 100644
--- a/leim/MISC-DIC/ziranma.cin
+++ b/leim/MISC-DIC/ziranma.cin
@@ -1,3 +1,32 @@
+% Header added for Emacs
+%
+% This file is included in the free package called CCE.  It is
+% available at:
+%       http://ftp.debian.org/debian/dists/potato/main
+%               /source/utils/cce_0.36.orig.tar.gz
+%
+% As the file itself doesn't contain copyright and license notices,
+% the following statements of the file cce/Copyright covers it.
+%
+%             Copyright (C) 1999, Rui He, herui@cs.duke.edu
+%
+%
+%                  CCE(Console Chinese Environment) 0.32
+%
+% CCE is free software; you can redistribute it and/or modify it under the
+% terms of the GNU General Public License as published by the Free Software
+% Foundation; either version 1, or (at your option) any later version.
+%
+% CCE is distributed in the hope that it will be useful, but WITHOUT ANY
+% WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+% FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+% details.
+%
+% You should have received a copy of the GNU General Public License along with
+% CCE; see the file COPYING.  If not, write to the Free Software Foundation,
+% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+%
+% End of header added for Emacs
 %ename  ZiranMa
 %prompt ¡¾×ÔÈ»¡¿
 %selkey 1234567890
diff --git a/leim/SKK-DIC/README b/leim/SKK-DIC/README
index f2a6313bc98..e3b76e0832e 100644
--- a/leim/SKK-DIC/README
+++ b/leim/SKK-DIC/README
@@ -1,4 +1,4 @@
-The file SKK-JISYO.L is a verbatim copy of what distributed with SKK
+The file SKK-JISYO.L is a verbatim copy of that distributed with SKK
 Ver.8.6.  The author of SKK is Masahiko Sato
 <masahiko@sato.riec.tohoku.ac.jp>.  SKK is free software distributed
 under the terms of the GNU General Public License.
diff --git a/leim/ja-dic/ja-dic.el b/leim/ja-dic/ja-dic.el
index 1866131c28b..695ea79c4a7 100644
--- a/leim/ja-dic/ja-dic.el
+++ b/leim/ja-dic/ja-dic.el
@@ -1,6 +1,6 @@
-;;; ja-dic.el --- dictionary for Japanese input method -*-coding: iso-2022-jp;-*-
+;;; ja-dic.el --- dictionary for Japanese input method -*-coding: iso-2022-jp; byte-compile-disable-print-circle:t; -*-
 ;;      Generated by the command `skkdic-convert'
-;;      Date: Wed Jan 24 15:18:03 2007
+;;      Date: Mon Jan 29 12:08:57 2007
 ;;      Original SKK dictionary file: ../SKK-DIC/SKK-JISYO.L
 
 ;; This file is part of GNU Emacs.