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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 4-14)

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

 * gnus--rel--5.10  (base, patch 1-7)

   - tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   - Update from CVS
   - Merge from emacs--devo--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 187)

   - Update from CVS

diff --cc etc/NEWS
Simple merge

diff --cc etc/TODO
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/desktop.el
Simple merge

diff --cc lisp/faces.el
Simple merge

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

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

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

diff --cc lisp/isearch.el
Simple merge

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

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

diff --cc man/cc-mode.texi
index 0d6e88f20eaed96f87f661e4b58dcb83e0af796e,088c19e44f0ac7ac205c4f4eb825f9a81638886c..05c4cbf5a3ccbf66056992f2a6f8175309eabfe0
--- 1/man/cc-mode.texi
--- 2/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@@ -208,7 -208,7 +208,7 @@@ license to the document, as described i
  @vskip 0pt plus 1filll
  @insertcopying
  
- This manual was generated from $Revision: 1.32 $ of $RCSfile: cc-mode.texi,v $, which can be
 -This manual was generated from $Revision: 5.241 $ of $RCSfile: cc-mode.texi,v $, which can be
++This manual was generated from $Revision$ of $RCSfile$, which can be
  downloaded from
  @url{http://cvs.sf.net/viewcvs.py/cc-mode/cc-mode/cc-mode.texi}.
  @end titlepage

diff --cc src/.gdbinit
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/dired.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/regex.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge