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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 226-238)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.

 * gnus--rel--5.10  (patch 86-90)

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

diff --cc configure
Simple merge

diff --cc etc/MORE.STUFF
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc etc/TODO
Simple merge

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

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

diff --cc leim/quail/latin-alt.el
index f52467a5d64791dd545a5b98dcd989be2ef46eb3,574b9a6921e7296a61c712dc3117fbc5d738b869..330c1b904b295285165cff1362f81b9a7e175f8f
--- 1/leim/quail/latin-alt.el
--- 2/leim/quail/latin-alt.el
+++ b/leim/quail/latin-alt.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; 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  Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 2001, 2002, 2006  Free Software Foundation, Inc.
  ;; Copyright (C) 1999
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021

diff --cc leim/quail/latin-post.el
index 428910bcdd5c5aa0b1b44e7050da6c24496e6f6c,5ca475e730f1ccfeb5ee7ff9772c97e0cdf25ea9..a3c7d9cb30ec2f07bbdb828e2ca4fec01661e7aa
--- 1/leim/quail/latin-post.el
--- 2/leim/quail/latin-post.el
+++ b/leim/quail/latin-post.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; 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 Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 2001, 2002, 2006 Free Software Foundation, Inc.
  ;; Copyright (C) 1997, 1999
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021

diff --cc leim/quail/latin-pre.el
index 92ed76b591554ff87ff2023e33642d83e00bd58c,8c809f2df2529d710da1f8f7ad2f35d807414ede..eb5c118b9f840459fef4e0458451dedaa6817669
--- 1/leim/quail/latin-pre.el
--- 2/leim/quail/latin-pre.el
+++ b/leim/quail/latin-pre.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; 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
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
  ;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1997, 1998, 1999, 2000, 2005
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)

diff --cc leim/quail/symbol-ksc.el
index 385fe9476962af75bc2407be4f579d9dffec594e,aabf4f5cd121dd2bcdfaf9b0aad4291528cc10d4..1747d40c109750f910ec7d2dd5099a61f7e7722b
--- 1/leim/quail/symbol-ksc.el
--- 2/leim/quail/symbol-ksc.el
+++ b/leim/quail/symbol-ksc.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601)
 +;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601) -*-coding: iso-2022-7bit;-*-
  
- ;; Copyright (C) 1997, 2005  Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 2005, 2006  Free Software Foundation, Inc.
  ;; Copyright (C) 1997, 1998
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021

diff --cc leim/quail/tibetan.el
index 921b3732c6fff8ddc1dee753e0340f3cf130f960,8387038eb40a63b6ad8644b542e74b2925011751..e3f9f3c8bfb342ab5c7a963a4ca6e5d206621403
--- 1/leim/quail/tibetan.el
--- 2/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; tibetan.el --- Quail package for inputting Tibetan characters
 +;;; tibetan.el --- Quail package for inputting Tibetan characters -*-coding: iso-2022-7bit;-*-
  
- ;; Copyright (C) 1997  Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 2006  Free Software Foundation, Inc.
  ;; Copyright (C) 1997, 1998, 1999, 2000
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021

diff --cc leim/quail/uni-input.el
index d623c333a06f29c31b0fd884ad5730b28f7931f2,1e6bdbd51e8679e3b388763b8d8ac73d4b2db86f..11d5d7393a8894cc331c80f64d1596c5c94aa018
--- 1/leim/quail/uni-input.el
--- 2/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; uni-input.el --- Hex Unicode input method
  
- ;; Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 -;; Copyright (C) 2001, 2003, 2006  Free Software Foundation, Inc.
++;; Copyright (C) 2001, 2002, 2003, 2006  Free Software Foundation, Inc.
  ;; Copyright (C) 2004
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021

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

diff --cc lisp/ChangeLog
Simple merge

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

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

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

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

diff --cc make-dist
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/abbrev.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xmenu.c
Simple merge