Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 545-562)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - erc-iswitchb: Temporarily enable iswitchb mode

 * gnus--rel--5.10  (patch 172-176)

   - Merge from emacs--devo--0
   - Update from CVS
   - Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.

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

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc leim/Makefile.in
Simple merge

diff --cc leim/quail/cyrillic.el
Simple merge

diff --cc leim/quail/hangul3.el
Simple merge

diff --cc leim/quail/latin-alt.el
index 330c1b904b295285165cff1362f81b9a7e175f8f,a764f416b436879fe4cf085e6b21a59c19f736f2..d573d4a0e13abacdc7c213c599235b3433a05ead
--- 1/leim/quail/latin-alt.el
--- 2/leim/quail/latin-alt.el
+++ b/leim/quail/latin-alt.el
@@@ -1,7 -1,7 +1,7 @@@
 -;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: iso-2022-7bit;-*-
 +;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: utf-8;-*-
  
  ;; 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,14 -1289,14 +1289,14 @@@ Doubling the postfix separates the lett
  (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 -> \e,Af\e(B
 -oe -> \e,Ax\e(B
 -aa -> \e,Ae\e(B
 -a\" -> \e,Ad\e(B
 -o\" -> \e,Av\e(B
 -e' -> \e,Ai\e(B
 +ae -> æ
 +oe -> ø
 +aa -> å
 +a\" -> ä
 +o\" -> ö
 +e' -> é
  
  Doubling the postfix separates the letter and postfix:
  aee -> ae   o\"\" -> o\"   etc.

diff --cc leim/quail/latin-post.el
index a3c7d9cb30ec2f07bbdb828e2ca4fec01661e7aa,090e2cc4330bf612e4fc29ba0f3585cd0b327ce2..7fdf3e7f9808ec65c0b6e7ea3195f1835677e770
--- 1/leim/quail/latin-post.el
--- 2/leim/quail/latin-post.el
+++ b/leim/quail/latin-post.el
@@@ -1,14 -1,11 +1,14 @@@
 -;;; latin-post.el --- Quail packages for inputting various European characters  -*-coding: iso-2022-7bit;-*-
 +;;; latin-post.el --- Quail packages for inputting various European characters  -*-coding: utf-8;-*-
  
  ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
 -;; Keywords: multilingual, input method, latin
 +;; Keywords: multilingual, input method, latin, i18n
  
  ;; This file is part of GNU Emacs.
  

diff --cc leim/quail/latin-pre.el
Simple merge

diff --cc leim/quail/pypunct-b5.el
index f8fc747ba03fb5ddd4a962639b286516c8de9795,a2e097902ef4628b85403fdd138aadd9d6c67ec4..8d57e42b141e6deca945b8438c17d3ea05cfee9b
--- 1/leim/quail/pypunct-b5.el
--- 2/leim/quail/pypunct-b5.el
+++ b/leim/quail/pypunct-b5.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols)
 +;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols) -*-coding: iso-2022-7bit;-*-
  
- ;; 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 --cc leim/quail/symbol-ksc.el
index 1747d40c109750f910ec7d2dd5099a61f7e7722b,62a24408efb037fc7c1ea88f4e76380597f100f5..de7386aa2d08361974bf2a747a1413818bce3911
--- 1/leim/quail/symbol-ksc.el
--- 2/leim/quail/symbol-ksc.el
+++ b/leim/quail/symbol-ksc.el
@@@ -1,7 -1,7 +1,7 @@@
 -;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601)
 +;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601) -*-coding: iso-2022-7bit;-*-
  
  ;; 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 --cc leim/quail/thai.el
index f27aab7acb02835e349e5825413a50b98ad2d737,6354c9dfde49651ea83800354d6d9dbe686c45a1..6d7f16cae80ae2d99466bad5478dc4f7e1db0251
--- 1/leim/quail/thai.el
--- 2/leim/quail/thai.el
+++ b/leim/quail/thai.el
@@@ -1,6 -1,7 +1,7 @@@
 -;;; thai.el --- Quail package for inputting Thai characters
 +;;; thai.el --- Quail package for inputting Thai characters -*-coding: iso-2022-7bit;-*-
  
- ;; 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 --cc leim/quail/tibetan.el
index e3f9f3c8bfb342ab5c7a963a4ca6e5d206621403,bad5dd58bcf521ce918c23369996bac90d549221..e710cada9149d5f428f3eaae3d496a6c36cca2a3
--- 1/leim/quail/tibetan.el
--- 2/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@@ -1,7 -1,7 +1,7 @@@
 -;;; tibetan.el --- Quail package for inputting Tibetan characters
 +;;; tibetan.el --- Quail package for inputting Tibetan characters -*-coding: iso-2022-7bit;-*-
  
  ;; 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 --cc leim/quail/uni-input.el
index 73ba07ef566d945da3d5a06fe06d41375f6ae961,1b4a3d3af1e8b2c738d6c61723b799e49e7c0a3f..a5f32068424249361425d248c4dda9aaed64e548
--- 1/leim/quail/uni-input.el
--- 2/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@@ -1,7 -1,7 +1,7 @@@
  ;;; uni-input.el --- Hex Unicode input method
  
 -;; Copyright (C) 2001, 2003, 2006  Free Software Foundation, Inc.
 +;; Copyright (C) 2001, 2002, 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
  

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/composite.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/generic.el
Simple merge

diff --cc lisp/emacs-lisp/regexp-opt.el
Simple merge

diff --cc lisp/eshell/esh-opt.el
Simple merge

diff --cc lisp/gnus/rfc2047.el
Simple merge

diff --cc lisp/gnus/rfc2104.el
Simple merge

diff --cc lisp/info.el
Simple merge

diff --cc lisp/international/ccl.el
Simple merge

diff --cc lisp/international/characters.el
index eb2d099dd4126fdb6fefb2ea6f55a10f0b2dd710,9f545b0123181f0df9c934a257768956fcd8652a..e52df15a9b2dd2c539da4da1b0ab91c7fececfe0
--- 1/lisp/international/characters.el
--- 2/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@@ -1,13 -1,11 +1,14 @@@
  ;;; characters.el --- set syntax and category for multibyte characters
  
- ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004
+ ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: multibyte character, character set, syntax, category
  

diff --cc lisp/international/codepage.el
index 7aab9bd85a856dc29edad518c2fdff5965750e99,9c045545ea678d689e5d01854bf682f77c7355f4..ca5500b541587cf6ed6590b646b6d92328427d4e
--- 1/lisp/international/codepage.el
--- 2/lisp/international/codepage.el
+++ b/lisp/international/codepage.el
@@@ -1,7 -1,7 +1,7 @@@
  ;;; codepage.el --- MS-DOS/MS-Windows specific coding systems
  
 -;; Copyright (C) 1998, 1999, 2000, 2002  Free Software Foundation, Inc.
 +;; Copyright (C) 1998, 1999, 2000, 2002, 2005  Free Software Foundation, Inc.
- ;; Copyright (C) 2000
+ ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

diff --cc lisp/international/encoded-kb.el
index 2cbb76cb08d3662809233ed498e91df41f7aef67,348be8590c10797d0b425ab3c05596105c1ac4a7..8456eb3c1754c0666178b412c550de9e8939575b
--- 1/lisp/international/encoded-kb.el
--- 2/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@@ -1,12 -1,11 +1,14 @@@
  ;;; encoded-kb.el --- handler to input multibyte characters encoded somehow
  
- ;; Copyright (C) 1997  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2004, 2005
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/international/fontset.el
index 9f09c6154516cd4cfe6d49523648fa38838815e0,5374842b649c52ba5f01119e815771de3f44c60d..e62583bb2b7cab5fda59f4351b058e679629f18e
--- 1/lisp/international/fontset.el
--- 2/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@@ -1,14 -1,13 +1,16 @@@
  ;;; fontset.el --- commands for handling fontset
  
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ ;;   2005, 2006  Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003, 2006
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
 -;; Keywords: mule, multilingual, fontset
 +;; Keywords: mule, i18n, fontset
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/international/ja-dic-cnv.el
Simple merge

diff --cc lisp/international/ja-dic-utl.el
Simple merge

diff --cc lisp/international/mule-cmds.el
index e0e7e8512c87656c8fed21c2e172ff6e39a401b2,4b415baf5faddb70ab2e693b14ad728e533809f9..fbdc0467f0022c40b843d847b03b7a5247482835
--- 1/lisp/international/mule-cmds.el
--- 2/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@@ -1,15 -1,13 +1,16 @@@
  ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*-
  
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ ;;   2006  Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
 -;; Keywords: mule, multilingual
 +;; Keywords: mule, i18n
  
  ;; This file is part of GNU Emacs.
  
@@@ -2552,20 -2598,10 +2552,24 @@@ See also `locale-charset-language-names
                   (not (coding-system-equal coding-system
                                             locale-coding-system)))
          (prefer-coding-system coding-system)
 -        (setq locale-coding-system coding-system))))
+         ;; Fixme: perhaps prefer-coding-system should set this too.
+         ;; But it's not the time to do such a fundamental change.
+         (setq default-sendmail-coding-system coding-system)
 +        (setq locale-coding-system coding-system))
++
 +      (when (get-language-info current-language-environment 'coding-priority)
 +        (let ((codeset (locale-info 'codeset))
 +              (coding-system (car (coding-system-priority-list))))
 +          (when codeset
 +            (let ((cs (coding-system-aliases coding-system))
 +                  result)
 +              (while (and cs (not result))
 +                (setq result
 +                      (locale-charset-match-p (symbol-name (pop cs))
 +                                              (locale-info 'codeset))))
 +              (unless result
 +                (message "Warning: Default coding system `%s' disagrees with
 +system codeset `%s' for this locale." coding-system codeset))))))))
  
      ;; On Windows, override locale-coding-system,
      ;; keyboard-coding-system with system codepage.  Note:

diff --cc lisp/international/mule-conf.el
index 7c36215af8516090de505e262ec5f1fed1edc38b,2f88b08254f360854cb9a8dab4ec58aef24e8e5a..e10f776b33aef14d140101f138400707798d0fb2
--- 1/lisp/international/mule-conf.el
--- 2/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@@ -1,15 -1,12 +1,15 @@@
 -;;; mule-conf.el --- configure multilingual environment -*- no-byte-compile: t -*-
 +;;; mule-conf.el --- configure multilingual environment
  
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2005
- ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003
+ ;; 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, 2006
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
 -;; Keywords: mule, multilingual, character set, coding system
 +;; Keywords: i18n, mule, multilingual, character set, coding system
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/international/mule-diag.el
index d1cc961817514dc1d60a9b1b237d09e8faff2f0c,95569a782403670e0da3ef62228b62666c16ef5e..a67b021341678efbe97613dfbb3d9d8baaaab09c
--- 1/lisp/international/mule-diag.el
--- 2/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@@ -1,13 -1,11 +1,14 @@@
  ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule)
  
- ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003
- ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1999, 2000, 2001, 2002, 2003
+ ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
+ ;;   2005, 2006  Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: multilingual, charset, coding system, fontset, diagnosis, i18n
  

diff --cc lisp/international/mule-util.el
index 6b4b9c712bd0e581b93fe2befc9b793963454e4b,d8b7aa903bea9501ed04cd4cd5704718bda70289..4d1ec5ec7f3ff89fbcf5988591e7bd1b6a95e71e
--- 1/lisp/international/mule-util.el
--- 2/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@@ -1,13 -1,11 +1,14 @@@
  ;;; mule-util.el --- utility functions for mulitilingual environment (mule)
  
- ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004
- ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998, 1999, 2004
+ ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
+ ;;   2005, 2006  Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: mule, multilingual
  

diff --cc lisp/international/mule.el
index 89f34d1362006b228f94d4c94197b368f5217638,ddaacfe72164209a193a82b00cd2e759d42fd075..cf6a3b21244b3893a2410336c4b55ff792646878
--- 1/lisp/international/mule.el
--- 2/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@@ -2,12 -2,10 +2,13 @@@
  
  ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: mule, multilingual, character set, coding system
  

diff --cc lisp/international/quail.el
Simple merge

diff --cc lisp/international/titdic-cnv.el
index 5727e484d7333049d780b7f323287052681fea47,68e4f6596f756ad37ad3ac802c0aaa7fe1ea14ce..e07df7b925f199a9b7edce80982def7af932cc33
--- 1/lisp/international/titdic-cnv.el
--- 2/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@@ -1,12 -1,11 +1,14 @@@
  ;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*-
  
- ;; Copyright (C) 1997, 1998, 2000, 2001  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002
+ ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
+ ;;   2005, 2006  Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: Quail, TIT, cxterm
  

diff --cc lisp/international/utf-7.el
Simple merge

diff --cc lisp/language/china-util.el
index d0abc35dbdcaa3771910b92c0f2c83b3e201e94f,bafdce1c8548e8cb583558fac7c2745b2a81a2e2..ce417796bef46d9ab98b0841b38851cca98511ca
--- 1/lisp/language/china-util.el
--- 2/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@@ -1,13 -1,11 +1,14 @@@
  ;;; china-util.el --- utilities for Chinese  -*- coding: iso-2022-7bit -*-
  
- ;; Copyright (C) 1995, 2001, 2003
+ ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 2003
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: mule, multilingual, Chinese
  

diff --cc lisp/language/chinese.el
index 302c5f21de1cdd9a65630f5adbcf6d96b9f73af1,ee1709fcc18aee926caaa8a81aa39d7ef5f228f1..aaed3808a65dfb655a949cbbd6c1d7a17bf6f3ad
--- 1/lisp/language/chinese.el
--- 2/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@@ -1,12 -1,11 +1,14 @@@
  ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 2001, 2003  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998
+ ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: multilingual, Chinese
  

diff --cc lisp/language/cyril-util.el
Simple merge

diff --cc lisp/language/cyrillic.el
index 3b35bb2c1a21b521e8e3812d185e213c0b0804b4,4e709cc5b63ee4b9bd2504a7d1e4f6d7c55eef51..110f07e14eabd92ab71cdc76b298a72e50f9c9d6
--- 1/lisp/language/cyrillic.el
--- 2/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@@ -1,12 -1,11 +1,14 @@@
  ;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1997, 1998, 2001, 2002, 2003  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004
+ ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Author: Kenichi Handa <handa@etl.go.jp>
  ;; Keywords: multilingual, Cyrillic, i18n

diff --cc lisp/language/czech.el
Simple merge

diff --cc lisp/language/devan-util.el
index d70a471a4f53e1fdcf81d05fc27c9825d56782f2,354d0c19a291bc2135dbcdaf8e9fc95bdc6a886c..92453078306a46997fdcb5a55a796edbe27a5264
--- 1/lisp/language/devan-util.el
--- 2/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@@ -1,8 -1,8 +1,8 @@@
 -;;; devan-util.el --- Support for composing Devanagari characters
 +;;; devan-util.el --- Support for composing Devanagari characters -*-coding: iso-2022-7bit;-*-
  
- ;; Copyright (C) 1997, 1998, 2001, 2002, 2003
+ ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 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 --cc lisp/language/devanagari.el
Simple merge

diff --cc lisp/language/english.el
index 01d8215e648b8ac18a66054b39e83098e54a6190,f3719fd9bbc58ead366c3a5fd0aa26fc8aafe70b..00eba11174236401faa6e134fc37e114ec2eb50b
--- 1/lisp/language/english.el
--- 2/lisp/language/english.el
+++ b/lisp/language/english.el
@@@ -1,12 -1,10 +1,13 @@@
  ;;; english.el --- support for English -*- no-byte-compile: t -*-
  
- ;; Copyright (C) 1997  Free Software Foundation, Inc.
- ;; Copyright (C) 1997
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: multibyte character, character set, syntax, category
  

diff --cc lisp/language/ethio-util.el
index ba4b22b115359a1cdc37aecf3c26f6bcfc6db189,b22fad328544265610989fffe29cc9a0a6691258..93de5e74c4df5703da4806bc7c0610099e777e45
--- 1/lisp/language/ethio-util.el
--- 2/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@@ -1,13 -1,10 +1,13 @@@
 -;;; ethio-util.el --- utilities for Ethiopic -*- coding: iso-2022-7bit; -*-
 +;;; ethio-util.el --- utilities for Ethiopic  -*- coding: utf-8-emacs; -*-
  
- ;; Copyright (C) 1997, 1998, 2002
+ ;; Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2006
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 2001, 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
 +;; Copyright (C) 2005, 2006
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number: H15PRO110
  
  ;; Keywords: mule, multilingual, Ethiopic
  

diff --cc lisp/language/ethiopic.el
index 49ce50d359a1242805a9550afdefcaa7144ea2cc,29679a8ca733959148dd14d725f3b5dbb86512c4..3772dceae1e965721c6c290a827940547668015b
--- 1/lisp/language/ethiopic.el
--- 2/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@@ -1,7 -1,9 +1,9 @@@
 -;;; ethiopic.el --- support for Ethiopic -*- coding: iso-2022-7bit; -*-
 +;;; ethiopic.el --- support for Ethiopic      -*- coding: utf-8-emacs; -*-
  
- ;; Copyright (C) 1997  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 2001, 2006
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; 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 --cc lisp/language/european.el
index 497be4023b8c844886e2a6ff052faa354e42c3fa,60401e56ab118a3f8f91d8b48e32596fc9ffc536..ecdca8b20f40e87af94dcf7cfdb64c883b5ff6fd
--- 1/lisp/language/european.el
--- 2/lisp/language/european.el
+++ b/lisp/language/european.el
@@@ -1,13 -1,11 +1,14 @@@
  ;;; european.el --- support for European languages -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004
+ ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: multilingual, European
  

diff --cc lisp/language/georgian.el
Simple merge

diff --cc lisp/language/greek.el
index 8e046af88b93aaca876700b48b1bc35bae049f5c,9eb7b4f7352f871c4ae54f6b78fd80848e2f2dc4..aca46aa6b247f5b64acf8ae9c0ae1df230224f0a
--- 1/lisp/language/greek.el
--- 2/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@@ -1,13 -1,10 +1,15 @@@
  ;;; greek.el --- support for Greek -*- no-byte-compile: t -*-
  
- ;; Copyright (C) 1995
 +;; Copyright (C) 2002 Free Software Foundation, Inc.
+ ;; 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
+ 
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
 +
  ;; Keywords: multilingual, Greek
  
  ;; This file is part of GNU Emacs.

diff --cc lisp/language/hebrew.el
index 4944b7a0881880bafe9130d7d98a25861d848f9c,abd2f6612bfbcc48f418f2683f619b144d523560..f9c9aa68b7ba072f96f16648f30648477e595534
--- 1/lisp/language/hebrew.el
--- 2/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@@ -1,13 -1,12 +1,16 @@@
  ;;; hebrew.el --- support for Hebrew -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
- ;; Copyright (C) 2001, 2002  Free Software Foundation, Inc.
- ;; Copyright (C) 1995
+ ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; 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
+ 
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
 +
  ;; Keywords: multilingual, Hebrew
  
  ;; This file is part of GNU Emacs.

diff --cc lisp/language/ind-util.el
Simple merge

diff --cc lisp/language/indian.el
Simple merge

diff --cc lisp/language/japanese.el
index dd1b5bec6ff362903fec2033541a4fc35e72b7a4,12a09423a32c5c931b834050c96cceecbbf6b4fd..590167ad560a3581a808c96b1ecd71b912858ffd
--- 1/lisp/language/japanese.el
--- 2/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@@ -1,12 -1,11 +1,14 @@@
  ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
- ;; Copyright (C) 1997  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: multilingual, Japanese
  

diff --cc lisp/language/kannada.el
Simple merge

diff --cc lisp/language/knd-util.el
Simple merge

diff --cc lisp/language/korean.el
index c74b5f8212f87302f09871a85a6703b742c998c4,3e04c13b7d0bb29dcd9ef6aa53a2a9fac96b9b9b..5a2ff9fdb1963ec7ae2a0b676917f27f7f117bc2
--- 1/lisp/language/korean.el
--- 2/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@@ -1,12 -1,11 +1,14 @@@
  ;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
- ;; Copyright (C) 1998  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1998
+ ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: multilingual, Korean
  

diff --cc lisp/language/lao-util.el
index 718baa3fd82cee6695fe0f1c6c906860318ac0e0,60f15670525f630b6b5e4e2b9e40bb7a7a824f82..dcbdf7eb4aaebd273c3b21d89d08c68d6fff7929
--- 1/lisp/language/lao-util.el
--- 2/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@@ -1,14 -1,12 +1,15 @@@
  ;;; lao-util.el --- utilities for Lao -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 2001  Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 2000
+ ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
 -;; Keywords: multilingual, Lao
 +;; Keywords: multilingual, Lao, i18n
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/language/lao.el
index ec2ef61268c53233f0662c7aad15d288551af8bf,b55c731801d4be980f2dee728ff2d88c6c2e162d..ed290d988ef57dabb0daeaa1b8380abbf463ca0f
--- 1/lisp/language/lao.el
--- 2/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@@ -1,12 -1,9 +1,12 @@@
  ;;; lao.el --- support for Lao -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
  ;; Copyright (C) 2001  Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: multilingual, Lao
  

diff --cc lisp/language/malayalam.el
Simple merge

diff --cc lisp/language/misc-lang.el
Simple merge

diff --cc lisp/language/mlm-util.el
Simple merge

diff --cc lisp/language/romanian.el
index 24d66bc32e37f6575cec5497dfb3eafd24dc6f7f,50f0f4e7e82def8ed896c1e766b6c7ffa89e4eba..79f8e7d87b87626068dadfadc214ae4090bb82e4
--- 1/lisp/language/romanian.el
--- 2/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@@ -1,9 -1,10 +1,10 @@@
  ;;; romanian.el --- support for Romanian -*- coding: iso-latin-2; no-byte-compile: t -*-
  
- ;; Copyright (C) 1998, 2002 Free Software Foundation.
+ ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation.
  
  ;; Author:    Dan Nicolaescu <done@ece.arizona.edu>
 -;; Keywords: multilingual, Romanian
 +;; Keywords: multilingual, Romanian, i18n
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/language/slovak.el
Simple merge

diff --cc lisp/language/tamil.el
Simple merge

diff --cc lisp/language/thai-util.el
index 8bae6e1e8ee055c18a85d46feb30ecf4c679ccc1,d91cc56116ec3bb5e1a95f88e6cf9315b42a85d2..8dcfca2c3dbf1c47759889667ed643e9dba46eb9
--- 1/lisp/language/thai-util.el
--- 2/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@@ -1,11 -1,13 +1,13 @@@
  ;;; thai-util.el --- utilities for Thai -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 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
 +;;   Registration Number H13PRO009
- ;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
  
 -;; Keywords: mule, multilingual, thai
 +;; Keywords: mule, multilingual, Thai, i18n
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/language/thai.el
index 3a482865b407ca9c6c2d08dd9cc22c8ec6428a53,65d5f7d17486daa5b4768e9e7f0c6e1c5a1b99f4..0c346c7594b37c5c199b9697ba4b038640d88693
--- 1/lisp/language/thai.el
--- 2/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@@ -1,14 -1,13 +1,16 @@@
  ;;; thai.el --- support for Thai -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
- ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 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 H13PRO009
 +;; Copyright (C) 2005
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
- ;; Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
+ ;;   2006  Free Software Foundation, Inc.
  
 -;; Keywords: multilingual, Thai
 +;; Keywords: multilingual, Thai, i18n
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/language/tibet-util.el
Simple merge

diff --cc lisp/language/tibetan.el
index ba7fb554bab9e7fa70c0cedb94f73a3fb5efa309,f4ebb391610aa4b34469b2311be65087c3475571..6256382d870a6901bbbb2156d70b2ed8e39ca305
--- 1/lisp/language/tibetan.el
--- 2/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@@ -1,14 -1,12 +1,15 @@@
  ;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1997, 2002  Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1999, 2000
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
 -;; Keywords: multilingual, Tibetan
 +;; Keywords: multilingual, Tibetan, i18n
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/language/tml-util.el
Simple merge

diff --cc lisp/language/utf-8-lang.el
Simple merge

diff --cc lisp/language/viet-util.el
index 2e6fc76da233150ec17ab118d66b0520327ecf30,0c4890cb9e457294252a40eda8c1a6989e05ed36..17e6f576951e6d80da88ec4ecdf62708b764c829
--- 1/lisp/language/viet-util.el
--- 2/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@@ -1,12 -1,11 +1,14 @@@
  ;;; viet-util.el --- utilities for Vietnamese  -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1998  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997
+ ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
  ;; Keywords: mule, multilingual, Vietnamese
  

diff --cc lisp/language/vietnamese.el
index 8b5c57a29ddf04d32511794323e32651e2e4c61c,870dd474451304c4abf622b93b3c1fc6029de5e6..22141b6d0e3cabc500efe5f0f6af05530de762cd
--- 1/lisp/language/vietnamese.el
--- 2/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@@ -1,14 -1,13 +1,16 @@@
  ;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1998, 2002  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1997, 1998, 2000
+ ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   Free Software Foundation, Inc.
+ ;; 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
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
 -;; Keywords: multilingual, Vietnamese
 +;; Keywords: multilingual, Vietnamese, i18n
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/makefile.w32-in
Simple merge

diff --cc lisp/obsolete/swedish.el
Simple merge

diff --cc lisp/progmodes/sh-script.el
Simple merge

diff --cc lisp/ps-bdf.el
index 3e18586489b9da252170fd76487aded438175394,eff8ff5eae21bededd9ad136e827795002265817..a19c0f02651aefe151c35c67407ddccb843ae463
--- 1/lisp/ps-bdf.el
--- 2/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@@ -1,14 -1,11 +1,15 @@@
  ;;; ps-bdf.el --- BDF font file handler for ps-print
  
- ;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2006
+ ;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1998, 1999, 2001, 2003
+ ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
+ 
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
 +
  ;; Keywords: wp, BDF, font, PostScript
  ;; Maintainer: Kenichi Handa <handa@m17n.org>
  

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term/mac-win.el
index 6569918603f8e8404a2104596097859eaa9c9a53,cba4985ccb34873257a03cf13d08562f450244d4..c49c8893b21f59797a259815a81da89f04ef832e
--- 1/lisp/term/mac-win.el
--- 2/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*-
 +;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8
  
- ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+ ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
  ;;   2005, 2006 Free Software Foundation, Inc.
  
  ;; Author: Andrew Choi <akochoi@mac.com>

diff --cc lisp/term/w32-win.el
Simple merge

diff --cc lisp/w32-fns.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/abbrev.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/category.c
index cb6385fdb250ea9c7d17b1f531d527f41a755236,ce238f4d3995bf947e0279e021bec37b3ddd7e59..4d19d4a6ccdbd07a5d759af601e6985985b3742c
--- 1/src/category.c
--- 2/src/category.c
+++ b/src/category.c
@@@ -1,11 -1,9 +1,12 @@@
  /* GNU Emacs routines to deal with category tables.
     Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
-    Copyright (C) 1995, 1997, 1998, 1999
+    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
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/category.h
index 4799b7a5e3d7053c27476238d21f731115eedd69,e27f86f9a9141f7db5073f51705c7ff70983f326..862576352267c32b2cf41fc90493a8b5deaa5aad
--- 1/src/category.h
--- 2/src/category.h
+++ b/src/category.h
@@@ -1,10 -1,8 +1,11 @@@
  /* Declarations having to do with Emacs category tables.
-    Copyright (C) 1995, 1998, 1999
+    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
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/ccl.c
index 1ff972294661a7ff8805f25f2c83541a8e399f90,49cef07650bd7379af23cfc197ffe82461c0f542..017c9ab4feb722e20e7d371050953ee7bc23431d
--- 1/src/ccl.c
--- 2/src/ccl.c
+++ b/src/ccl.c
@@@ -1,12 -1,10 +1,13 @@@
  /* CCL (Code Conversion Language) interpreter.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
                   2006 Free Software Foundation, Inc.
-    Copyright (C) 1995, 1997, 1998, 2003, 2004, 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
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/ccl.h
index 96417e79fa50d2db52af660337a921e831ae1fd4,1cfc8201e5425c37bf7ad54030b74955fd3f7a2f..01d92b621eb3d04ece085b0c1c4e5d90382c6725
--- 1/src/ccl.h
--- 2/src/ccl.h
+++ b/src/ccl.h
@@@ -1,10 -1,8 +1,11 @@@
  /* Header for CCL (Code Conversion Language) interpreter.
-    Copyright (C) 1995, 1998, 2000
+    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
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/charset.c
index 2228a24f6984fe31bcabe7f6219477ce2e9644e2,535022c67970f40047dc71bae7e04d91614f0f2d..9fb7f641705b3940bba70a9f31e0484119d64cbe
--- 1/src/charset.c
--- 2/src/charset.c
+++ b/src/charset.c
@@@ -1,12 -1,10 +1,13 @@@
 -/* Basic multilingual character support.
 +/* Basic character set support.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
 -                 2006 Free Software Foundation, Inc.
 +               2006 Free Software Foundation, Inc.
-    Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001
+    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
 +   Copyright (C) 2003, 2004
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/charset.h
index 25ccaf9d324a8e1f6af6d39c250028d669987cd3,645bdafe4b273f9abe64dbd8b403f04c86b6b160..e7aaf9d6194c76cea654e44870591145cf6bdbb9
--- 1/src/charset.h
--- 2/src/charset.h
+++ b/src/charset.h
@@@ -1,12 -1,10 +1,13 @@@
 -/* Header for multibyte character handler.
 +/* Header for charset handler.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
 -                 2006 Free Software Foundation, Inc.
 +               2006 Free Software Foundation, Inc.
-    Copyright (C) 1995, 1997, 1998, 2003
+    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
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/coding.c
index 28ab86c43fcfac5d79ce79d0a4b46f284c6fc4af,535f80ab74875d0158993fade1ffa4b0265dfd12..50c63b4beb8cce92f9fd4f20a2aaf0c263058459
--- 1/src/coding.c
--- 2/src/coding.c
+++ b/src/coding.c
@@@ -1,12 -1,10 +1,13 @@@
 -/* Coding system handler (conversion, detection, and etc).
 +/* Coding system handler (conversion, detection, etc).
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
                   2006 Free Software Foundation, Inc.
-    Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, 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
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/coding.h
index 93375d2c2eb209e4502b9856044c7e09293564c9,ca7af1c835427e5622661efb8fa7ad0dede2837f..0f8d2b0ed7bc0785818f041153056010d7e1232b
--- 1/src/coding.h
--- 2/src/coding.h
+++ b/src/coding.h
@@@ -1,12 -1,10 +1,13 @@@
  /* Header for coding system handler.
     Copyright (C) 2002, 2003, 2004, 2005,
                   2006 Free Software Foundation, Inc.
-    Copyright (C) 1995, 1997, 1998, 2000
+    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
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/composite.c
index ea6b3708f129096e5dc44efa9a9560ff3e5bbda2,8e5fce2da960c07cc9b9124cc39eee908f6ffd79..1ccd3af25156b4a1ea2840aaf74d8c514b651c00
--- 1/src/composite.c
--- 2/src/composite.c
+++ b/src/composite.c
@@@ -1,12 -1,9 +1,12 @@@
  /* Composite sequence support.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
                   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
 +   Copyright (C) 2003, 2006
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/composite.h
index 08463afd8996388b98ad3ee8576391f923f32830,e19fcd99e73013723bceeeb6c56949159d82ea1f..6e600e7a29b6c805fac91edf08274e765544795d
--- 1/src/composite.h
--- 2/src/composite.h
+++ b/src/composite.h
@@@ -1,12 -1,9 +1,12 @@@
  /* Header for composite sequence handler.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
                   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
 +   Copyright (C) 2003, 2006
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/emacs.c
Simple merge

diff --cc src/fontset.c
index a52082e2ff487ff6c0ef419d518fc20e74de24e8,838d9526944f9eb118e84c57d1de970c526bde60..5a50012fef4317ffc40e78a4adbea84c190b3758
--- 1/src/fontset.c
--- 2/src/fontset.c
+++ b/src/fontset.c
@@@ -1,12 -1,10 +1,13 @@@
  /* Fontset handler.
     Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-    Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 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
 -
 +   Copyright (C) 2003, 2006
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
 + 
  This file is part of GNU Emacs.
  
  GNU Emacs is free software; you can redistribute it and/or modify

diff --cc src/fontset.h
index cf09dde73f2a7247e884631c9f9a5d8545464b08,a08f7b74bd0d75bd92ba8e1aa7d41b37f38d16cc..b86c26784c74f63a112561d0f450b2afb3aea56a
--- 1/src/fontset.h
--- 2/src/fontset.h
+++ b/src/fontset.h
@@@ -1,12 -1,10 +1,13 @@@
  /* Header for fontset handler.
     Copyright (C) 1998, 2002, 2003, 2004, 2005,
                   2006 Free Software Foundation, Inc.
-    Copyright (C) 1995, 1997, 2000
+    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
 +   Copyright (C) 2003, 2006
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/frame.h
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/marker.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/msdos.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/syntax.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge