From: Miles Bader Date: Fri, 26 Jan 2007 06:16:11 +0000 (+0000) Subject: Merge from emacs--devo--0 X-Git-Tag: emacs-pretest-23.0.90~8295^2~616 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/c0466914ba3ad88c402b0301646b4b5db8aeb913 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 --- c0466914ba3ad88c402b0301646b4b5db8aeb913 diff --cc leim/CXTERM-DIC/4Corner.tit index 8b52b531d6,18417a0dab..c73d9e389e --- a/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 5b135288de,3f64c408cb..cca16b62d0 --- a/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 5ef45b8546,22039a06d0..ae330dbc90 --- a/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 eb5a558bfb,3492ae9531..9b18b52486 --- a/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 b591f1326a,cad66ffe47..06c6770807 --- a/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 0000000000,43f397dff3..bda7055a2b mode 000000,100644..100644 --- a/leim/CXTERM-DIC/README +++ b/leim/CXTERM-DIC/README @@@ -1,0 -1,58 +1,58 @@@ + 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 -contains a license notice. ++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 -themselves don't contain license notices, the section 6 of the file ++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 -contains a license notice. ++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 license ++ftp://ftp.ifcss.org/pub/software/. Each file contains a copyright + notice. diff --cc leim/CXTERM-DIC/SW.tit index fed48d62e6,a0a5a44232..b32c73762d --- a/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 a93bf9dcb6,501ebfd52d..46b8df61bb --- a/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 0000000000,a8d7c0578a..fbc061801a mode 000000,100644..100644 --- a/leim/MISC-DIC/README +++ b/leim/MISC-DIC/README @@@ -1,0 -1,46 +1,46 @@@ + 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 -Wittern himself. Each file contains a license notice. ++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 - Each file contains a license ++ 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 license notices, the -copyright/license notice of the package itself should cover them. ++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/quail/latin-alt.el index d573d4a0e1,54160808cc..d913e80856 --- a/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 7fdf3e7f98,5140348e7c..1d958183d2 --- a/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 be2a1b2174,76c2bc7937..c3298be5bc --- a/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 8d57e42b14,9aa7257b82..bb206525ab --- a/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 de7386aa2d,ebaeff3716..aa6f7e98c2 --- a/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 6d7f16cae8,2d25a93542..fded06ffb5 --- a/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 e710cada91,97bab8d93d..04bade325c --- a/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 lisp/international/characters.el index e52df15a9b,acc1458ac9..a75fe28a08 --- a/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 ca5500b541,ff30e4c14c..4c3f76d470 --- a/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 8456eb3c17,6d89b73066..5f61c7ca65 --- a/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 e62583bb2b,81665ffd1c..2913a10dcd --- a/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/mule-cmds.el index 6c7500ce95,eff277887d..f45c41f46b --- a/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 e10f776b33,05f259b038..bf224c9d81 --- a/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 a67b021341,80bfd2dbfa..286a6410fd --- a/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 4d1ec5ec7f,78ef30a56d..10b9426aee --- a/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 cf6a3b2124,25b53027f9..9689725f31 --- a/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/titdic-cnv.el index e07df7b925,9577ccf50a..4f982d1403 --- a/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/language/china-util.el index ce417796be,49041e611a..407832347d --- a/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 aaed3808a6,9d2297cb7a..fdb4dae710 --- a/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/cyrillic.el index 110f07e14e,656f6b6009..5ecfe5cf4e --- a/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 ;; Keywords: multilingual, Cyrillic, i18n diff --cc lisp/language/devan-util.el index 9245307830,b25e90cebe..b236a95e3b --- a/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/english.el index 00eba11174,d12ed65018..852c0c65bb --- a/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 93de5e74c4,857df13867..6354a41b93 --- a/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 3772dceae1,1ae1f461f2..5417adb275 --- a/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 ecdca8b20f,ccbbf8318c..b7532eb1a4 --- a/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/greek.el index aca46aa6b2,c391319b88..1ece8c0fd6 --- a/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/japanese.el index 590167ad56,b9b0eeb2a1..eea0e5eb4d --- a/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/korean.el index 5a2ff9fdb1,3cf291eb58..d6eca4a5c5 --- a/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 dcbdf7eb4a,cbb2f09a35..359f4f8772 --- a/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 ed290d988e,e4158f682a..1f5a994575 --- a/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/thai-util.el index 8dcfca2c3d,3ce0ef696d..4493ea5187 --- a/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 0c346c7594,67d8734c48..facdbba50d --- a/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/tibetan.el index 6256382d87,94dc50bc15..2e020d24fd --- a/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/viet-util.el index 17e6f57695,2a1cc0fd67..3ea53621c9 --- a/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 22141b6d0e,191637fb1a..75f84ca55e --- a/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/ps-print.el index e50342dac9,2484bd677c..dfdfb2c52b --- a/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/term/mac-win.el index b7a4d3a2f9,be4c978dd2..09e1c77353 --- a/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 ;; Keywords: terminals diff --cc src/category.c index 4d19d4a6cc,809e326cbe..218d5f7f78 --- a/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 8625763522,858a94a622..3ce03a83de --- a/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 017c9ab4fe,ded74fb629..c13f7c863b --- a/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 01d92b621e,af3a92d328..e1c14e7175 --- a/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 9fb7f64170,0d91606da5..d5b15092b7 --- a/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 e7aaf9d619,2d0116d263..8c76aa0607 --- a/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/coding.c index 50c63b4beb,6bb9f8225c..aa58884fde --- a/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 0f8d2b0ed7,b4e2668622..f33e833575 --- a/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 1ccd3af251,3e0606e900..d44acf2472 --- a/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 6e600e7a29,8ff6416990..5106fcc990 --- a/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/fontset.c index 5a50012fef,2df60a5afc..c92e05c3f0 --- a/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 b86c26784c,a2bac10039..506b34a4dc --- a/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.