From: Miles Bader <miles@gnu.org>
Date: Tue, 7 Nov 2006 23:22:48 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~8295^2~700
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dbc3b08c405a7b1c0ddb0fb0c98164b355802af5;p=emacs.git

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
---

dbc3b08c405a7b1c0ddb0fb0c98164b355802af5
diff --cc lisp/Makefile.in
index d13dfe4c51e,f6bb1c8a3ef..ae7afb0ff1c
--- a/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 src/lread.c
index c263c458a12,6ce7c6a1aef..79ccc8bd152
--- a/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;
  
 +/* 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
+ /* Function to use for loading an Emacs Lisp source file (not
     compiled) instead of readevalloop.  */
  Lisp_Object Vload_source_file_function;