From: Miles Bader Date: Sat, 16 Dec 2006 01:29:26 +0000 (+0000) Subject: Merge from emacs--devo--0 X-Git-Tag: emacs-pretest-23.0.90~8295^2~624 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4bc5d7668ef47295810f28a14d67b4a9e12a341f;p=emacs.git Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 545-562) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - erc-iswitchb: Temporarily enable iswitchb mode * gnus--rel--5.10 (patch 172-176) - Merge from emacs--devo--0 - Update from CVS - Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156 --- 4bc5d7668ef47295810f28a14d67b4a9e12a341f diff --cc leim/quail/latin-alt.el index 330c1b904b2,a764f416b43..d573d4a0e13 --- a/leim/quail/latin-alt.el +++ b/leim/quail/latin-alt.el @@@ -1,7 -1,7 +1,7 @@@ -;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: iso-2022-7bit;-*- +;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: utf-8;-*- ;; Copyright (C) 1997, 1998, 2001, 2002, 2006 Free Software Foundation, Inc. - ;; Copyright (C) 1999 + ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 @@@ -1289,14 -1289,14 +1289,14 @@@ Doubling the postfix separates the lett (quail-define-package "scandinavian-alt-postfix" "Latin-1" "SC<" t "Scandinavian input method with postfix modifiers - Supported languages are Swidish, Norwegian, Danish, and Finnish. + Supported languages are Swedish, Norwegian, Danish, and Finnish. -ae -> ,Af(B -oe -> ,Ax(B -aa -> ,Ae(B -a\" -> ,Ad(B -o\" -> ,Av(B -e' -> ,Ai(B +ae -> æ +oe -> ø +aa -> å +a\" -> ä +o\" -> ö +e' -> é Doubling the postfix separates the letter and postfix: aee -> ae o\"\" -> o\" etc. diff --cc leim/quail/latin-post.el index a3c7d9cb30e,090e2cc4330..7fdf3e7f980 --- a/leim/quail/latin-post.el +++ b/leim/quail/latin-post.el @@@ -1,14 -1,11 +1,14 @@@ -;;; latin-post.el --- Quail packages for inputting various European characters -*-coding: iso-2022-7bit;-*- +;;; latin-post.el --- Quail packages for inputting various European characters -*-coding: utf-8;-*- ;; Copyright (C) 1997, 1998, 2001, 2002, 2006 Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1999 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 -;; Keywords: multilingual, input method, latin +;; Keywords: multilingual, input method, latin, i18n ;; This file is part of GNU Emacs. diff --cc leim/quail/pypunct-b5.el index f8fc747ba03,a2e097902ef..8d57e42b141 --- a/leim/quail/pypunct-b5.el +++ b/leim/quail/pypunct-b5.el @@@ -1,6 -1,6 +1,6 @@@ -;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols) +;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols) -*-coding: iso-2022-7bit;-*- - ;; Copyright (C) 1997, 2000, 2003 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc leim/quail/symbol-ksc.el index 1747d40c109,62a24408efb..de7386aa2d0 --- a/leim/quail/symbol-ksc.el +++ b/leim/quail/symbol-ksc.el @@@ -1,7 -1,7 +1,7 @@@ -;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601) +;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601) -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 1997, 2005, 2006 Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc leim/quail/thai.el index f27aab7acb0,6354c9dfde4..6d7f16cae80 --- a/leim/quail/thai.el +++ b/leim/quail/thai.el @@@ -1,6 -1,7 +1,7 @@@ -;;; thai.el --- Quail package for inputting Thai characters +;;; thai.el --- Quail package for inputting Thai characters -*-coding: iso-2022-7bit;-*- - ;; Copyright (C) 1995, 1997, 1999, 2005 + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc leim/quail/tibetan.el index e3f9f3c8bfb,bad5dd58bcf..e710cada914 --- a/leim/quail/tibetan.el +++ b/leim/quail/tibetan.el @@@ -1,7 -1,7 +1,7 @@@ -;;; tibetan.el --- Quail package for inputting Tibetan characters +;;; tibetan.el --- Quail package for inputting Tibetan characters -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 1997, 2006 Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2000 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc leim/quail/uni-input.el index 73ba07ef566,1b4a3d3af1e..a5f32068424 --- a/leim/quail/uni-input.el +++ b/leim/quail/uni-input.el @@@ -1,7 -1,7 +1,7 @@@ ;;; uni-input.el --- Hex Unicode input method -;; Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc. - ;; Copyright (C) 2004 + ;; Copyright (C) 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc lisp/international/characters.el index eb2d099dd41,9f545b01231..e52df15a9b2 --- a/lisp/international/characters.el +++ b/lisp/international/characters.el @@@ -1,13 -1,11 +1,14 @@@ ;;; characters.el --- set syntax and category for multibyte characters - ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004 + ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: multibyte character, character set, syntax, category diff --cc lisp/international/codepage.el index 7aab9bd85a8,9c045545ea6..ca5500b5415 --- 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 + ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc lisp/international/encoded-kb.el index 2cbb76cb08d,348be8590c1..8456eb3c175 --- a/lisp/international/encoded-kb.el +++ b/lisp/international/encoded-kb.el @@@ -1,12 -1,11 +1,14 @@@ ;;; encoded-kb.el --- handler to input multibyte characters encoded somehow - ;; Copyright (C) 1997 Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2004, 2005 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; This file is part of GNU Emacs. diff --cc lisp/international/fontset.el index 9f09c615451,5374842b649..e62583bb2b7 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@@ -1,14 -1,13 +1,16 @@@ ;;; fontset.el --- commands for handling fontset - ;; Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003, 2006 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 -;; Keywords: mule, multilingual, fontset +;; Keywords: mule, i18n, fontset ;; This file is part of GNU Emacs. diff --cc lisp/international/mule-cmds.el index e0e7e8512c8,4b415baf5fa..fbdc0467f00 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@@ -1,15 -1,13 +1,16 @@@ ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*- - ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - ;; Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + ;; 2006 Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 -;; Keywords: mule, multilingual +;; Keywords: mule, i18n ;; This file is part of GNU Emacs. @@@ -2552,20 -2598,10 +2552,24 @@@ See also `locale-charset-language-names (not (coding-system-equal coding-system locale-coding-system))) (prefer-coding-system coding-system) + ;; Fixme: perhaps prefer-coding-system should set this too. + ;; But it's not the time to do such a fundamental change. + (setq default-sendmail-coding-system coding-system) - (setq locale-coding-system coding-system)))) + (setq locale-coding-system coding-system)) ++ + (when (get-language-info current-language-environment 'coding-priority) + (let ((codeset (locale-info 'codeset)) + (coding-system (car (coding-system-priority-list)))) + (when codeset + (let ((cs (coding-system-aliases coding-system)) + result) + (while (and cs (not result)) + (setq result + (locale-charset-match-p (symbol-name (pop cs)) + (locale-info 'codeset)))) + (unless result + (message "Warning: Default coding system `%s' disagrees with +system codeset `%s' for this locale." coding-system codeset)))))))) ;; On Windows, override locale-coding-system, ;; keyboard-coding-system with system codepage. Note: diff --cc lisp/international/mule-conf.el index 7c36215af85,2f88b08254f..e10f776b33a --- 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, 2005 - ;; Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, + ;; 2004, 2005, 2006 Free Software Foundation, Inc. + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 -;; Keywords: mule, multilingual, character set, coding system +;; Keywords: i18n, mule, multilingual, character set, coding system ;; This file is part of GNU Emacs. diff --cc lisp/international/mule-diag.el index d1cc9618175,95569a78240..a67b0213416 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@@ -1,13 -1,11 +1,14 @@@ ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule) - ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003 - ;; Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1999, 2000, 2001, 2002, 2003 + ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: multilingual, charset, coding system, fontset, diagnosis, i18n diff --cc lisp/international/mule-util.el index 6b4b9c712bd,d8b7aa903be..4d1ec5ec7f3 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el @@@ -1,13 -1,11 +1,14 @@@ ;;; mule-util.el --- utility functions for mulitilingual environment (mule) - ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 - ;; Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998, 1999, 2004 + ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: mule, multilingual diff --cc lisp/international/mule.el index 89f34d13620,ddaacfe7216..cf6a3b21244 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@@ -2,12 -2,10 +2,13 @@@ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: mule, multilingual, character set, coding system diff --cc lisp/international/titdic-cnv.el index 5727e484d73,68e4f6596f7..e07df7b925f --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@@ -1,12 -1,11 +1,14 @@@ ;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*- - ;; Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002 + ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: Quail, TIT, cxterm diff --cc lisp/language/china-util.el index d0abc35dbdc,bafdce1c854..ce417796bef --- a/lisp/language/china-util.el +++ b/lisp/language/china-util.el @@@ -1,13 -1,11 +1,14 @@@ ;;; china-util.el --- utilities for Chinese -*- coding: iso-2022-7bit -*- - ;; Copyright (C) 1995, 2001, 2003 + ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 2003 + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: mule, multilingual, Chinese diff --cc lisp/language/chinese.el index 302c5f21de1,ee1709fcc18..aaed3808a65 --- a/lisp/language/chinese.el +++ b/lisp/language/chinese.el @@@ -1,12 -1,11 +1,14 @@@ ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*- - ;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998 + ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: multilingual, Chinese diff --cc lisp/language/cyrillic.el index 3b35bb2c1a2,4e709cc5b63..110f07e14ea --- a/lisp/language/cyrillic.el +++ b/lisp/language/cyrillic.el @@@ -1,12 -1,11 +1,14 @@@ ;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*- - ;; Copyright (C) 1997, 1998, 2001, 2002, 2003 Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004 + ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Author: Kenichi Handa ;; Keywords: multilingual, Cyrillic, i18n diff --cc lisp/language/devan-util.el index d70a471a4f5,354d0c19a29..92453078306 --- 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 + ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2000 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc lisp/language/english.el index 01d8215e648,f3719fd9bbc..00eba111742 --- a/lisp/language/english.el +++ b/lisp/language/english.el @@@ -1,12 -1,10 +1,13 @@@ ;;; english.el --- support for English -*- no-byte-compile: t -*- - ;; Copyright (C) 1997 Free Software Foundation, Inc. - ;; Copyright (C) 1997 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: multibyte character, character set, syntax, category diff --cc lisp/language/ethio-util.el index ba4b22b1153,b22fad32854..93de5e74c4d --- 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 + ;; Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2001, 2004, 2005 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2005, 2006 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number: H15PRO110 ;; Keywords: mule, multilingual, Ethiopic diff --cc lisp/language/ethiopic.el index 49ce50d359a,29679a8ca73..3772dceae1e --- a/lisp/language/ethiopic.el +++ b/lisp/language/ethiopic.el @@@ -1,7 -1,9 +1,9 @@@ -;;; ethiopic.el --- support for Ethiopic -*- coding: iso-2022-7bit; -*- +;;; ethiopic.el --- support for Ethiopic -*- coding: utf-8-emacs; -*- - ;; Copyright (C) 1997 Free Software Foundation, Inc. - ;; Copyright (C) 1995, 2001, 2006 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc lisp/language/european.el index 497be4023b8,60401e56ab1..ecdca8b20f4 --- a/lisp/language/european.el +++ b/lisp/language/european.el @@@ -1,13 -1,11 +1,14 @@@ ;;; european.el --- support for European languages -*- coding: iso-2022-7bit; -*- - ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 + ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003 + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: multilingual, European diff --cc lisp/language/greek.el index 8e046af88b9,9eb7b4f7352..aca46aa6b24 --- a/lisp/language/greek.el +++ b/lisp/language/greek.el @@@ -1,13 -1,10 +1,15 @@@ ;;; greek.el --- support for Greek -*- no-byte-compile: t -*- +;; Copyright (C) 2002 Free Software Foundation, Inc. - ;; Copyright (C) 1995 + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 + +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 + ;; Keywords: multilingual, Greek ;; This file is part of GNU Emacs. diff --cc lisp/language/hebrew.el index 4944b7a0881,abd2f6612bf..f9c9aa68b7b --- a/lisp/language/hebrew.el +++ b/lisp/language/hebrew.el @@@ -1,13 -1,12 +1,16 @@@ ;;; hebrew.el --- support for Hebrew -*- coding: iso-2022-7bit; no-byte-compile: t -*- - ;; Copyright (C) 2001, 2002 Free Software Foundation, Inc. - ;; Copyright (C) 1995 + ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 + +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 + ;; Keywords: multilingual, Hebrew ;; This file is part of GNU Emacs. diff --cc lisp/language/japanese.el index dd1b5bec6ff,12a09423a32..590167ad560 --- a/lisp/language/japanese.el +++ b/lisp/language/japanese.el @@@ -1,12 -1,11 +1,14 @@@ ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; no-byte-compile: t -*- - ;; Copyright (C) 1997 Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: multilingual, Japanese diff --cc lisp/language/korean.el index c74b5f8212f,3e04c13b7d0..5a2ff9fdb19 --- a/lisp/language/korean.el +++ b/lisp/language/korean.el @@@ -1,12 -1,11 +1,14 @@@ ;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*- - ;; Copyright (C) 1998 Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1998 + ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: multilingual, Korean diff --cc lisp/language/lao-util.el index 718baa3fd82,60f15670525..dcbdf7eb4aa --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@@ -1,14 -1,12 +1,15 @@@ ;;; lao-util.el --- utilities for Lao -*- coding: iso-2022-7bit; -*- - ;; Copyright (C) 2001 Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2000 + ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 -;; Keywords: multilingual, Lao +;; Keywords: multilingual, Lao, i18n ;; This file is part of GNU Emacs. diff --cc lisp/language/lao.el index ec2ef61268c,b55c731801d..ed290d988ef --- 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, 2002 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: multilingual, Lao diff --cc lisp/language/romanian.el index 24d66bc32e3,50f0f4e7e82..79f8e7d87b8 --- a/lisp/language/romanian.el +++ b/lisp/language/romanian.el @@@ -1,9 -1,10 +1,10 @@@ ;;; romanian.el --- support for Romanian -*- coding: iso-latin-2; no-byte-compile: t -*- - ;; Copyright (C) 1998, 2002 Free Software Foundation. + ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation. ;; Author: Dan Nicolaescu -;; Keywords: multilingual, Romanian +;; Keywords: multilingual, Romanian, i18n ;; This file is part of GNU Emacs. diff --cc lisp/language/thai-util.el index 8bae6e1e8ee,d91cc56116e..8dcfca2c3db --- a/lisp/language/thai-util.el +++ b/lisp/language/thai-util.el @@@ -1,11 -1,13 +1,13 @@@ ;;; thai-util.el --- utilities for Thai -*- coding: iso-2022-7bit; -*- - ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2005 + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) -;; Registration Number H14PRO021 +;; Registration Number H13PRO009 - ;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. + ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. -;; Keywords: mule, multilingual, thai +;; Keywords: mule, multilingual, Thai, i18n ;; This file is part of GNU Emacs. diff --cc lisp/language/thai.el index 3a482865b40,65d5f7d1748..0c346c7594b --- a/lisp/language/thai.el +++ b/lisp/language/thai.el @@@ -1,14 -1,13 +1,16 @@@ ;;; thai.el --- support for Thai -*- coding: iso-2022-7bit; no-byte-compile: t -*- - ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2005 + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 +;; Copyright (C) 2005 +;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 - ;; Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. + ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, + ;; 2006 Free Software Foundation, Inc. -;; Keywords: multilingual, Thai +;; Keywords: multilingual, Thai, i18n ;; This file is part of GNU Emacs. diff --cc lisp/language/tibetan.el index ba7fb554bab,f4ebb391610..6256382d870 --- a/lisp/language/tibetan.el +++ b/lisp/language/tibetan.el @@@ -1,14 -1,12 +1,15 @@@ ;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*- - ;; Copyright (C) 1997, 2002 Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1999, 2000 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 -;; Keywords: multilingual, Tibetan +;; Keywords: multilingual, Tibetan, i18n ;; This file is part of GNU Emacs. diff --cc lisp/language/viet-util.el index 2e6fc76da23,0c4890cb9e4..17e6f576951 --- a/lisp/language/viet-util.el +++ b/lisp/language/viet-util.el @@@ -1,12 -1,11 +1,14 @@@ ;;; viet-util.el --- utilities for Vietnamese -*- coding: iso-2022-7bit; -*- - ;; Copyright (C) 1998 Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997 + ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 ;; Keywords: mule, multilingual, Vietnamese diff --cc lisp/language/vietnamese.el index 8b5c57a29dd,870dd474451..22141b6d0e3 --- a/lisp/language/vietnamese.el +++ b/lisp/language/vietnamese.el @@@ -1,14 -1,13 +1,16 @@@ ;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*- - ;; Copyright (C) 1998, 2002 Free Software Foundation, Inc. - ;; Copyright (C) 1995, 1997, 1998, 2000 + ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + ;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 -;; Keywords: multilingual, Vietnamese +;; Keywords: multilingual, Vietnamese, i18n ;; This file is part of GNU Emacs. diff --cc lisp/ps-bdf.el index 3e18586489b,eff8ff5eae2..a19c0f02651 --- a/lisp/ps-bdf.el +++ b/lisp/ps-bdf.el @@@ -1,14 -1,11 +1,15 @@@ ;;; ps-bdf.el --- BDF font file handler for ps-print - ;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2006 + ;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1998, 1999, 2001, 2003 + ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 + +;; Copyright (C) 2003 +;; National Institute of Advanced Industrial Science and Technology (AIST) +;; Registration Number H13PRO009 + ;; Keywords: wp, BDF, font, PostScript ;; Maintainer: Kenichi Handa diff --cc lisp/term/mac-win.el index 6569918603f,cba4985ccb3..c49c8893b21 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@@ -1,6 -1,6 +1,6 @@@ -;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*- +;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8 - ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, + ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Andrew Choi diff --cc src/category.c index cb6385fdb25,ce238f4d399..4d19d4a6ccd --- a/src/category.c +++ b/src/category.c @@@ -1,11 -1,9 +1,12 @@@ /* GNU Emacs routines to deal with category tables. Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 1999 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. diff --cc src/category.h index 4799b7a5e3d,e27f86f9a91..86257635226 --- a/src/category.h +++ b/src/category.h @@@ -1,10 -1,8 +1,11 @@@ /* Declarations having to do with Emacs category tables. - Copyright (C) 1995, 1998, 1999 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. diff --cc src/ccl.c index 1ff97229466,49cef07650b..017c9ab4feb --- a/src/ccl.c +++ b/src/ccl.c @@@ -1,12 -1,10 +1,13 @@@ /* CCL (Code Conversion Language) interpreter. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. diff --cc src/ccl.h index 96417e79fa5,1cfc8201e54..01d92b621eb --- a/src/ccl.h +++ b/src/ccl.h @@@ -1,10 -1,8 +1,11 @@@ /* Header for CCL (Code Conversion Language) interpreter. - Copyright (C) 1995, 1998, 2000 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. diff --cc src/charset.c index 2228a24f698,535022c6797..9fb7f641705 --- a/src/charset.c +++ b/src/charset.c @@@ -1,12 -1,10 +1,13 @@@ -/* Basic multilingual character support. +/* Basic character set support. Copyright (C) 2001, 2002, 2003, 2004, 2005, - 2006 Free Software Foundation, Inc. + 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003, 2004 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. diff --cc src/charset.h index 25ccaf9d324,645bdafe4b2..e7aaf9d6194 --- a/src/charset.h +++ b/src/charset.h @@@ -1,12 -1,10 +1,13 @@@ -/* Header for multibyte character handler. +/* Header for charset handler. Copyright (C) 2001, 2002, 2003, 2004, 2005, - 2006 Free Software Foundation, Inc. + 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 2003 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. diff --cc src/coding.c index 28ab86c43fc,535f80ab748..50c63b4beb8 --- a/src/coding.c +++ b/src/coding.c @@@ -1,12 -1,10 +1,13 @@@ -/* Coding system handler (conversion, detection, and etc). +/* Coding system handler (conversion, detection, etc). Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, 2005 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. diff --cc src/coding.h index 93375d2c2eb,ca7af1c8354..0f8d2b0ed7b --- a/src/coding.h +++ b/src/coding.h @@@ -1,12 -1,10 +1,13 @@@ /* Header for coding system handler. Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 2000 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. diff --cc src/composite.c index ea6b3708f12,8e5fce2da96..1ccd3af2515 --- 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 + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003, 2006 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. diff --cc src/composite.h index 08463afd899,e19fcd99e73..6e600e7a29b --- 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 + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003, 2006 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. diff --cc src/fontset.c index a52082e2ff4,838d9526944..5a50012fef4 --- a/src/fontset.c +++ b/src/fontset.c @@@ -1,12 -1,10 +1,13 @@@ /* Fontset handler. Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 2005 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 - + Copyright (C) 2003, 2006 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 + This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify diff --cc src/fontset.h index cf09dde73f2,a08f7b74bd0..b86c26784c7 --- a/src/fontset.h +++ b/src/fontset.h @@@ -1,12 -1,10 +1,13 @@@ /* Header for fontset handler. Copyright (C) 1998, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 2000 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 + Copyright (C) 2003, 2006 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs.