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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 514-518)

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

 * gnus--rel--5.10  (patch 104-105)

   - Update from CVS

diff --cc etc/MORE.STUFF
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc etc/TODO
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
index 2d0a71bf6c7864fc4fc0c06b23e80e131a56e10e,3dbd581aef405668e6c5e1e3357cd14ce973ef72..5f0b4c4b3ec2ef06e5b62f53e3c33ec1375dee6e
--- 1/lisp/desktop.el
--- 2/lisp/desktop.el
+++ b/lisp/desktop.el
@@@ -685,8 -797,7 +797,7 @@@ See also `desktop-base-file-name'.
                    (insert ")\n\n")))
              info)
        (setq default-directory dirname)
-       (when (file-exists-p filename) (delete-file filename))
 -      (let ((coding-system-for-write 'emacs-mule))
 +      (let ((coding-system-for-write 'utf-8-emacs))
          (write-region (point-min) (point-max) filename nil 'nomessage))))
    (setq desktop-dirname dirname))
  

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/bytecomp.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/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/message.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/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/makefile.w32-in
Simple merge

diff --cc lisp/obsolete/swedish.el
index affaa9484a232b62c8d165daba152c19b77a0d02,5e1794705a92adc51d32fb0b79a1135702b7d1f6..0021e1f1404c012ee4a38d84d7f60b7ac04accd7
--- 1/lisp/international/swedish.el
--- 2/lisp/obsolete/swedish.el
+++ b/lisp/obsolete/swedish.el
@@@ -35,6 -31,13 +35,11 @@@
  
  ;; See iso-swed.el for a description of the character set.
  
 -(require 'latin-1)
 -
+ (eval-when-compile
+   (defvar news-inews-hook)
+   (defvar news-group-hook-alist)
+   (defvar mail-send-hook))
+ 
  (defvar swedish-re
    "[ \t\n]\\(och\\|att\\|en\\|{r\\|\\[R\\|p}\\|P\\]\\|som\\|det\\|av\\|den\\|f|r\\|F\\\\R\\)[ \t\n.,?!:;'\")}]"
    "Regular expression for common Swedish words.")

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

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

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

diff --cc lisp/textmodes/tex-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 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/ccl.c
index e827ed7f28d93298626bc2fd0434fc15f7ea6fea,562215218bc51e4c650441bd1b6689d756c54732..a785707295c6157e32c68753b2e5bf11bfb597cc
--- 1/src/ccl.c
--- 2/src/ccl.c
+++ b/src/ccl.c
@@@ -1,10 -1,7 +1,10 @@@
  /* CCL (Code Conversion Language) interpreter.
     Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
 -   Licensed to the Free Software Foundation.
 +     Licensed to the Free Software Foundation.
-    Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +   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 bf4dfc5bd481a781cde036170c1e700c4e0daaeb,3676c9b8a71507f6f67845c4d1ea661e5b784791..d2d5686b899c8971a7c2d048f9bce3151c201972
--- 1/src/charset.c
--- 2/src/charset.c
+++ b/src/charset.c
@@@ -1,10 -1,7 +1,10 @@@
 -/* Basic multilingual character support.
 -   Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
 -   Licensed to the Free Software Foundation.
 +/* Basic character set support.
 +   Copyright (C) 1995, 97, 98, 2000, 2001 Electrotechnical Laboratory, JAPAN.
 +     Licensed to the Free Software Foundation.
-    Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +   Copyright (C) 2003, 2004
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/charset.h
index 4f342a3fbbe16f524ef4cdb77f497fe2c6685732,a5cdca21bbb6940197c7d5e374444c53bade6373..a06c3a1b094656104e4cafbeaa8b53458d64baa9
--- 1/src/charset.h
--- 2/src/charset.h
+++ b/src/charset.h
@@@ -1,10 -1,7 +1,10 @@@
 -/* Header for multibyte character handler.
 +/* Header for charset handler.
     Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
 -   Licensed to the Free Software Foundation.
 +     Licensed to the Free Software Foundation.
-    Copyright (C) 2001 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +   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/cmds.c
Simple merge

diff --cc src/coding.c
index d55817c9c795e27e83e505131221d49d5e171863,794f49495fb259723452deb7532d92cf2cf82e0c..93051d2f8a3d41f3325def9fc33348c8914d9895
--- 1/src/coding.c
--- 2/src/coding.c
+++ b/src/coding.c
@@@ -1,10 -1,7 +1,10 @@@
 -/* Coding system handler (conversion, detection, and etc).
 -   Copyright (C) 1995,97,1998,2002,2003  Electrotechnical Laboratory, JAPAN.
 -   Licensed to the Free Software Foundation.
 +/* Coding system handler (conversion, detection, etc).
 +   Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
 +     Licensed to the Free Software Foundation.
-    Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +   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 f96b86b24138e8a5f2632180609cc0061e7175a2,1ea1dafd54b37753f7ee43a2aa018d6a808a453b..c182f182e6788836fb8de2a81e1e40720273bd37
--- 1/src/coding.h
--- 2/src/coding.h
+++ b/src/coding.h
@@@ -1,10 -1,7 +1,10 @@@
  /* Header for coding system handler.
-    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
     Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
 -   Licensed to the Free Software Foundation.
 -   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +     Licensed to the Free Software Foundation.
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
++   Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  

diff --cc src/composite.c
index 1eb0b0212fdc10be659e848fb748359a5140d93d,daa6dceb3c600928633d2373a80fb5692f0c9eff..3d50886dc3caaa90bd5be5b591fd235185738e2d
--- 1/src/composite.c
--- 2/src/composite.c
+++ b/src/composite.c
@@@ -1,10 -1,7 +1,10 @@@
  /* Composite sequence support.
     Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
 -   Licensed to the Free Software Foundation.
 +     Licensed to the Free Software Foundation.
-    Copyright (C) 2001 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +   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.h
index 550115edd444f4bba807c0b7c21a3284ca1023fb,26cf13d27d49d8d9dd09287a1add9f55c05d3e33..fe931a579aed64fdb929301f051ec95534bb8b0b
--- 1/src/composite.h
--- 2/src/composite.h
+++ b/src/composite.h
@@@ -1,10 -1,7 +1,10 @@@
  /* Header for composite sequence handler.
     Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
 -   Licensed to the Free Software Foundation.
 +     Licensed to the Free Software Foundation.
-    Copyright (C) 2001 Free Software Foundation, Inc.
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
+    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  

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 5ccc0dceb6038b7a8ed5248c71a61be952913ffd,130ab402cc71933a6f6f2d8ac0e2608d85e7b30c..c63bec61a150e581cd1f077910445c8325980ffe
--- 1/src/fontset.c
--- 2/src/fontset.c
+++ b/src/fontset.c
@@@ -1,10 -1,7 +1,10 @@@
  /* Fontset handler.
-    Copyright (C) 2004  Free Software Foundation, Inc.
     Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
 -   Licensed to the Free Software Foundation.
 +     Licensed to the Free Software Foundation.
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
+    Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  

diff --cc src/fontset.h
index ad7ee334e740d4425e36eb72c82ccf248dc7c6ad,3a4932af6c080c2b8522869c48c836062e2c85b9..33bbeda4f5205255874e614f057fe34f6665560a
--- 1/src/fontset.h
--- 2/src/fontset.h
+++ b/src/fontset.h
@@@ -1,9 -1,7 +1,10 @@@
  /* Header for fontset handler.
     Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
 -   Licensed to the Free Software Foundation.
 +     Licensed to the Free Software Foundation.
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
+    Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
  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/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.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/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/xterm.c
Simple merge

diff --cc src/xterm.h
Simple merge