Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-51

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 289-301)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 68)

   - Update from CVS

diff --cc admin/FOR-RELEASE
index be0f05f,ea0f463..b016900
--- 1/admin/FOR-RELEASE
--- 2/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@@ -91,6 -91,14 +91,14 @@@ is encountered
  Please record your name here and say which part of the distribution
  you're going to handle.
  
 -lisp/term             done            Thien-Thi Nguyen
+ DIRECTORY             STATUS          IN CHARGE
+ ---------             ------          ---------
+ lisp/international    working         Kenichi Handa
+ lisp/languages                working         Kenichi Handa
+ lisp/net              working         Thien-Thi Nguyen
+ lisp/play             done            Thien-Thi Nguyen
++lisp/term             working         Thien-Thi Nguyen
+ 
  ** Update AUTHORS.
  
  ** Reorder NEWS entries.

diff --cc etc/NEWS
Simple merge

diff --cc etc/TODO
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

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

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

diff --cc lisp/loadup.el
Simple merge

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/term/mac-win.el
index 2c56840,8fbbc7c..02a6564
--- 1/lisp/term/mac-win.el
--- 2/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*-
 +;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8
  
- ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005
+ ;; Copyright (C) 1999, 2000, 2002, 2003, 2005
  ;;   Free Software Foundation, Inc.
  
  ;; Author: Andrew Choi <akochoi@mac.com>

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

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

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

diff --cc src/ChangeLog
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dired.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge

diff --cc src/xterm.c
Simple merge