Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 490-504)

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

 * gnus--rel--5.10  (patch 161-163)

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

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

diff --cc configure.in
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc leim/Makefile.in
Simple merge

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

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/Makefile.in
index d13dfe4c51ebfc96c0f6a773796264079b91bde6,f6bb1c8a3efebe6c972decd0a62591cab9525777..ae7afb0ff1cb14769642f527350ae8e77ad730bd
--- 1/lisp/Makefile.in
--- 2/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@@ -108,9 -108,9 +110,9 @@@ $(lisp)/loaddefs.el
        echo ";; End:" >> $@
        echo ";;; loaddefs.el ends here" >> $@
  autoloads: $(lisp)/loaddefs.el doit
-       wd=$(lisp); $(setwins); \
+       wd=$(lisp); $(setwins_almost); \
        echo Directories: $$wins; \
 -      $(EMACS) $(EMACSOPT) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
 +      LC_ALL=C $(EMACS) $(EMACSOPT) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
  
  $(lisp)/subdirs.el:
        $(MAKE) $(MFLAGS) update-subdirs

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/international/ja-dic-cnv.el
Simple merge

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

diff --cc lisp/mail/rmail.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/textmodes/fill.el
Simple merge

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

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

diff --cc make-dist
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/dosfns.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/lread.c
index c263c458a1267d27053be5a3dd4f5844ebdc1bd0,6ce7c6a1aef1be0d8583b6a0b26de2cddcdd8630..79ccc8bd152bcba70ca508350f3edc0228741ca9
--- 1/src/lread.c
--- 2/src/lread.c
+++ b/src/lread.c
@@@ -140,12 -132,7 +140,12 @@@ static int load_force_doc_strings
  /* Nonzero means read should convert strings to unibyte.  */
  static int load_convert_to_unibyte;
  
- /* Function to use for loading an Emacs lisp source file (not
 +/* Nonzero means READCHAR should read bytes one by one (not character)
 +   when READCHARFUN is Qget_file_char or Qget_emacs_mule_file_char.
 +   This is set to 1 by read1 temporarily while handling #@NUMBER.  */
 +static int load_each_byte;
 +
+ /* Function to use for loading an Emacs Lisp source file (not
     compiled) instead of readevalloop.  */
  Lisp_Object Vload_source_file_function;
  

diff --cc src/macfns.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge

diff --cc src/xterm.c
Simple merge