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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 519-530)

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

 * gnus--rel--5.10  (patch 106-111)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

diff --cc etc/NEWS
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/faces.el
Simple merge

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

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

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

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

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

diff --cc lisp/language/ethio-util.el
index 82ccc6a28fd54d9124387466e7d778f49c1e9e16,fb70b2641d0dd9334bd524f9f320c9064c106574..8f00571dd9a83c5afcbef2f60aa7c15102fc57b0
--- 1/lisp/language/ethio-util.el
--- 2/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@@ -34,8 -31,9 +34,11 @@@
  
  ;;; Code:
  
 +(require 'robin)
 +
+ (defvar rmail-current-message)
+ (defvar rmail-message-vector)
+ 
  ;; Information for exiting Ethiopic environment.
  (defvar exit-ethiopic-environment-data nil)
  

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

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

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

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

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

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

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 lisp/textmodes/sgml-mode.el
Simple merge

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

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

diff --cc src/ChangeLog
Simple merge

diff --cc src/dired.c
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/intervals.c
Simple merge

diff --cc src/syntax.c
Simple merge

diff --cc src/xdisp.c
Simple merge