From: Miles Bader Date: Wed, 9 Jan 2008 01:21:15 +0000 (+0000) Subject: Merge from emacs--devo--0 X-Git-Tag: emacs-pretest-23.0.90~8295^2~45 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=430d2ee2919b2d4693780f2474ba40148442d206;p=emacs.git Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312 --- 430d2ee2919b2d4693780f2474ba40148442d206 diff --cc leim/quail/latin-alt.el index b0da98d6449,ad87be48424..b23c8828094 --- a/leim/quail/latin-alt.el +++ b/leim/quail/latin-alt.el @@@ -1,8 -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, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc leim/quail/latin-post.el index 9d7b8ee4d71,e461151659a..91c1a5042ca --- a/leim/quail/latin-post.el +++ b/leim/quail/latin-post.el @@@ -1,16 -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, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - ;; 2006, 2007 + ;; 2006, 2007, 2008 ;; 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 620486d8c3f,199e387b353..e58bfda353d --- a/leim/quail/latin-pre.el +++ b/leim/quail/latin-pre.el @@@ -1,10 -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, 2004, 2005, - ;; 2006, 2007 + ;; 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - ;; 2006, 2007 + ;; 2006, 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc leim/quail/pypunct-b5.el index 24f6c7ddc44,81ef67d266b..649599ef366 --- a/leim/quail/pypunct-b5.el +++ b/leim/quail/pypunct-b5.el @@@ -1,7 -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, 2007 + ;; 2006, 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc leim/quail/symbol-ksc.el index 5aa5f76fd97,4f62fe3a582..93f9af0164a --- a/leim/quail/symbol-ksc.el +++ b/leim/quail/symbol-ksc.el @@@ -1,9 -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, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - ;; 2006, 2007 + ;; 2006, 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc leim/quail/thai.el index 889cd12bf5f,5e86d920d5f..cd04336c9ec --- 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, 2007 + ;; 2005, 2006, 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc leim/quail/tibetan.el index e2fd156766a,e1c746fa344..9190ef7ca6c --- a/leim/quail/tibetan.el +++ b/leim/quail/tibetan.el @@@ -1,9 -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, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - ;; 2006, 2007 + ;; 2006, 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc lisp/Makefile.in index a221ccdf4a4,700245fad4e..8af24856d9a --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@@ -95,15 -93,19 +95,19 @@@ doit $(lisp)/cus-load.el: touch $@ - custom-deps: $(lisp)/subdirs.el $(lisp)/loaddefs.el $(lisp)/cus-load.el doit + # Note that custom-deps and finder-data depend on autoloads rather + # than on loaddefs.el, so that autoloads does not run in parallel with + # them under "make -j", because that could delete loaddefs.el from + # under their feet. + custom-deps: $(lisp)/subdirs.el autoloads $(lisp)/cus-load.el doit wd=$(lisp); $(setwins_almost); \ echo Directories: $$wins; \ - $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins + LC_ALL=C $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins - finder-data: $(lisp)/subdirs.el $(lisp)/loaddefs.el doit + finder-data: $(lisp)/subdirs.el autoloads doit wd=$(lisp); $(setwins_almost); \ echo Directories: $$wins; \ - $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins + LC_ALL=C $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins $(lisp)/loaddefs.el: echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@ diff --cc lisp/emacs-lisp/bytecomp.el index 82866a07ff7,5fafac0540f..f32671bc784 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@@ -1964,88 -1964,88 +1964,88 @@@ and will be removed soon. See (elisp)B (delete-char delta))))) (defun byte-compile-insert-header (filename inbuffer outbuffer) - (set-buffer inbuffer) - (let ((dynamic-docstrings byte-compile-dynamic-docstrings) - (dynamic byte-compile-dynamic)) - (set-buffer outbuffer) - (goto-char (point-min)) - ;; The magic number of .elc files is ";ELC", or 0x3B454C43. After - ;; that is the file-format version number (18, 19, 20, or 23) as a - ;; byte, followed by some nulls. The primary motivation for doing - ;; this is to get some binary characters up in the first line of - ;; the file so that `diff' will simply say "Binary files differ" - ;; instead of actually doing a diff of two .elc files. An extra - ;; benefit is that you can add this to /etc/magic: - - ;; 0 string ;ELC GNU Emacs Lisp compiled file, - ;; >4 byte x version %d - - (insert - ";ELC" - (if (byte-compile-version-cond byte-compile-compatibility) 18 23) - "\000\000\000\n" - ) - (insert ";;; Compiled by " - (or (and (boundp 'user-mail-address) user-mail-address) - (concat (user-login-name) "@" (system-name))) - " on " - (current-time-string) "\n;;; from file " filename "\n") - (insert ";;; in Emacs version " emacs-version "\n") - (insert ";;; " - (cond - ((eq byte-optimize 'source) "with source-level optimization only") - ((eq byte-optimize 'byte) "with byte-level optimization only") - (byte-optimize "with all optimizations") - (t "without optimization")) - (if (byte-compile-version-cond byte-compile-compatibility) - "; compiled with Emacs 18 compatibility.\n" - ".\n")) - (if dynamic - (insert ";;; Function definitions are lazy-loaded.\n")) - (if (not (byte-compile-version-cond byte-compile-compatibility)) - (let (intro-string minimum-version) - ;; Figure out which Emacs version to require, - ;; and what comment to use to explain why. - ;; Note that this fails to take account of whether - ;; the buffer contains multibyte characters. We may have to - ;; compensate at the end in byte-compile-fix-header. - (if dynamic-docstrings + (with-current-buffer inbuffer + (let ((dynamic-docstrings byte-compile-dynamic-docstrings) + (dynamic byte-compile-dynamic)) + (set-buffer outbuffer) + (goto-char (point-min)) + ;; The magic number of .elc files is ";ELC", or 0x3B454C43. After - ;; that is the file-format version number (18, 19 or 20) as a ++ ;; that is the file-format version number (18, 19, 20, or 23) as a + ;; byte, followed by some nulls. The primary motivation for doing + ;; this is to get some binary characters up in the first line of + ;; the file so that `diff' will simply say "Binary files differ" + ;; instead of actually doing a diff of two .elc files. An extra + ;; benefit is that you can add this to /etc/magic: + + ;; 0 string ;ELC GNU Emacs Lisp compiled file, + ;; >4 byte x version %d + + (insert + ";ELC" - (if (byte-compile-version-cond byte-compile-compatibility) 18 20) ++ (if (byte-compile-version-cond byte-compile-compatibility) 18 23) + "\000\000\000\n" + ) + (insert ";;; Compiled by " + (or (and (boundp 'user-mail-address) user-mail-address) + (concat (user-login-name) "@" (system-name))) + " on " + (current-time-string) "\n;;; from file " filename "\n") + (insert ";;; in Emacs version " emacs-version "\n") + (insert ";;; " + (cond + ((eq byte-optimize 'source) "with source-level optimization only") + ((eq byte-optimize 'byte) "with byte-level optimization only") + (byte-optimize "with all optimizations") + (t "without optimization")) + (if (byte-compile-version-cond byte-compile-compatibility) + "; compiled with Emacs 18 compatibility.\n" + ".\n")) + (if dynamic + (insert ";;; Function definitions are lazy-loaded.\n")) + (if (not (byte-compile-version-cond byte-compile-compatibility)) + (let (intro-string minimum-version) + ;; Figure out which Emacs version to require, + ;; and what comment to use to explain why. + ;; Note that this fails to take account of whether + ;; the buffer contains multibyte characters. We may have to + ;; compensate at the end in byte-compile-fix-header. + (if dynamic-docstrings - (setq intro-string - ";;; This file uses dynamic docstrings, first added in Emacs 19.29.\n" - minimum-version "19.29") (setq intro-string - ";;; This file uses opcodes which do not exist in Emacs 18.\n" - minimum-version "19")) - ;; Now insert the comment and the error check. - (insert - "\n" - intro-string - ;; Have to check if emacs-version is bound so that this works - ;; in files loaded early in loadup.el. - "(if (and (boundp 'emacs-version)\n" - ;; If there is a name at the end of emacs-version, - ;; don't try to check the version number. - "\t (< (aref emacs-version (1- (length emacs-version))) ?A)\n" - "\t (or (and (boundp 'epoch::version) epoch::version)\n" - (format "\t (string-lessp emacs-version \"%s\")))\n" - minimum-version) - " (error \"`" - ;; prin1-to-string is used to quote backslashes. - (substring (prin1-to-string (file-name-nondirectory filename)) - 1 -1) - (format "' was compiled for Emacs %s or later\"))\n\n" - minimum-version) - ;; Insert semicolons as ballast, so that byte-compile-fix-header - ;; can delete them so as to keep the buffer positions - ;; constant for the actual compiled code. - ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n\n")) - ;; Here if we want Emacs 18 compatibility. - (when dynamic-docstrings - (error "Version-18 compatibility doesn't support dynamic doc strings")) - (when byte-compile-dynamic - (error "Version-18 compatibility doesn't support dynamic byte code")) - (insert "(or (boundp 'current-load-list) (setq current-load-list nil))\n" + ";;; This file uses dynamic docstrings, first added in Emacs 19.29.\n" + minimum-version "19.29") + (setq intro-string + ";;; This file uses opcodes which do not exist in Emacs 18.\n" + minimum-version "19")) + ;; Now insert the comment and the error check. + (insert + "\n" + intro-string + ;; Have to check if emacs-version is bound so that this works + ;; in files loaded early in loadup.el. + "(if (and (boundp 'emacs-version)\n" + ;; If there is a name at the end of emacs-version, + ;; don't try to check the version number. + "\t (< (aref emacs-version (1- (length emacs-version))) ?A)\n" + "\t (or (and (boundp 'epoch::version) epoch::version)\n" + (format "\t (string-lessp emacs-version \"%s\")))\n" + minimum-version) + " (error \"`" + ;; prin1-to-string is used to quote backslashes. + (substring (prin1-to-string (file-name-nondirectory filename)) + 1 -1) + (format "' was compiled for Emacs %s or later\"))\n\n" + minimum-version) + ;; Insert semicolons as ballast, so that byte-compile-fix-header + ;; can delete them so as to keep the buffer positions + ;; constant for the actual compiled code. + ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n\n")) + ;; Here if we want Emacs 18 compatibility. + (when dynamic-docstrings + (error "Version-18 compatibility doesn't support dynamic doc strings")) + (when byte-compile-dynamic + (error "Version-18 compatibility doesn't support dynamic byte code")) + (insert "(or (boundp 'current-load-list) (setq current-load-list nil))\n" - "\n")))) + "\n"))))) (defun byte-compile-output-file-form (form) ;; writes the given form to the output buffer, being careful of docstrings diff --cc lisp/international/characters.el index 74cfb62061d,352ddbb027e..63b47eb617c --- 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, 2007 + ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 bb678428409,c2f738eabeb..63d670bb97c --- 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, 2007 + ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc lisp/international/encoded-kb.el index d482b465250,c1424bd702e..4ff634fc59e --- 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, 2007 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 dc8abf7ca49,330611c34e7..f5357c7f8e0 --- 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, 2007 Free Software Foundation, Inc. + ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 7372a5570b8,0d4486bcc06..d05971092ee --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@@ -1,16 -1,13 +1,16 @@@ ;;; mule-cmds.el --- commands for multilingual environment -*-coding: iso-2022-7bit -*- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - ;; 2006, 2007 Free Software Foundation, Inc. + ;; 2006, 2007, 2008 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 29b5496f1c9,ff3308b5468..1184612ed40 --- 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, 2007 Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; 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 f9bb0439897,3ddb0892f8a..844b9236cd1 --- 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, 2007 Free Software Foundation, Inc. + ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 7e22eabb67d,f260c567b73..30faf6c7a0c --- 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, 2007 Free Software Foundation, Inc. + ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 6b90aa8f840,2b1773cea7a..d94ba8b9a4f --- 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, 2007 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 9ed565eada7,68ea105a7cf..94cd89eddde --- 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, 2007 Free Software Foundation, Inc. + ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 4b4a20b20b4,6eaa3b5e76e..d46487c4b3a --- 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, 2007 + ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 d4010dbff97,cf23b01d36b..31f87622ea9 --- 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, 2007 + ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 d7e533c48b0,7cfcdbd9e5b..34b90f86c9d --- 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, 2007 + ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 3d2efce9224,3658e50d954..85cf1f9a673 --- a/lisp/language/devan-util.el +++ b/lisp/language/devan-util.el @@@ -1,8 -1,9 +1,9 @@@ -;;; 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, 2007 + ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + ;; 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc lisp/language/english.el index a77bdee4369,428d3560e2f..92291ce7aa4 --- a/lisp/language/english.el +++ b/lisp/language/english.el @@@ -1,13 -1,11 +1,14 @@@ ;;; english.el --- support for English -*- no-byte-compile: t -*- - ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + ;; 2006, 2007, 2008 ;; 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 a8b99884546,7b64d437ac3..a2187bdd669 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@@ -1,13 -1,11 +1,14 @@@ -;;; ethio-util.el --- utilities for Ethiopic -*- coding: iso-2022-7bit; -*- +;;; ethio-util.el --- utilities for Ethiopic -*- coding: utf-8; -*- - ;; Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + ;; 2006, 2007, 2008 ;; 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 0634169b6ef,ff9c8a5cac1..0cbb30fe911 --- 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, 2007 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc lisp/language/european.el index 287231db933,46d4b3542e0..da3ae2b44ef --- 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, 2007 - ;; Free Software Foundation, Inc. + ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + ;; 2008 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 6fa81c7251a,b9bf8e9c896..e193b955d0c --- 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, 2007 + ;; 2005, 2006, 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --cc lisp/language/japanese.el index 6e3680d6146,2999816b08f..b1281c94e90 --- 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, 2007 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 b59fb27f177,d665d419f29..c6971662b61 --- 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, 2007 + ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 6d3b985c0d3,d8f6de900c9..5fc12d8455c --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@@ -1,15 -1,13 +1,16 @@@ ;;; lao-util.el --- utilities for Lao -*- coding: iso-2022-7bit; -*- - ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + ;; 2007, 2008 ;; 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 546986a4722,d2ed0841d36..561884e91d0 --- a/lisp/language/lao.el +++ b/lisp/language/lao.el @@@ -1,12 -1,11 +1,14 @@@ ;;; 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, 2007 + ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + ;; Free Software Foundation, Inc. + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + ;; 2007, 2008 ;; 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 0c09b79afd4,3fda08ee42d..be5ce10ad08 --- 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, 2007 + ;; 2005, 2006, 2007, 2008 ;; National Institute of Advanced Industrial Science and Technology (AIST) - ;; Registration Number H13PRO009 - ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Registration Number H14PRO021 + ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; 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 7008cc9d380,dcbfa611e40..2ee1a8f8271 --- 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, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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, 2007 Free Software Foundation, Inc. + ;; 2006, 2007, 2008 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 bad81e4a69e,57614c09777..309ee9d0d3d --- a/lisp/language/tibetan.el +++ b/lisp/language/tibetan.el @@@ -1,15 -1,13 +1,16 @@@ ;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*- - ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. - ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + ;; 2006, 2007, 2008 ;; 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 18fa8ef5f3e,4dc9be45a2e..16341a9af2d --- 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, 2007 + ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 09b75c90c5c,c349da314dc..2049f030590 --- 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, 2007 + ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - ;; 2005, 2006, 2007 + ;; 2005, 2006, 2007, 2008 ;; 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 6be1f12d439,487332f6323..dd1800e714f --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@@ -1474,12 -1489,33 +1474,12 @@@ Please send all bug fixes and enhanceme (defconst ps-windows-system (memq system-type '(emx win32 w32 mswindows ms-dos windows-nt))) (defconst ps-lp-system - (memq system-type '(usg-unix-v dgux hpux irix))) + (memq system-type '(usg-unix-v hpux irix))) -(defun ps-xemacs-color-name (color) - (when (featurep 'xemacs) - (if (color-specifier-p color) - (color-name color) - color))) - -(defalias 'ps-frame-parameter - (if (fboundp 'frame-parameter) 'frame-parameter 'frame-property)) - -(defalias 'ps-mark-active-p - (if (featurep 'xemacs) - 'region-active-p ; XEmacs - (defvar mark-active) ; To shup up XEmacs's byte compiler. - (lambda () mark-active))) ; Emacs - -(defun ps-face-foreground-name (face) - (if (featurep 'xemacs) - (ps-xemacs-color-name (face-foreground face)) - (face-foreground face nil t))) +;; Load XEmacs/Emacs definitions +(eval-and-compile (require 'ps-def)) -(defun ps-face-background-name (face) - (if (featurep 'xemacs) - (ps-xemacs-color-name (face-background face)) - (face-background face nil t))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; User Variables: diff --cc lisp/term/mac-win.el index 641af430024,f3d3e737042..e9a06bbf00b --- 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, 2007 Free Software Foundation, Inc. + ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Andrew Choi ;; Keywords: terminals diff --cc lisp/version.el index 7d4c764f2d0,4b50a5e2b52..eb27e4339d6 --- a/lisp/version.el +++ b/lisp/version.el @@@ -27,10 -27,10 +27,10 @@@ ;;; Code: - (defconst emacs-copyright "Copyright (C) 2007 Free Software Foundation, Inc." + (defconst emacs-copyright "Copyright (C) 2008 Free Software Foundation, Inc." "Short copyright string for this version of Emacs.") -(defconst emacs-version "23.0.50" "\ +(defconst emacs-version "23.0.60" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version diff --cc make-dist index 08768e16beb,26fb5b31daf..9ab0388275f --- a/make-dist +++ b/make-dist @@@ -318,9 -323,11 +323,11 @@@ for subdir in lisp site-lisp leim/SKK-DIC leim/ja-dic leim/quail \ src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ - etc etc/e etc/gnus etc/nxml \ + etc etc/charsets etc/e etc/gnus etc/nxml \ etc/images etc/images/ezimage etc/images/gnus etc/images/gud \ - etc/images/icons etc/images/low-color etc/images/mail \ + etc/images/icons etc/images/icons/hicolor \ + etc/images/icons/hicolor/*x* etc/images/icons/hicolor/*x*/apps \ + etc/images/low-color etc/images/mail \ etc/images/smilies etc/images/smilies/grayscale \ etc/images/smilies/medium etc/images/tree-widget \ etc/images/tree-widget/default etc/images/tree-widget/folder \ diff --cc src/category.c index 708131d8e41,8305a36d911..9abe4208940 --- a/src/category.c +++ b/src/category.c @@@ -1,13 -1,10 +1,13 @@@ /* GNU Emacs routines to deal with category tables. - Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 + 2005, 2006, 2007, 2008 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 3687e06ce1f,8354327d23e..0e79a87e363 --- 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, 2007 + 2005, 2006, 2007, 2008 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 5e4a6632d1d,0b0439933f9..dbd04d5ba14 --- 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, 2007 Free Software Foundation, Inc. + 2006, 2007, 2008 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 + 2005, 2006, 2007, 2008 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 d76038c857d,5c1f90eeec8..3afb135fb56 --- 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, 2007 + 2005, 2006, 2007, 2008 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 9ed6a733223,d7bb13abc39..5fc2e142068 --- a/src/charset.c +++ b/src/charset.c @@@ -1,8 -1,8 +1,8 @@@ -/* Basic multilingual character support. +/* Basic character set support. Copyright (C) 2001, 2002, 2003, 2004, 2005, - 2006, 2007 Free Software Foundation, Inc. + 2006, 2007, 2008 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 + 2005, 2006, 2007, 2008 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --cc src/charset.h index 6d34a5feea3,de7a16a01c7..3d31d903100 --- a/src/charset.h +++ b/src/charset.h @@@ -1,8 -1,8 +1,8 @@@ -/* Header for multibyte character handler. +/* Header for charset handler. Copyright (C) 2001, 2002, 2003, 2004, 2005, - 2006, 2007 Free Software Foundation, Inc. + 2006, 2007, 2008 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 + 2005, 2006, 2007, 2008 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --cc src/coding.c index bca75754156,0e8a75647a2..3e2a8664831 --- 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, 2007 Free Software Foundation, Inc. + 2006, 2007, 2008 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 + 2005, 2006, 2007, 2008 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 ef464caeadc,a08bbb8d966..34196082afb --- a/src/coding.h +++ b/src/coding.h @@@ -1,13 -1,10 +1,13 @@@ /* Header for coding system handler. Copyright (C) 2001, 2002, 2003, 2004, 2005, - 2006, 2007 Free Software Foundation, Inc. + 2006, 2007, 2008 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 + 2005, 2006, 2007, 2008 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 921640c2eb1,12830b4f841..d3ca16c6bdb --- 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, 2007 Free Software Foundation, Inc. - Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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 eb60f1d2ecd,c770fbebe92..786b4a348b1 --- 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, 2007 Free Software Foundation, Inc. - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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 085aadb1f0d,dc16b7a3975..dac169971d1 --- a/src/fontset.c +++ b/src/fontset.c @@@ -1,14 -1,11 +1,14 @@@ /* Fontset handler. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 + 2005, 2006, 2007, 2008 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 353f01b27b0,91e4fec2dbc..c850ca3c9d8 --- a/src/fontset.h +++ b/src/fontset.h @@@ -1,13 -1,10 +1,13 @@@ /* Header for fontset handler. Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, - 2006, 2007 Free Software Foundation, Inc. + 2006, 2007, 2008 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 + 2005, 2006, 2007, 2008 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.