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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

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

diff --cc etc/NEWS
Simple merge

diff --cc etc/PROBLEMS
Simple merge

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

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/Makefile.in
Simple merge

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/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/edmacro.el
Simple merge

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

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/format.el
Simple merge

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

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

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

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

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

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

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/ldefs-boot.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

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

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

diff --cc lisp/ps-bdf.el
index 44a1223dc42befaee5d92f711e8cdf3388d2240e,0c3736fab9e8bcad091b2c390de677f57e582ea9..9597d4afa4e4dca10258d08100846b12cf44b79b
--- 1/lisp/ps-bdf.el
--- 2/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@@ -1,6 -1,6 +1,7 @@@
  ;;; ps-bdf.el --- BDF font file handler for ps-print
  
- ;; Copyright (C) 1998, 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
 -;; Copyright (C) 1998, 1999, 2001, 2006 Free Software Foundation, Inc.
++;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2006
++;;   Free Software Foundation, Inc.
  ;; Copyright (C) 1998, 1999, 2001, 2003
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021

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

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

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

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

diff --cc lisp/term/mac-win.el
index bbbb2902aa27cdd29784b0074a48b19ff048c441,2c6bcd67d37bdbfe55b6aa88fda05e3ceb2e0ec5..1917af5994215f6db95ccb6b15cb57074a0cfb3b
--- 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, 2002, 2003, 2004,
- ;;   2005 Free Software Foundation, Inc.
+ ;;   2005, 2006 Free Software Foundation, Inc.
  
  ;; Author: Andrew Choi <akochoi@mac.com>
  ;; Keywords: terminals

diff --cc lisp/term/x-win.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
Simple merge

diff --cc lisp/w32-fns.el
Simple merge

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

diff --cc man/cc-mode.texi
Simple merge

diff --cc src/.gdbinit
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/abbrev.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
Simple merge

diff --cc src/ccl.c
Simple merge

diff --cc src/charset.c
index 15a5d75ecbda122a75bc1ee5128767729e2d2f92,211de24ef8972a813fc4054d86510cca901a5e92..3e1bebdd68f9527918151852276ef6ae93a6fca9
--- 1/src/charset.c
--- 2/src/charset.c
+++ b/src/charset.c
@@@ -1,5 -1,6 +1,6 @@@
 -/* Basic multilingual character support.
 +/* Basic character set support.
-    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005,
 -                 2006 Free Software Foundation, Inc.
++               2006 Free Software Foundation, Inc.
     Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001
       National Institute of Advanced Industrial Science and Technology (AIST)
       Registration Number H14PRO021

diff --cc src/charset.h
index 782e92799ff0e11afff06334e85908e25a98e4a8,0d61aa054c0ba923461331f7a701070aaf21811b..25ccaf9d324a8e1f6af6d39c250028d669987cd3
--- 1/src/charset.h
--- 2/src/charset.h
+++ b/src/charset.h
@@@ -1,5 -1,6 +1,6 @@@
 -/* Header for multibyte character handler.
 +/* Header for charset handler.
-    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005,
 -                 2006 Free Software Foundation, Inc.
++               2006 Free Software Foundation, Inc.
     Copyright (C) 1995, 1997, 1998, 2003
       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 6ec0804353fc0fa8675562170e2df06afa07db78,b96ec82fc16aceeb9b9db8a56b94f7a1276ade31..92194df6a6cf42eaaaa3bd3c9ba8b0753522c403
--- 1/src/coding.c
--- 2/src/coding.c
+++ b/src/coding.c
@@@ -1,5 -1,6 +1,6 @@@
 -/* Coding system handler (conversion, detection, and etc).
 +/* Coding system handler (conversion, detection, etc).
-    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                  2006 Free Software Foundation, Inc.
     Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, 2005
       National Institute of Advanced Industrial Science and Technology (AIST)
       Registration Number H14PRO021

diff --cc src/coding.h
Simple merge

diff --cc src/composite.c
Simple merge

diff --cc src/composite.h
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/filelock.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/fontset.c
Simple merge

diff --cc src/fontset.h
Simple merge

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/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/regex.h
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/w32select.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/w32term.h
Simple merge

diff --cc src/window.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/xterm.h
Simple merge