Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-536
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-537
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-538
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-539
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-540
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-541
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-542
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-543
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-544
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-545
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-546
   Update from erc--emacs--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-547
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-548
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-549
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-550
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-551
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-552
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-553
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-554
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-555
   erc-iswitchb: Temporarily enable iswitchb mode

 * emacs@sv.gnu.org/emacs--devo--0--patch-556
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-557
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-558
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-559
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-560
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-561
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-562
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-563
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-564
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-565
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-566
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-567
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-568
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-569
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-570
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-571
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-572
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-573
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-574
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-575
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-576
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-577
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-578
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-579
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-580
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-581
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-582
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-583
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-584
   Fix admin/quick-install-emacs to work with recent versions of autoconf

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-171
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-172
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-173
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-174
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-175
   Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-176
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-177
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-178
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-179
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-180
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-181
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-182
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-183
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-184
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-185
   Merge from emacs--devo--0

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

28 files changed, 63 insertions, 34 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 8717f228df4..57e8f626c61 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,28 @@
+2006-12-26  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.in (datarootdir): Define.
+
+2006-12-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.in (leim-list.el): Depend on ${TIT-MISC}, not
+	${NON-TIT-MISC}.
+
+2006-12-09  Juanma Barranquero  <lekktu@gmail.com>
+
+	* quail/latin-alt.el ("scandinavian-alt-postfix"): Fix typo.
+
+	* quail/uni-input.el (ucs-input-help): Fix title of ucs input method.
+
+2006-12-09  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (leim-list.el): Depend on leim-ext.el as well.
+	Run Emacs to append non-empty non-comment lines in leim-ext.el
+	to leim-list.el.
+
+2006-12-05  Juanma Barranquero  <lekktu@gmail.com>
+
+	* makefile.w32-in (MISC): Add $(srcdir)/quail/sisheng.elc.
+
 2006-11-29  Juanma Barranquero  <lekktu@gmail.com>
 
 	* quail/greek.el ("greek-mizuochi"): Remove spurious initial newline
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 10ba277b473..950f2734aab 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile for leim subdirectory in GNU Emacs.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H14PRO021
 
@@ -29,6 +29,7 @@ SHELL = /bin/sh
 # Here are the things that we expect ../configure to edit.
 version=@version@
 prefix=@prefix@
+datarootdir=@datarootdir@
 datadir=@datadir@
 srcdir=@srcdir@
 
@@ -203,7 +204,7 @@ changed.misc: ${MISC-SOURCES}
 	  -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \
 	  echo "changed" > $@
 
-leim-list.el: ${SUBDIRS} ${NON-TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el
+leim-list.el: ${SUBDIRS} ${TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el
 	${RUN-EMACS}  -l ${buildlisppath}/international/quail \
 	  -f batch-byte-compile-if-not-done ${TIT-MISC:.elc=.el}
 	if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
diff --git a/leim/leim-ext.el b/leim/leim-ext.el
index 681e81185b2..cdbea2edecd 100644
--- a/leim/leim-ext.el
+++ b/leim/leim-ext.el
@@ -1,8 +1,8 @@
-;; leim-ext.el -- extra leim configulation	-*- coding:iso-2022-7bit; -*-
+;; leim-ext.el -- extra leim configuration	-*- coding:iso-2022-7bit; -*-
 
 ;; Copyright (C) 2004, 2006
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 2004, 2005
+;; Copyright (C) 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 6c9ac670db1..7c1b4fdd99f 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -1,7 +1,7 @@
 # -*- Makefile -*- for leim subdirectory in GNU Emacs on the Microsoft W32 API.
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H14PRO021
 
@@ -119,7 +119,8 @@ MISC= \
 	$(srcdir)/quail/ethiopic.elc \
 	$(srcdir)/quail/ipa.elc \
 	$(srcdir)/quail/hebrew.elc \
-	$(srcdir)/quail/georgian.elc
+	$(srcdir)/quail/georgian.elc \
+	$(srcdir)/quail/sisheng.elc
 
 MISC_DIC=\
 	quail/tsang-b5.elc	\
@@ -183,11 +184,12 @@ $(MISC_DIC):
 	    -f batch-byte-compile $(MISC_DIC:.elc=.el)
 
 #
-# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
+# WARNING: Do NOT split the parts inside $(ARGQUOTE)s into multiple lines as
 #          this can break with GNU Make 3.81 and later if sh.exe is used.
-leim-list.el: $(SUBDIRS) $(WORLD)
+leim-list.el: $(SUBDIRS) $(WORLD) $(srcdir)/leim-ext.el
 	$(RUN_EMACS) -l $(buildlisppath)/international/quail \
 	    --eval $(ARGQUOTE)(update-leim-list-file $(DQUOTE).$(DQUOTE))$(ARGQUOTE)
+	$(RUN_EMACS) --eval $(ARGQUOTE)(w32-append-code-lines $(DQUOTE)$@$(DQUOTE) $(DQUOTE)$(srcdir)/leim-ext.el$(DQUOTE))$(ARGQUOTE)
 
 install: all
 	- mkdir "$(INSTALLDIR)"
diff --git a/leim/quail/cyril-jis.el b/leim/quail/cyril-jis.el
index e0e76451217..6ac7b456d9a 100644
--- a/leim/quail/cyril-jis.el
+++ b/leim/quail/cyril-jis.el
@@ -1,7 +1,7 @@
 ;;; cyril-jis.el --- Quail package for inputting JISX0208 Cyrillic letters
 
 ;; Copyright (C) 2001, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 655c2053222..e44229599e9 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1997, 2003
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el
index c1f07534c91..dd85cfe384b 100644
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -1,6 +1,6 @@
 ;;; ethiopic.el --- Quail package for inputting Ethiopic characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998, 1999, 2001, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/greek.el b/leim/quail/greek.el
index a9a97c85352..9c266a2f8f5 100644
--- a/leim/quail/greek.el
+++ b/leim/quail/greek.el
@@ -1,7 +1,7 @@
 ;;; greek.el --- Quail package for inputting Greek -*-coding: iso-2022-7bit-*-
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 2001
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/hangul.el b/leim/quail/hangul.el
index a8a821ad9bb..0ed46752bc1 100644
--- a/leim/quail/hangul.el
+++ b/leim/quail/hangul.el
@@ -1,7 +1,7 @@
 ;;; hangul.el --- Quail package for inputting Korean Hangul characters  -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 2002, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/hangul3.el b/leim/quail/hangul3.el
index 4565fca0b1a..7bd8ed85ca0 100644
--- a/leim/quail/hangul3.el
+++ b/leim/quail/hangul3.el
@@ -1,7 +1,7 @@
 ;;; hangul3.el --- Quail package for inputting Korean Hangul characters  -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 2002
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/hanja-jis.el b/leim/quail/hanja-jis.el
index baf426bc94a..569ed8273fe 100644
--- a/leim/quail/hanja-jis.el
+++ b/leim/quail/hanja-jis.el
@@ -1,6 +1,6 @@
 ;;; hanja-jis.el --- Quail package for inputting Korean Hanja (JISX0208)  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/hanja.el b/leim/quail/hanja.el
index 6e9419e73d3..1ef047410d4 100644
--- a/leim/quail/hanja.el
+++ b/leim/quail/hanja.el
@@ -1,7 +1,7 @@
 ;;; hanja.el --- Quail-package for Korean Hanja (KSC5601)  -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1997, 2006 Free Software Foundation, Inc.
-;; Copyright (C) 1997
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/hebrew.el b/leim/quail/hebrew.el
index 4193f59775f..60febc4ea44 100644
--- a/leim/quail/hebrew.el
+++ b/leim/quail/hebrew.el
@@ -1,6 +1,6 @@
 ;;; hebrew.el --- Quail package for inputting Hebrew characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1999
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el
index 48ce2b4063f..56f356a4782 100644
--- a/leim/quail/ipa.el
+++ b/leim/quail/ipa.el
@@ -1,6 +1,6 @@
 ;;; ipa.el --- Quail package for inputting IPA characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/japanese.el b/leim/quail/japanese.el
index 18cd23ae2ed..ff133708153 100644
--- a/leim/quail/japanese.el
+++ b/leim/quail/japanese.el
@@ -1,7 +1,7 @@
 ;;; japanese.el --- Quail package for inputting Japanese  -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 2001, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2005
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/lao.el b/leim/quail/lao.el
index 09151735de0..d547ff2dbe9 100644
--- a/leim/quail/lao.el
+++ b/leim/quail/lao.el
@@ -1,6 +1,6 @@
 ;;; lao.el --- Quail package for inputting Lao characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1999, 2004
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/latin-alt.el b/leim/quail/latin-alt.el
index 574b9a6921e..a764f416b43 100644
--- a/leim/quail/latin-alt.el
+++ b/leim/quail/latin-alt.el
@@ -1,7 +1,7 @@
 ;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1999
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -1289,7 +1289,7 @@ Doubling the postfix separates the letter and postfix: e.g. aee -> ae
 (quail-define-package
  "scandinavian-alt-postfix" "Latin-1" "SC<" t
  "Scandinavian input method with postfix modifiers
-Supported languages are Swidish, Norwegian, Danish, and Finnish.
+Supported languages are Swedish, Norwegian, Danish, and Finnish.
 
 ae -> ,Af(B
 oe -> ,Ax(B
diff --git a/leim/quail/latin-ltx.el b/leim/quail/latin-ltx.el
index 6efdeccad26..cb6052a7f05 100644
--- a/leim/quail/latin-ltx.el
+++ b/leim/quail/latin-ltx.el
@@ -1,7 +1,7 @@
 ;;; latin-ltx.el --- Quail package for TeX-style input -*-coding: utf-8;-*-
 
 ;; Copyright (C) 2001, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 2001, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/latin-post.el b/leim/quail/latin-post.el
index 5ca475e730f..090e2cc4330 100644
--- a/leim/quail/latin-post.el
+++ b/leim/quail/latin-post.el
@@ -1,7 +1,7 @@
 ;;; latin-post.el --- Quail packages for inputting various European characters  -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2006 Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1999
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/latin-pre.el b/leim/quail/latin-pre.el
index 8c809f2df25..e1102b5c475 100644
--- a/leim/quail/latin-pre.el
+++ b/leim/quail/latin-pre.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2005
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/lrt.el b/leim/quail/lrt.el
index 7985523f7e1..9ce43294a16 100644
--- a/leim/quail/lrt.el
+++ b/leim/quail/lrt.el
@@ -1,7 +1,7 @@
 ;;; lrt.el --- Quail package for inputting Lao characters by LRT method  -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1998, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1999
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/py-punct.el b/leim/quail/py-punct.el
index 04874b6cb60..5fa4d9b9da0 100644
--- a/leim/quail/py-punct.el
+++ b/leim/quail/py-punct.el
@@ -1,7 +1,7 @@
 ;;; py-punct.el --- Quail packages for Chinese (pinyin + extra symbols)  -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 2001, 2006 Free Software Foundation, Inc.
-;; Copyright (C) 1997, 2000
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/pypunct-b5.el b/leim/quail/pypunct-b5.el
index 4eff95a7a6c..a2e097902ef 100644
--- a/leim/quail/pypunct-b5.el
+++ b/leim/quail/pypunct-b5.el
@@ -1,6 +1,6 @@
 ;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols)
 
-;; Copyright (C) 1997, 2000, 2003
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/symbol-ksc.el b/leim/quail/symbol-ksc.el
index aabf4f5cd12..62a24408efb 100644
--- a/leim/quail/symbol-ksc.el
+++ b/leim/quail/symbol-ksc.el
@@ -1,7 +1,7 @@
 ;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601)
 
 ;; Copyright (C) 1997, 2005, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/thai.el b/leim/quail/thai.el
index 579ac35be06..6354c9dfde4 100644
--- a/leim/quail/thai.el
+++ b/leim/quail/thai.el
@@ -1,6 +1,7 @@
 ;;; thai.el --- Quail package for inputting Thai characters
 
-;; Copyright (C) 1995, 1997, 1999, 2005
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el
index 8387038eb40..bad5dd58bcf 100644
--- a/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@ -1,7 +1,7 @@
 ;;; tibetan.el --- Quail package for inputting Tibetan characters
 
 ;; Copyright (C) 1997, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/uni-input.el b/leim/quail/uni-input.el
index 851b4fdf223..1b4a3d3af1e 100644
--- a/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@ -1,7 +1,7 @@
 ;;; uni-input.el --- Hex Unicode input method
 
 ;; Copyright (C) 2001, 2003, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 2004
+;; Copyright (C) 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -149,7 +149,7 @@ While this input method is active, the variable
   (interactive)
   (with-output-to-temp-buffer "*Help*"
     (princ "\
-Input method: ucs (mode line indicator:U)
+Input method: ucs (mode line indicator:U+)
 
 Input as Unicode: U<hex> or u<hex>, where <hex> is a four-digit hex number.")))
 
diff --git a/leim/quail/viqr.el b/leim/quail/viqr.el
index 0a7acf42c70..bbe54a91f6d 100644
--- a/leim/quail/viqr.el
+++ b/leim/quail/viqr.el
@@ -1,6 +1,6 @@
 ;;; viqr.el --- Quail packages for inputting Vietnamese with VIQR system  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021