Merge from emacs--devo--0

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

diff --cc admin/README
Simple merge

diff --cc configure.in
Simple merge

diff --cc etc/HELLO
Simple merge

diff --cc etc/MORE.STUFF
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc etc/TODO
Simple merge

diff --cc leim/Makefile.in
Simple merge

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

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

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

diff --cc leim/quail/latin-alt.el
index b0da98d6449eeacc7c2dbdd32ff5f2b712db4af4,ad87be48424474dabadce2069eb0670b42487de9..b23c88280941d3a1963651eafa0219f62a353daa
--- 1/leim/quail/latin-alt.el
--- 2/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 9d7b8ee4d7148296910d3c8fe71769850855e155,e461151659a6ec0324887d1907376301d22b19f0..91c1a5042ca7d43da63b21093c07ff5df57bd9ee
--- 1/leim/quail/latin-post.el
--- 2/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 620486d8c3f2ddc9dede7c5d480f41d569edd6ae,199e387b353f6b21b9cf0381e488f2ffb0c0e3d4..e58bfda353dc5b744b64e30cdb8f5356c73e2e43
--- 1/leim/quail/latin-pre.el
--- 2/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 24f6c7ddc447a8278f69a75b6cf7e1b0474359df,81ef67d266ba390556d969022581115f837d9faf..649599ef366ab467fd9d91bc29b061c3b8228523
--- 1/leim/quail/pypunct-b5.el
--- 2/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 5aa5f76fd979f599ce949d5cc162217f25b7a5bc,4f62fe3a582db1fc6f6c431b5207fd91a94d9557..93f9af0164afa696c876d74496103999a7cb9908
--- 1/leim/quail/symbol-ksc.el
--- 2/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 889cd12bf5f4179f0e5ff6b5011314d6ee51fc29,5e86d920d5f3d2868bb8410fda2219e035dd4b94..cd04336c9ec752ec59eb4e8160b7b2646b12f6c0
--- 1/leim/quail/thai.el
--- 2/leim/quail/thai.el
+++ b/leim/quail/thai.el
@@@ -1,7 -1,7 +1,7 @@@
 -;;; thai.el --- Quail package for inputting Thai characters
 +;;; thai.el --- Quail package for inputting Thai characters -*-coding: iso-2022-7bit;-*-
  
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006, 2007
+ ;;   2005, 2006, 2007, 2008
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

diff --cc leim/quail/tibetan.el
index e2fd156766af234e3e44f10695978a0d8f46bbc4,e1c746fa344e51d57906de7fbfd37c63d266f1cd..9190ef7ca6c8511d2ce3b45afc2f2be879c59836
--- 1/leim/quail/tibetan.el
--- 2/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 leim/quail/uni-input.el
Simple merge

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

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

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/Makefile.in
index a221ccdf4a48287b36b85eb743cbc81ce588f152,700245fad4e0010cf5361991dcce8bc165c6d492..8af24856d9ab18cdaa6c9e3a5aaee8c4da035f0c
--- 1/lisp/Makefile.in
--- 2/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/arc-mode.el
Simple merge

diff --cc lisp/bindings.el
Simple merge

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

diff --cc lisp/composite.el
Simple merge

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

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

diff --cc lisp/desktop.el
Simple merge

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

diff --cc lisp/dnd.el
Simple merge

diff --cc lisp/edmacro.el
Simple merge

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

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

diff --cc lisp/emacs-lisp/bytecomp.el
index 82866a07ff7de4c9dce1c0c2c87bfcb6b51604b8,5fafac0540f3f01093f12614eae0491ae0ace35a..f32671bc784b694403fa1f511a5fdc57819ea65c
--- 1/lisp/emacs-lisp/bytecomp.el
--- 2/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/emacs-lisp/cl-macs.el
Simple merge

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

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

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

diff --cc lisp/emulation/keypad.el
Simple merge

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

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

diff --cc lisp/faces.el
Simple merge

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

diff --cc lisp/format.el
Simple merge

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

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

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

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

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

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

diff --cc lisp/info.el
Simple merge

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

diff --cc lisp/international/characters.el
index 74cfb62061d847143e6afcd0420ecae25d8ff3e6,352ddbb027e6c7876b50201ff8b06622ba2dd937..63b47eb617ced4df256b0bad45e2e4b1799dc804
--- 1/lisp/international/characters.el
--- 2/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; characters.el --- set syntax and category for multibyte characters
  
- ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 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 bb67842840970566a4471b964be3c2589a7c95a8,c2f738eabeb7b60ccc2bed5a198623137804c54e..63d670bb97cf6e036d30b171f52f276528ff8c75
--- 1/lisp/international/codepage.el
--- 2/lisp/international/codepage.el
+++ b/lisp/international/codepage.el
@@@ -1,7 -1,7 +1,7 @@@
  ;;; codepage.el --- MS-DOS/MS-Windows specific coding systems
  
 -;; Copyright (C) 1998, 1999, 2000, 2002  Free Software Foundation, Inc.
 +;; Copyright (C) 1998, 1999, 2000, 2002, 2005  Free Software Foundation, Inc.
- ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 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 d482b46525082e1c8a96d07cd03c17b627b47b03,c1424bd702e804bba531b7bec58266b637b6c36a..4ff634fc59e15556d2490c369b581a897d96170a
--- 1/lisp/international/encoded-kb.el
--- 2/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; encoded-kb.el --- handler to input multibyte characters encoded somehow
  
- ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 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 dc8abf7ca4960059b6d35274f98c69a80e62bdf6,330611c34e7caf2d3790eb1053382f87825b1e30..f5357c7f8e011afe3da4528fa77cf3f4fd6b4f46
--- 1/lisp/international/fontset.el
--- 2/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@@ -1,16 -1,13 +1,16 @@@
  ;;; fontset.el --- commands for handling fontset
  
  ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006, 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/ja-dic-cnv.el
Simple merge

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

diff --cc lisp/international/mule-cmds.el
index 7372a5570b89a43835c8b125cab36970a8f7fc70,0d4486bcc06eaef82a9784db0befb88d9ed00f7a..d05971092ee81c20d8e901946e3067f2efe13d98
--- 1/lisp/international/mule-cmds.el
--- 2/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@@ -1,16 -1,13 +1,16 @@@
  ;;; mule-cmds.el --- commands for 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 29b5496f1c990a9cc4fe1c86f13feb508905a14f,ff3308b5468d21a0e22b4be1c8a3999c6f538aaf..1184612ed40fa5a117d7847ea4c17e011c350a44
--- 1/lisp/international/mule-conf.el
--- 2/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@@ -1,15 -1,12 +1,15 @@@
 -;;; mule-conf.el --- configure multilingual environment -*- no-byte-compile: t -*-
 +;;; mule-conf.el --- configure multilingual environment
  
  ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- ;;   2004, 2005, 2006, 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 f9bb043989736a68dd85b1696480c42566b55ba2,3ddb0892f8a0205b529f1c020fb587530dfc12cb..844b9236cd157b9d7e9aa1c41b504188c68695f2
--- 1/lisp/international/mule-diag.el
--- 2/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule)
  
  ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006, 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 7e22eabb67df3685665cb23a0767000db730bfe1,f260c567b7334484225f5f22bbdd9c61a31e3734..30faf6c7a0cf99d010c93e4b4d80e3b3a04855a0
--- 1/lisp/international/mule-util.el
--- 2/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; mule-util.el --- utility functions for mulitilingual environment (mule)
  
  ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006, 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 6b90aa8f84030b548fab136fb21d97f9410682bf,2b1773cea7aad1fafa1793ddf67169bcd7a0d2dc..d94ba8b9a4f84ca8810a1e5c713eed7085d24ae1
--- 1/lisp/international/mule.el
--- 2/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@@ -1,14 -1,11 +1,14 @@@
 -;;; mule.el --- basic commands for mulitilingual environment
 +;;; mule.el --- basic commands for multilingual environment
  
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 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/quail.el
Simple merge

diff --cc lisp/international/titdic-cnv.el
index 9ed565eada73c22e6cc0c662b0cca41062f6aae0,68ea105a7cf1c17af54e7e9a5219e0ec41b1eead..94cd89eddde6cc0c9cd3f3fad7b58209c35dd20f
--- 1/lisp/international/titdic-cnv.el
--- 2/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*-
  
  ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006, 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/international/utf-7.el
Simple merge

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/language/china-util.el
index 4b4a20b20b4ee9f2285e524168744f3308cd7ccf,6eaa3b5e76eb0802c3f050ec84510fbe6fae6d3c..d46487c4b3ad1d8d5465400582854ba8cb61024f
--- 1/lisp/language/china-util.el
--- 2/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; china-util.el --- utilities for Chinese  -*- coding: iso-2022-7bit -*-
  
- ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 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 d4010dbff97102f3468e0b261055a03d5f54fb9b,cf23b01d36b4735101b52b9c252b44b84a49518a..31f87622ea913e33e6bf18a386d3e59f03f10d15
--- 1/lisp/language/chinese.el
--- 2/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 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/cyril-util.el
Simple merge

diff --cc lisp/language/cyrillic.el
index d7e533c48b060dc23a4191f5768830893e9c4252,7cfcdbd9e5b681f864d78a9fd580d7950e79e46d..34b90f86c9d4aee9e9f080398de51a87f612f236
--- 1/lisp/language/cyrillic.el
--- 2/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 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 <handa@etl.go.jp>
  ;; Keywords: multilingual, Cyrillic, i18n

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

diff --cc lisp/language/devan-util.el
index 3d2efce922488beb2a9ddf0200eaef427602e65c,3658e50d954687eae6ac730ae367ddc87ef90127..85cf1f9a67394409c0e21ac5f7f9baf83ce653e0
--- 1/lisp/language/devan-util.el
--- 2/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/devanagari.el
Simple merge

diff --cc lisp/language/english.el
index a77bdee436911f026e25229d26f9c726d4dee6ba,428d3560e2fd2a0c6503bf82f08caa5edbf490c4..92291ce7aa46002b29647681e82c2e672b7d8d20
--- 1/lisp/language/english.el
--- 2/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 a8b99884546aaf5a3458d4ae961ba5942b3f429d,7b64d437ac302b891889abf8ff10388f0a2e092e..a2187bdd669aa438c602d23fb8e604ea5f9ea588
--- 1/lisp/language/ethio-util.el
--- 2/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 0634169b6efaddee32bea00191e5c44379f037bc,ff9c8a5cac1b5ccea1395eb29876da55da4da2e4..0cbb30fe91179425e8e9dd8cf9e5adb987157973
--- 1/lisp/language/ethiopic.el
--- 2/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@@ -1,9 -1,9 +1,9 @@@
 -;;; ethiopic.el --- support for Ethiopic -*- coding: iso-2022-7bit; -*-
 +;;; ethiopic.el --- support for Ethiopic      -*- coding: utf-8-emacs; -*-
  
- ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 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 287231db9335108d4a7eb71de4c3d1c54f2ea4fe,46d4b3542e0a450fc1e1dffdeee8966072d9c3cd..da3ae2b44ef0f0ca953f9d483c0417d919798007
--- 1/lisp/language/european.el
--- 2/lisp/language/european.el
+++ b/lisp/language/european.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; european.el --- support for European languages -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 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/georgian.el
Simple merge

diff --cc lisp/language/greek.el
index 6fa81c7251ab948edfdc2419dfcb90967c7d3de0,b9bf8e9c8969eb50ba9d5c5dbb04247b6be874b9..e193b955d0c742856c6652032899901c85d9e787
--- 1/lisp/language/greek.el
--- 2/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@@ -1,8 -1,7 +1,8 @@@
  ;;; greek.el --- support for Greek -*- no-byte-compile: t -*-
  
 +;; Copyright (C) 2002 Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006, 2007
+ ;;   2005, 2006, 2007, 2008
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  

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

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

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

diff --cc lisp/language/japanese.el
index 6e3680d614631cad9d6e89178963b8e803e2e05f,2999816b08f60b5374c8c8bdafe41f4022b18fd4..b1281c94e906bd6dc481aa4f26550b03c198c588
--- 1/lisp/language/japanese.el
--- 2/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
- ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 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/kannada.el
Simple merge

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

diff --cc lisp/language/korean.el
index b59fb27f177706c7cc5b514d97bba1d107a4335d,d665d419f294b2080762ef81066de2d82f41ecc7..c6971662b6120abc0b845c163dec57383b175476
--- 1/lisp/language/korean.el
--- 2/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
- ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 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 6d3b985c0d323b8b98e4daa3c39b2e2102d699cd,d8f6de900c9fd689cef3879d75764872ff5be00c..5fc12d8455c1fd49e25e500503d45269eb2717ec
--- 1/lisp/language/lao-util.el
--- 2/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 546986a472269aaba2bfd2adf87bfbaad2f0c2c5,d2ed0841d363531e43a5e0d7e96acbe6be9d10d2..561884e91d0131d28dedee22c0267509d6da7079
--- 1/lisp/language/lao.el
--- 2/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/malayalam.el
Simple merge

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

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

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

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

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

diff --cc lisp/language/thai-util.el
index 0c09b79afd408535772ceaca18b0550cdba11603,3fda08ee42dd48f0d6b76e1ba552abde618f90a4..be5ce10ad08393cce58674d053dfd9a38b85617c
--- 1/lisp/language/thai-util.el
--- 2/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@@ -1,13 -1,13 +1,13 @@@
  ;;; thai-util.el --- utilities for Thai -*- coding: iso-2022-7bit; -*-
  
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006, 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 7008cc9d380197674931e29f222e564ed9e697c3,dcbfa611e4067342d0935eef7412bebb96a72056..2ee1a8f8271f1cd8bbbd2bcda16c292fc4ff97dd
--- 1/lisp/language/thai.el
--- 2/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@@ -1,16 -1,13 +1,16 @@@
  ;;; thai.el --- support for Thai -*- coding: iso-2022-7bit; no-byte-compile: t -*-
  
  ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- ;;   2005, 2006, 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/tibet-util.el
Simple merge

diff --cc lisp/language/tibetan.el
index bad81e4a69eebb04e10aed4dd2a267ff6ad42725,57614c09777ca2097afebb69998afd90974b6126..309ee9d0d3d9e5b8c7993c62250fffe4e95397ad
--- 1/lisp/language/tibetan.el
--- 2/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/tml-util.el
Simple merge

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

diff --cc lisp/language/viet-util.el
index 18fa8ef5f3eb20651841976b677020e9a8d10650,4dc9be45a2e77466572e2f9ad719ef9a52a49d51..16341a9af2d76c8be0b1435c0fff514742a7d05f
--- 1/lisp/language/viet-util.el
--- 2/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@@ -1,14 -1,11 +1,14 @@@
  ;;; viet-util.el --- utilities for Vietnamese  -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 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 09b75c90c5c67d21bb66cb7b26e44470d07f8479,c349da314dcd61d04e2527969eac1fc777b529a3..2049f03059095f3644c055a66d783bff2abf17ab
--- 1/lisp/language/vietnamese.el
--- 2/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@@ -1,16 -1,13 +1,16 @@@
  ;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*-
  
- ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 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/loadup.el
Simple merge

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

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

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

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

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

diff --cc lisp/play/gamegrid.el
Simple merge

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

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

diff --cc lisp/ps-bdf.el
Simple merge

diff --cc lisp/ps-mule.el
Simple merge

diff --cc lisp/ps-print.el
index 6be1f12d43908591366297758f4a9f0f28c91dac,487332f63230ccbe9bd7b28a843e2537e50bed56..dd1800e714f1c42ce97163988be6970908540158
--- 1/lisp/ps-print.el
--- 2/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/ruler-mode.el
Simple merge

diff --cc lisp/select.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/skeleton.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

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

diff --cc lisp/term.el
Simple merge

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

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

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

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

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

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

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

diff --cc lisp/version.el
index 7d4c764f2d0b66ebc2e11cf479d4251f6011dc51,4b50a5e2b526d16295a74c8964957853f805ee94..eb27e4339d6d2f92166712ad3de27ccd7232d53d
--- 1/lisp/version.el
--- 2/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 lisp/w32-fns.el
Simple merge

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

diff --cc make-dist
index 08768e16bebd42b6a309d03ddf093c789d18bb27,26fb5b31dafc70fcee28f6cca8ba37400a63e856..9ab0388275fdd21c77bf17ba8c72c996de9059a7
--- 1/make-dist
--- 2/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 nt/configure.bat
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/bytecode.c
Simple merge

diff --cc src/callproc.c
Simple merge

diff --cc src/casefiddle.c
Simple merge

diff --cc src/casetab.c
Simple merge

diff --cc src/category.c
index 708131d8e410a9feb5089446ceaeaf303d1a23a0,8305a36d9119c99bf4fdd26bed278014fbd1311b..9abe42089402dab7265c0456bcd56d8f44f614b2
--- 1/src/category.c
--- 2/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 3687e06ce1f2b8cb75750d7a93c9df2b32acf7c5,8354327d23e3f6ad18f47c91da9606c5bb5f6783..0e79a87e363e50c432160862a11bc09ee855eebe
--- 1/src/category.h
--- 2/src/category.h
+++ b/src/category.h
@@@ -1,11 -1,8 +1,11 @@@
  /* Declarations having to do with Emacs category tables.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 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 5e4a6632d1dd005811b8cb56c7431a589d3fc39c,0b0439933f98c175474292a0468748bc9568620e..dbd04d5ba1452f6090030fcbf09902104fbaf00e
--- 1/src/ccl.c
--- 2/src/ccl.c
+++ b/src/ccl.c
@@@ -1,13 -1,10 +1,13 @@@
  /* CCL (Code Conversion Language) interpreter.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                  2006, 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 d76038c857d8f436b99cafe9e443a5120e0244bb,5c1f90eeec8bfa0d79e02d8e26876135a7512abe..3afb135fb56f37a36d22c0a249a8dbd8329fb964
--- 1/src/ccl.h
--- 2/src/ccl.h
+++ b/src/ccl.h
@@@ -1,11 -1,8 +1,11 @@@
  /* Header for CCL (Code Conversion Language) interpreter.
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 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 9ed6a7332238702a666441840154fa5cee3f2761,d7bb13abc399af140914f6c4dccd023e2ae21ee2..5fc2e142068b4604609ec13d0eb0231b13df3382
--- 1/src/charset.c
--- 2/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 6d34a5feea3d78038019223857d003e55a407e15,de7a16a01c72d4f5332e59dbb896d178ba857e96..3d31d903100a8d54940faab3aa7a0653d0927368
--- 1/src/charset.h
--- 2/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/cmds.c
Simple merge

diff --cc src/coding.c
index bca75754156775cdf8c6d34f4d383c07e3412e1b,0e8a75647a20c55b682a859df209e5fc512c28ac..3e2a8664831946b1049da179335f937c2b5f40f0
--- 1/src/coding.c
--- 2/src/coding.c
+++ b/src/coding.c
@@@ -1,13 -1,10 +1,13 @@@
 -/* Coding system handler (conversion, detection, and etc).
 +/* Coding system handler (conversion, detection, etc).
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                  2006, 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 ef464caeadc9e7a7572acb983573e67972cf64ec,a08bbb8d9668eaaa1c4cb9c39f996625b46474c1..34196082afb584cc6d0da157bad10a15b71700c0
--- 1/src/coding.h
--- 2/src/coding.h
+++ b/src/coding.h
@@@ -1,13 -1,10 +1,13 @@@
  /* Header for coding system handler.
     Copyright (C) 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 921640c2eb1109be43a44c3b0d5754a64889961f,12830b4f841fce2dc5bce09e819e7608614add29..d3ca16c6bdbef46a48ba05e8543ce006fbd17056
--- 1/src/composite.c
--- 2/src/composite.c
+++ b/src/composite.c
@@@ -1,12 -1,9 +1,12 @@@
  /* Composite sequence support.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                  2006, 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 eb60f1d2ecd411398c18912b962ae04dcd40ac78,c770fbebe92229f19269c1a2a1f6ae0ccef2c811..786b4a348b1e518e5efd622993218b6f643c1fd3
--- 1/src/composite.h
--- 2/src/composite.h
+++ b/src/composite.h
@@@ -1,12 -1,9 +1,12 @@@
  /* Header for composite sequence handler.
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                  2006, 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/config.in
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/dired.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/disptab.h
Simple merge

diff --cc src/doc.c
Simple merge

diff --cc src/doprnt.c
Simple merge

diff --cc src/dosfns.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/filelock.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/fontset.c
index 085aadb1f0d5700ce18e635caebc3fb236ebe0ee,dc16b7a3975d5ca701fed96b66934de126ececb4..dac169971d1418001c826e8234e52ee331685d45
--- 1/src/fontset.c
--- 2/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 353f01b27b06aa6227335e1b95b3f6e78c97c33e,91e4fec2dbc41d976e33edb275a4f5a44bbe85b8..c850ca3c9d8c8a979475984085ec33f1539726bd
--- 1/src/fontset.h
--- 2/src/fontset.h
+++ b/src/fontset.h
@@@ -1,13 -1,10 +1,13 @@@
  /* Header for fontset handler.
     Copyright (C) 1998, 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.
  

diff --cc src/frame.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/fringe.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/insdel.c
Simple merge

diff --cc src/intervals.c
Simple merge

diff --cc src/intervals.h
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/macgui.h
Simple merge

diff --cc src/macterm.c
Simple merge

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

diff --cc src/marker.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/msdos.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/search.c
Simple merge

diff --cc src/syntax.c
Simple merge

diff --cc src/syntax.h
Simple merge

diff --cc src/term.c
Simple merge

diff --cc src/w16select.c
Simple merge

diff --cc src/w32bdf.c
Simple merge

diff --cc src/w32console.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32menu.c
Simple merge

diff --cc src/w32proc.c
Simple merge

diff --cc src/w32select.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/w32term.h
Simple merge

diff --cc src/w32xfns.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge

diff --cc src/xrdb.c
Simple merge

diff --cc src/xselect.c
Simple merge

diff --cc src/xterm.c
Simple merge

diff --cc src/xterm.h
Simple merge