Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

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

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

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc etc/HELLO
Simple merge

diff --cc etc/MORE.STUFF
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc etc/TODO
Simple merge

diff --cc leim/CXTERM-DIC/4Corner.tit
index 8b52b531d64578da13a5bbca1601c755859d071d,18417a0dabceefd98fe870e301e9261e4d89960b..c73d9e389e9accda2104ebf34651b029ca3b12b9
--- 1/leim/CXTERM-DIC/4Corner.tit
--- 2/leim/CXTERM-DIC/4Corner.tit
+++ b/leim/CXTERM-DIC/4Corner.tit
@@@ -1,3 -1,4 +1,4 @@@
 -# $Id: 4Corner.tit,v 1.2 1994/06/06 01:54:03 ygz Exp $
++# $Id: 4Corner.tit,v 1.5 2007/01/24 06:35:08 handa Exp $
  # HANZI input table for cxterm
  # To be used by cxterm, convert me to .cit format first
  # .cit version 2

diff --cc leim/CXTERM-DIC/CCDOSPY.tit
index 5b135288de10cf4fc478e0d9b781810ccd8c698a,3f64c408cbb3e33e1903d772e0f3f6a75003bb01..cca16b62d09c83fb4642862372e7f8ef2fde4d97
--- 1/leim/CXTERM-DIC/CCDOSPY.tit
--- 2/leim/CXTERM-DIC/CCDOSPY.tit
+++ b/leim/CXTERM-DIC/CCDOSPY.tit
@@@ -1,9 -1,10 +1,10 @@@
 -# $Id: CCDOSPY.tit,v 1.2 1994/06/06 01:51:50 ygz Exp $
++# $Id: CCDOSPY.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
  # HANZI input table for cxterm
  # To be used by cxterm, convert me to .cit format first
- # .cit version 1
+ # .cit version 2
  ENCODE:       GB
- MULTICHOICE:  YES
- PROMPT:       ºº×ÖÊäÈë¡ËËõдƴÒô¡Ë£ 
+ AUTOSELECT:   NO
+ PROMPT:       ºº×ÖÊäÈë¡ËËõдƴÒô¡Ë\040
  #
  COMMENT ËõдƴÒô·½°¸ (Ô´ÓÚ CCDOS)
  COMMENT

diff --cc leim/CXTERM-DIC/PY-b5.tit
index 5ef45b854666a10b5a7662ce31fbaefc704ec2ba,22039a06d04ecbecfdbbd0116b781b52490badd5..ae330dbc906b3694aa010389fcc26a3853929b7b
--- 1/leim/CXTERM-DIC/PY-b5.tit
--- 2/leim/CXTERM-DIC/PY-b5.tit
+++ b/leim/CXTERM-DIC/PY-b5.tit
@@@ -1,14 -1,11 +1,11 @@@
 -# $Id: PY.tit,v 1.2 1994/06/06 01:54:03 ygz Exp $
++# $Id: PY-b5.tit,v 1.3 2007/01/24 06:35:08 handa Exp $
  # HANZI input table for cxterm
- # Generated from PY-b5.cit by cit2tit
  # To be used by cxterm, convert me to .cit format first
- # .cit version 1
+ # .cit version 2
  ENCODE:       BIG5
- MULTICHOICE:  YES
- PROMPT:       ¤¤¤å¿é¤J¡i«÷­µ¡j
+ AUTOSELECT:   NO
+ PROMPT:       º~¦r¿é¤J::«÷­µ::\040
  #
- COMMENT last modified by cyl@ifcss.org 1994 March 9
- COMMENT Modify by Wei-Chung Hwang, OCT 15, 1992.
- COMMENT
  COMMENT       º~»y«÷­µ¿é¤J¤è®×¤¶²Ð   (ª`­µ²Å¸¹¹ï·Ó)
  COMMENT       
  COMMENT                               Án¥À (CONSONANT)

diff --cc leim/CXTERM-DIC/QJ-b5.tit
index eb5a558bfb7c932b78e0d565cd9daf574b992c10,3492ae95315296dc191a4071a9a2264f038785aa..9b18b52486c0fbb4d795af98d521c509789f1b1b
--- 1/leim/CXTERM-DIC/QJ-b5.tit
--- 2/leim/CXTERM-DIC/QJ-b5.tit
+++ b/leim/CXTERM-DIC/QJ-b5.tit
@@@ -1,10 -1,10 +1,10 @@@
 -# $Id: QJ.tit,v 1.2 1994/06/06 01:54:03 ygz Exp $
++# $Id: QJ-b5.tit,v 1.3 2007/01/24 06:35:08 handa Exp $
  # HANZI input table for cxterm
- # Generated from QJ-b5.cit by cit2tit
  # To be used by cxterm, convert me to .cit format first
- # .cit version 1
+ # .cit version 2
  ENCODE:       BIG5
- MULTICHOICE:  NO
- PROMPT:       ¤¤¤å¿é¤J¡i¥þ§Î¡j
+ AUTOSELECT:   YES
+ PROMPT:       º~¦r¿é¤J::¥þ¨¤::
  #
  COMMENT Copyright 1991 by Yongguang Zhang.      (ygz@cs.purdue.edu)
  COMMENT Permission to use/modify/copy for any purpose is hereby granted.

diff --cc leim/CXTERM-DIC/QJ.tit
index b591f1326af53e93c9e7e3fcab18f5aedb2acf0c,cad66ffe474ec6d649243d31f9c03a1c8ef777fc..06c677080727d1e2e9add49fc17f2ba924f6244d
--- 1/leim/CXTERM-DIC/QJ.tit
--- 2/leim/CXTERM-DIC/QJ.tit
+++ b/leim/CXTERM-DIC/QJ.tit
@@@ -1,9 -1,10 +1,10 @@@
 -# $Id: QJ.tit,v 1.2 1994/06/06 01:53:09 ygz Exp $
++# $Id: QJ.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
  # HANZI input table for cxterm
  # To be used by cxterm, convert me to .cit format first
- # .cit version 1
+ # .cit version 2
  ENCODE:       GB
- MULTICHOICE:  NO
- PROMPT:       ºº×ÖÊäÈë¡ËÈ«½Ç¡Ë£ 
+ AUTOSELECT:   YES
+ PROMPT:       ºº×ÖÊäÈë¡ËÈ«½Ç¡Ë
  #
  COMMENT Copyright 1991 by Yongguang Zhang.      (ygz@cs.purdue.edu)
  COMMENT Permission to use/modify/copy for any purpose is hereby granted.

diff --cc leim/CXTERM-DIC/README
index 0000000000000000000000000000000000000000,43f397dff3ea59724ecd61ea757fc4e6de23725d..bda7055a2b56ddd140b8970741452059c8e57ef9
mode 000000,100644..100644
--- /dev/null
--- 2/leim/CXTERM-DIC/README
+++ b/leim/CXTERM-DIC/README
@@@ -1,0 -1,58 +1,58 @@@
 -contains a license notice.
+ 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.
+ 
+ (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
+ contrib/clients/cxterm of the distribution of X11R6.  Each file
 -themselves don't contain license notices, the section 6 of the file
++contains a copyright 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
 -contains a license notice.
++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.
+ ============================================================
+ 
+ (3) 4Corner.tit
+     ARRAY30.tit
+     ETZY.tit
+     ZOZY.tit
+ 
+ These are the versions modified by the original authors from what
+ distributed with X11R5 to include proper copyright notices.  Each file
 -ftp://ftp.ifcss.org/pub/software/.  Each file contains a license
++contains a copyright 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
+ notice.

diff --cc leim/CXTERM-DIC/SW.tit
index fed48d62e671f15674ae8292a4e03322d10a7b99,a0a5a442323d53842aa8c49be1f91a8653589d07..b32c73762d44c686a88cc3c64b407afc27a94485
--- 1/leim/CXTERM-DIC/SW.tit
--- 2/leim/CXTERM-DIC/SW.tit
+++ b/leim/CXTERM-DIC/SW.tit
@@@ -1,9 -1,10 +1,10 @@@
 -# $Id: SW.tit,v 1.2 1994/06/06 01:53:09 ygz Exp $
++# $Id: SW.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
  # HANZI input table for cxterm
  # To be used by cxterm, convert me to .cit format first
- # .cit version 1
+ # .cit version 2
  ENCODE:       GB
- MULTICHOICE:  YES
- PROMPT:       ºº×ÖÊäÈë¡ËÊ×β¡Ë£ 
+ AUTOSELECT:   NO
+ PROMPT:       ºº×ÖÊäÈë¡ËÊ×β¡Ë\040
  #
  COMMENT       (Ô´ÓÚ CCDOS)
  COMMENT       Êéд¸Ãºº×ÖʱµÄ¡¸Êױʡ¹¼°¡¸Î²±Ê¡¹¡£ÀýÈ磬¡¾ÂÀ¡¿Ê×β±Ê½ÔΪ¡¸¿Ú¡¹£¬¹ÊÔÚ

diff --cc leim/CXTERM-DIC/TONEPY.tit
index a93bf9dcb6467b7d3b651219b0987b2215d2c3b1,501ebfd52d02bf755e938cf2b13e6c22fdd69aef..46b8df61bbe8bad17dc31b9bb0c2d704999c4dab
--- 1/leim/CXTERM-DIC/TONEPY.tit
--- 2/leim/CXTERM-DIC/TONEPY.tit
+++ b/leim/CXTERM-DIC/TONEPY.tit
@@@ -1,9 -1,10 +1,10 @@@
 -# $Id: TONEPY.tit,v 1.2 1994/06/06 01:53:09 ygz Exp $
++# $Id: TONEPY.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
  # HANZI input table for cxterm
  # To be used by cxterm, convert me to .cit format first
- # .cit version 1
+ # .cit version 2
  ENCODE:       GB
- MULTICHOICE:  YES
- PROMPT:       ºº×ÖÊäÈë¡Ë´øµ÷Æ´Òô¡Ë£ 
+ AUTOSELECT:   NO
+ PROMPT:       ºº×ÖÊäÈë¡Ë´øµ÷Æ´Òô¡Ë\040
  #
  COMMENT       ´øµ÷Æ´Òô·½°¸
  COMMENT

diff --cc leim/MISC-DIC/README
index 0000000000000000000000000000000000000000,a8d7c0578aa390bd90070f593631235ca180b998..fbc061801aa8b32b0a47d790306867509560c3dd
mode 000000,100644..100644
--- /dev/null
--- 2/leim/MISC-DIC/README
+++ b/leim/MISC-DIC/README
@@@ -1,0 -1,46 +1,46 @@@
 -Wittern himself.  Each file contains a license notice.
+ The source and copyright status of dictionary files in this directory
+ are categorised into these three.
+ 
+ (1) cangjie-table.b5
+     cangjie-table.cns
+ 
+ These are verbatim copies of what distributed by the author Christian
 -<umunhum.stanford.edu/~lee/chicomp/> Each file contains a license
++Wittern himself.  Each file contains a copyright notice.
+ 
+ (2) CTLau.html
+     CTLau-b5.html
+ 
+ These are verbatim copies of what distributed at the authors home page
 -As those files themselves don't contain license notices, the
 -copyright/license notice of the package itself should cover them.
++<umunhum.stanford.edu/~lee/chicomp/> Each file contains a copyright
+ notice.
+ 
+ (3) pinyin.map
+     ziranma.cin
+ 
+ These are verbatim copies of what distributed with a free packaged
+ 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.")
+ ============================================================

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/indian.el
Simple merge

diff --cc leim/quail/latin-alt.el
index d573d4a0e13abacdc7c213c599235b3433a05ead,54160808cc0f09843101bf0af5e7b8b98e8b9f00..d913e80856378b3526efe24f874abfb95554587d
--- 1/leim/quail/latin-alt.el
--- 2/leim/quail/latin-alt.el
+++ b/leim/quail/latin-alt.el
@@@ -1,7 -1,8 +1,8 @@@
 -;;; 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, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ ;;   Free Software Foundation, Inc.
+ ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

diff --cc leim/quail/latin-post.el
index 7fdf3e7f9808ec65c0b6e7ea3195f1835677e770,5140348e7cc462d222bbc7ea02d1931b187047b9..1d958183d2f41a3c60a0080c74229358622e2e29
--- 1/leim/quail/latin-post.el
--- 2/leim/quail/latin-post.el
+++ b/leim/quail/latin-post.el
@@@ -1,14 -1,13 +1,16 @@@
 -;;; 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, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ ;;   Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ ;;   2006, 2007
  ;;   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
index be2a1b21749e2ebdfc31958031b5dcf937516704,76c2bc7937e5e8423604bcfe54d3f294767c6027..c3298be5bc981b215b0b4bc0ac9c89ad9b72e804
--- 1/leim/quail/latin-pre.el
--- 2/leim/quail/latin-pre.el
+++ b/leim/quail/latin-pre.el
@@@ -1,8 -1,10 +1,10 @@@
 -;;; latin-pre.el --- Quail packages for inputting various European characters  -*-coding: iso-2022-7bit;-*-
 +;;; latin-pre.el --- Quail packages for inputting various European characters  -*-coding: utf-8;-*-
  
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ ;;   2006, 2007
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ ;;   2006, 2007
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

diff --cc leim/quail/pypunct-b5.el
index 8d57e42b141e6deca945b8438c17d3ea05cfee9b,9aa7257b8244bafb4113032384960795110a56ea..bb206525ab3cc0c29b5390a418499cea201ae52b
--- 1/leim/quail/pypunct-b5.el
--- 2/leim/quail/pypunct-b5.el
+++ b/leim/quail/pypunct-b5.el
@@@ -1,6 -1,7 +1,7 @@@
 -;;; 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, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ ;;   2006, 2007
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

diff --cc leim/quail/symbol-ksc.el
index de7386aa2d08361974bf2a747a1413818bce3911,ebaeff371623ccea9ebbbaea5d0fcbcfb905e873..aa6f7e98c2e90f1e1a887fb07b67f48cb401c339
--- 1/leim/quail/symbol-ksc.el
--- 2/leim/quail/symbol-ksc.el
+++ b/leim/quail/symbol-ksc.el
@@@ -1,7 -1,9 +1,9 @@@
 -;;; 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, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ ;;   Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ ;;   2006, 2007
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

diff --cc leim/quail/thai.el
index 6d7f16cae80ae2d99466bad5478dc4f7e1db0251,2d25a935425d143c3e8e32bca19a493a379d2356..fded06ffb5ce45a6791516370d6477fbd1e0e94a
--- 1/leim/quail/thai.el
--- 2/leim/quail/thai.el
+++ b/leim/quail/thai.el
@@@ -1,7 -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, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

diff --cc leim/quail/tibetan.el
index e710cada9149d5f428f3eaae3d496a6c36cca2a3,97bab8d93d36eff8f5e81eeb44467384528eb8c9..04bade325c44d2f8891f99f0293ba0340cbfd91c
--- 1/leim/quail/tibetan.el
--- 2/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@@ -1,7 -1,9 +1,9 @@@
 -;;; 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, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ ;;   Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ ;;   2006, 2007
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

diff --cc leim/quail/uni-input.el
Simple merge

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

diff --cc lib-src/makefile.w32-in
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/ChangeLog.10
Simple merge

diff --cc lisp/Makefile.in
Simple merge

diff --cc lisp/arc-mode.el
Simple merge

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/case-table.el
Simple merge

diff --cc lisp/composite.el
Simple merge

diff --cc lisp/cus-start.el
Simple merge

diff --cc lisp/descr-text.el
Simple merge

diff --cc lisp/desktop.el
Simple merge

diff --cc lisp/disp-table.el
Simple merge

diff --cc lisp/dnd.el
Simple merge

diff --cc lisp/edmacro.el
Simple merge

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

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

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

diff --cc lisp/emacs-lisp/copyright.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/emulation/keypad.el
Simple merge

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

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

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/format.el
Simple merge

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

diff --cc lisp/gnus/mm-bodies.el
Simple merge

diff --cc lisp/gnus/mm-util.el
Simple merge

diff --cc lisp/gnus/mml.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 e52df15a9b2dd2c539da4da1b0ab91c7fececfe0,acc1458ac9cce1975cace3d2cf6117aeda3bc54c..a75fe28a08b37d3c6bba3f65cef47d4b9e167eb9
--- 1/lisp/international/characters.el
--- 2/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; characters.el --- set syntax and category for multibyte characters
  
- ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 ca5500b541587cf6ed6590b646b6d92328427d4e,ff30e4c14c40a6179f3a6f074e1dbc2fc07816f8..4c3f76d470bcbaafa7a2161aee3039be4525abbc
--- 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, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

diff --cc lisp/international/encoded-kb.el
index 8456eb3c1754c0666178b412c550de9e8939575b,6d89b7306687edb7ae6cd1e3e1f056f0b83dc1fa..5f61c7ca65e27f383dedf56595437880484e8d0d
--- 1/lisp/international/encoded-kb.el
--- 2/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; encoded-kb.el --- handler to input multibyte characters encoded somehow
  
- ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 e62583bb2b7cab5fda59f4351b058e679629f18e,81665ffd1ce2b312c5e83ea17600b3b49ed94e0d..2913a10dcdb743d67c4874235ab97c839d14f133
--- 1/lisp/international/fontset.el
--- 2/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@@ -1,16 -1,13 +1,16 @@@
  ;;; fontset.el --- commands for handling fontset
  
  ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006  Free Software Foundation, Inc.
+ ;;   2005, 2006, 2007  Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 6c7500ce9506855fb371e0acfeb0f97f1b41ce83,eff277887d4bd726c1e43bd584b2f7b95ff98168..f45c41f46b5eab0ea3434cf41183a6e5b7ac35d2
--- 1/lisp/international/mule-cmds.el
--- 2/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@@ -1,16 -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,
- ;;   2006  Free Software Foundation, Inc.
+ ;;   2006, 2007  Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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.
  

diff --cc lisp/international/mule-conf.el
index e10f776b33aef14d140101f138400707798d0fb2,05f259b038fac914dd77caa60e17f4372f9ec376..bf224c9d8136f8521dd2618a5c526b82ce3dcda5
--- 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, 2003,
- ;;   2004, 2005, 2006  Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;;   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   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 a67b021341678efbe97613dfbb3d9d8baaaab09c,80bfd2dbfa31a2c3419014ed64bb03ef7d4095ff..286a6410fdfaa64ce8e3c2105ae9759b3ee2c81c
--- 1/lisp/international/mule-diag.el
--- 2/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule)
  
  ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006  Free Software Foundation, Inc.
+ ;;   2005, 2006, 2007  Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 4d1ec5ec7f3ff89fbcf5988591e7bd1b6a95e71e,78ef30a56de7749269ebb62365776935340a02ed..10b9426aee2c91bce840bb1003b419b263d60c62
--- 1/lisp/international/mule-util.el
--- 2/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; mule-util.el --- utility functions for mulitilingual environment (mule)
  
  ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006  Free Software Foundation, Inc.
+ ;;   2005, 2006, 2007  Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 cf6a3b21244b3893a2410336c4b55ff792646878,25b53027f95f050950c171e4d51172d75f090824..9689725f3114d4c8c255fffb3bf498123fbd167a
--- 1/lisp/international/mule.el
--- 2/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@@ -1,14 -1,11 +1,14 @@@
 -;;; mule.el --- basic commands for mulitilingual environment
 +;;; mule.el --- basic commands for multilingual environment
  
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 e07df7b925f199a9b7edce80982def7af932cc33,9577ccf50ad60f4b94e90a316f037745ee94b81c..4f982d1403954b57920330ca51804ee8f605499e
--- 1/lisp/international/titdic-cnv.el
--- 2/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@@ -1,14 -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, 2002, 2003, 2004,
- ;;   2005, 2006  Free Software Foundation, Inc.
+ ;;   2005, 2006, 2007  Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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/isearch.el
Simple merge

diff --cc lisp/language/china-util.el
index ce417796bef46d9ab98b0841b38851cca98511ca,49041e611acf96fbb01be49609ee167645a2afe1..407832347d1cb489fa833647c0e10bdd949ee20d
--- 1/lisp/language/china-util.el
--- 2/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; china-util.el --- utilities for Chinese  -*- coding: iso-2022-7bit -*-
  
- ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 aaed3808a65dfb655a949cbbd6c1d7a17bf6f3ad,9d2297cb7a75cef3a7b21aff5d2acf1c3b3a810d..fdb4dae710ae4307b13f5282baa031e08b9841c3
--- 1/lisp/language/chinese.el
--- 2/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 110f07e14eabd92ab71cdc76b298a72e50f9c9d6,656f6b600963c75630340299148e32973e3fd4f5..5ecfe5cf4ed90d9a5f3521ac002fede4bb7668f3
--- 1/lisp/language/cyrillic.el
--- 2/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 92453078306a46997fdcb5a55a796edbe27a5264,b25e90cebe9cebd7287c3d5e933bc9ff79ea1b3f..b236a95e3b466645dcb205cd105719b547d22006
--- 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, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   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 00eba11174236401faa6e134fc37e114ec2eb50b,d12ed650186f19e65bb7ca9a64ffdd3cc235c822..852c0c65bbbb3092e72223e045a084310644a757
--- 1/lisp/language/english.el
--- 2/lisp/language/english.el
+++ b/lisp/language/english.el
@@@ -1,13 -1,10 +1,13 @@@
  ;;; english.el --- support for English -*- no-byte-compile: t -*-
  
- ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   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 93de5e74c4df5703da4806bc7c0610099e777e45,857df138670a376004d5acbb36b84e2377c800e3..6354a41b93c0e5331d5f190dfc8db7c1855c6803
--- 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, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   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 3772dceae1e965721c6c290a827940547668015b,1ae1f461f2db3d07667ae1654974e39fbb04f522..5417adb275f373685b4a2def3b2165cf544ab330
--- 1/lisp/language/ethiopic.el
--- 2/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@@ -1,9 -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, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

diff --cc lisp/language/european.el
index ecdca8b20f40e87af94dcf7cfdb64c883b5ff6fd,ccbbf8318c9af230aa421ee23c9f914ddc44fbab..b7532eb1a47420b597e31d6c80a590d4aac5dc65
--- 1/lisp/language/european.el
--- 2/lisp/language/european.el
+++ b/lisp/language/european.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; european.el --- support for European languages -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 aca46aa6b247f5b64acf8ae9c0ae1df230224f0a,c391319b8852b7ea8f073961e35f006f1ced66cf..1ece8c0fd647e58d080c26f8b4d211743fc6781a
--- 1/lisp/language/greek.el
--- 2/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@@ -1,8 -1,7 +1,8 @@@
  ;;; greek.el --- support for Greek -*- no-byte-compile: t -*-
  
 +;; Copyright (C) 2002 Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

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

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

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

diff --cc lisp/language/japanese.el
index 590167ad560a3581a808c96b1ecd71b912858ffd,b9b0eeb2a1446c4201cf59a4cca4b4e1c2ce0e0a..eea0e5eb4d27530bf4037b75adaa6a24696f5836
--- 1/lisp/language/japanese.el
--- 2/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
- ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 5a2ff9fdb1963ec7ae2a0b676917f27f7f117bc2,3cf291eb5894c70e3bf048c1d60b015e0d9f6ffe..d6eca4a5c5ef8b06a81056e38edb4d0bb1e1eca2
--- 1/lisp/language/korean.el
--- 2/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
- ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 dcbdf7eb4aaebd273c3b21d89d08c68d6fff7929,cbb2f09a35bdb3391d99d731ac6fb3afc35fd54b..359f4f8772494cba1f27caa95fc660a923b6e82c
--- 1/lisp/language/lao-util.el
--- 2/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@@ -1,15 -1,12 +1,15 @@@
  ;;; lao-util.el --- utilities for Lao -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   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 ed290d988ef57dabb0daeaa1b8380abbf463ca0f,e4158f682ad489837127aaa68447718de288202f..1f5a994575beb9f19df784d37d3bad2768bc670e
--- 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, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   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
Simple merge

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

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

diff --cc lisp/language/thai-util.el
index 8dcfca2c3dbf1c47759889667ed643e9dba46eb9,3ce0ef696d2c76b82efc96d5a13e31c3a23bcc58..4493ea518723e18b4b27ec47427d332819f886b9
--- 1/lisp/language/thai-util.el
--- 2/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@@ -1,13 -1,13 +1,13 @@@
  ;;; thai-util.el --- utilities for Thai -*- coding: iso-2022-7bit; -*-
  
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 -;;   Registration Number H14PRO021
 +;;   Registration Number H13PRO009
- ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   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 0c346c7594b37c5c199b9697ba4b038640d88693,67d8734c48214d73689a9f1356cee741f9e7c5db..facdbba50dd88ac4fa9b3e95fef17859f3976700
--- 1/lisp/language/thai.el
--- 2/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@@ -1,16 -1,13 +1,16 @@@
  ;;; thai.el --- support for Thai -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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, 2003, 2004, 2005,
- ;;   2006  Free Software Foundation, Inc.
+ ;;   2006, 2007  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 6256382d870a6901bbbb2156d70b2ed8e39ca305,94dc50bc15d5ee415b67892cd6aafa7cdaffb3da..2e020d24fdb6d49ddfe994131510f059be8d3d51
--- 1/lisp/language/tibetan.el
--- 2/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@@ -1,15 -1,12 +1,15 @@@
  ;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   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 17e6f576951e6d80da88ec4ecdf62708b764c829,2a1cc0fd67908d73fb12c4598b1a23e5fc8278e5..3ea53621c95c9a404d4082b2f825a120823bfadb
--- 1/lisp/language/viet-util.el
--- 2/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; viet-util.el --- utilities for Vietnamese  -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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 22141b6d0e3cabc500efe5f0f6af05530de762cd,191637fb1a408000d1be957b8b76d39284f8c4c0..75f84ca55ecb79b4d49e64f9054832154b86630c
--- 1/lisp/language/vietnamese.el
--- 2/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@@ -1,16 -1,13 +1,16 @@@
  ;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+ ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006
+ ;;   2005, 2006, 2007
  ;;   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/ldefs-boot.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/mail/emacsbug.el
Simple merge

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc lisp/mail/sendmail.el
Simple merge

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

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

diff --cc lisp/progmodes/perl-mode.el
Simple merge

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

diff --cc lisp/ps-print.el
index e50342dac9111f082741bacc113eb4968288f70f,2484bd677cd1e54f1d5d71b372d74488afb7a379..dfdfb2c52b99451b0dbfd5df115db71559d50020
--- 1/lisp/ps-print.el
--- 2/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@@ -2938,6 -3005,6 +2938,8 @@@ Valid values are
  
     frame-parameter    The foreground-color frame parameter will be used.
  
++   frame-parameter    The foreground-color frame parameter will be used.
++
     NUMBER     It's a real value between 0.0 (black) and 1.0 (white) that
                indicate the gray color.
  
@@@ -2981,6 -3048,6 +2983,8 @@@ Valid values are
  
     frame-parameter    The background-color frame parameter will be used.
  
++   frame-parameter    The background-color frame parameter will be used.
++
     NUMBER     It's a real value between 0.0 (black) and 1.0 (white) that
                indicate the gray color.
  

diff --cc lisp/ruler-mode.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/tar-mode.el
Simple merge

diff --cc lisp/term.el
Simple merge

diff --cc lisp/term/mac-win.el
index b7a4d3a2f98d7076aab80d5559f2857a5f7879f1,be4c978dd2855317c41ee1d59d85d8ec62ef27a7..09e1c77353b4842fbe8b04d94a8b7f158ea69a83
--- 1/lisp/term/mac-win.el
--- 2/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@@ -1,7 -1,7 +1,7 @@@
 -;;; 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, 2001, 2002, 2003, 2004,
- ;;   2005, 2006 Free Software Foundation, Inc.
+ ;;   2005, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Andrew Choi <akochoi@mac.com>
  ;; Keywords: terminals

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

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

diff --cc lisp/textmodes/fill.el
Simple merge

diff --cc lisp/textmodes/ispell.el
Simple merge

diff --cc lisp/textmodes/sgml-mode.el
Simple merge

diff --cc lisp/time-stamp.el
Simple merge

diff --cc lisp/version.el
Simple merge

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

diff --cc lisp/wid-edit.el
Simple merge

diff --cc make-dist
Simple merge

diff --cc src/.gdbinit
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/abbrev.c
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/bytecode.c
Simple merge

diff --cc src/callproc.c
Simple merge

diff --cc src/casefiddle.c
Simple merge

diff --cc src/casetab.c
Simple merge

diff --cc src/category.c
index 4d19d4a6ccdbd07a5d759af601e6985985b3742c,809e326cbe997afb4c1b5d81ddbfbb4a765680b4..218d5f7f783196c3f328928b3d9f176ab5e3d918
--- 1/src/category.c
--- 2/src/category.c
+++ b/src/category.c
@@@ -1,12 -1,10 +1,13 @@@
  /* GNU Emacs routines to deal with category tables.
-    Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+    Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+      Free Software Foundation, Inc.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006
+      2005, 2006, 2007
       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 862576352267c32b2cf41fc90493a8b5deaa5aad,858a94a62242c66bb66fd952a83bc16c2d07bf80..3ce03a83de8370cc63fffcd26b2ebb9c6cd56c5a
--- 1/src/category.h
--- 2/src/category.h
+++ b/src/category.h
@@@ -1,11 -1,8 +1,11 @@@
  /* Declarations having to do with Emacs category tables.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006
+      2005, 2006, 2007
       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 017c9ab4feb722e20e7d371050953ee7bc23431d,ded74fb6296905b8edaa275f0f9b75f8667200d0..c13f7c863b1e89a4694bf3182a6feaed0a536b1e
--- 1/src/ccl.c
--- 2/src/ccl.c
+++ b/src/ccl.c
@@@ -1,13 -1,10 +1,13 @@@
  /* CCL (Code Conversion Language) interpreter.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                  2006 Free Software Foundation, Inc.
+                  2006, 2007 Free Software Foundation, Inc.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006
+      2005, 2006, 2007
       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 01d92b621eb3d04ece085b0c1c4e5d90382c6725,af3a92d3285605106dca31423fa8b852f20d9c39..e1c14e71754d1093dbabce03e6e227b3ac0a2660
--- 1/src/ccl.h
--- 2/src/ccl.h
+++ b/src/ccl.h
@@@ -1,11 -1,8 +1,11 @@@
  /* Header for CCL (Code Conversion Language) interpreter.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006
+      2005, 2006, 2007
       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 9fb7f641705b3940bba70a9f31e0484119d64cbe,0d91606da586159b9c0984e8bed8f425d421bd02..d5b15092b7b037d2140254674f6d91a2d8681bb4
--- 1/src/charset.c
--- 2/src/charset.c
+++ b/src/charset.c
@@@ -1,14 -1,11 +1,15 @@@
 -/* Basic multilingual character support.
 +/* Basic character set support.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                2006 Free Software Foundation, Inc.
+                  2006, 2007 Free Software Foundation, Inc.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006
+      2005, 2006, 2007
       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.
  
  GNU Emacs is free software; you can redistribute it and/or modify

diff --cc src/charset.h
index e7aaf9d6194c76cea654e44870591145cf6bdbb9,2d0116d263ee54d8ad32175cc3023e0b1d1408c2..8c76aa0607112d01e3e63043344dbc564d7a6058
--- 1/src/charset.h
--- 2/src/charset.h
+++ b/src/charset.h
@@@ -1,14 -1,11 +1,15 @@@
 -/* Header for multibyte character handler.
 +/* Header for charset handler.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                2006 Free Software Foundation, Inc.
+                  2006, 2007 Free Software Foundation, Inc.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006
+      2005, 2006, 2007
       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.
  
  GNU Emacs is free software; you can redistribute it and/or modify

diff --cc src/cmds.c
Simple merge

diff --cc src/coding.c
index 50c63b4beb8cce92f9fd4f20a2aaf0c263058459,6bb9f8225c9896aa6da3dfa608acac169df78adc..aa58884fdedfcba80b97f3cce8c76dcb76ffccbc
--- 1/src/coding.c
--- 2/src/coding.c
+++ b/src/coding.c
@@@ -1,13 -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.
+                  2006, 2007 Free Software Foundation, Inc.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006
+      2005, 2006, 2007
       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 0f8d2b0ed7bc0785818f041153056010d7e1232b,b4e2668622992d6bfec36c8db0f41490e0f9e137..f33e8335752d3245a5a92372cfa0eb3135e8d7a3
--- 1/src/coding.h
--- 2/src/coding.h
+++ b/src/coding.h
@@@ -1,13 -1,10 +1,13 @@@
  /* Header for coding system handler.
-    Copyright (C) 2002, 2003, 2004, 2005,
-                  2006 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                  2006, 2007  Free Software Foundation, Inc.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006
+      2005, 2006, 2007
       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 1ccd3af25156b4a1ea2840aaf74d8c514b651c00,3e0606e9007d5d8bd6f396d56548a832397f264d..d44acf24722c51b0fc4e881f08d2c5dda64d19ca
--- 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, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+                  2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
       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 6e600e7a29b6c805fac91edf08274e765544795d,8ff6416990f46ea6f921ebc143ade8046b66d692..5106fcc990f153c5aa89807ad8de3d3b42e8bae8
--- 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, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+                  2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
       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/config.in
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/dired.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/disptab.h
Simple merge

diff --cc src/doc.c
Simple merge

diff --cc src/doprnt.c
Simple merge

diff --cc src/dosfns.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/filelock.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/fontset.c
index 5a50012fef4317ffc40e78a4adbea84c190b3758,2df60a5afcc067ae08f268ff2ffa963ac7faae3e..c92e05c3f028d7007ac027b32ee7d5ec9e10eec7
--- 1/src/fontset.c
--- 2/src/fontset.c
+++ b/src/fontset.c
@@@ -1,13 -1,11 +1,14 @@@
  /* Fontset handler.
-    Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+      Free Software Foundation, Inc.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006
+      2005, 2006, 2007
       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 b86c26784c74f63a112561d0f450b2afb3aea56a,a2bac100396ed69b8f2b34fc1855820e1b5dfd5e..506b34a4dc74651cfa019adc0ea592330448551d
--- 1/src/fontset.h
--- 2/src/fontset.h
+++ b/src/fontset.h
@@@ -1,13 -1,10 +1,13 @@@
  /* Header for fontset handler.
-    Copyright (C) 1998, 2002, 2003, 2004, 2005,
-                  2006 Free Software Foundation, Inc.
+    Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
+                  2006, 2007  Free Software Foundation, Inc.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006
+      2005, 2006, 2007
       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.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/fringe.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/insdel.c
Simple merge

diff --cc src/intervals.c
Simple merge

diff --cc src/intervals.h
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/macgui.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/makefile.w32-in
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/print.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/regex.c
Simple merge

diff --cc src/regex.h
Simple merge

diff --cc src/search.c
Simple merge

diff --cc src/syntax.c
Simple merge

diff --cc src/syntax.h
Simple merge

diff --cc src/term.c
Simple merge

diff --cc src/w16select.c
Simple merge

diff --cc src/w32bdf.c
Simple merge

diff --cc src/w32console.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32select.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/w32term.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge

diff --cc src/xrdb.c
Simple merge

diff --cc src/xterm.c
Simple merge

diff --cc src/xterm.h
Simple merge