Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 97-100)

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

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-860

1 files changed, 22 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ee9eac3172c..9e6641ebf2a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -68,6 +68,28 @@
         (svg_type): New static `image_type' struct.
         (librsvg/rsvg.h): Include it.
 
+2007-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (load_warn_old_style_backquotes): Fix up array size typo.
+
+2007-08-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (Qold_style_backquotes): New var.
+        (syms_of_lread): Init and staticpro it.
+        (load_warn_old_style_backquotes): New fun.
+        (Fload): Use them to warn about old style backquotes.
+        (end_of_file_error, Fload): Remove unused vars.
+
+        * lisp.h (Fclear_face_cache, Fx_send_client_event): Declare.
+
+        * lread.c (Vold_style_backquotes): New var.
+        (syms_of_lread): Init and export it to Elisp.
+        (read1): Set it when we find an old-style (back)quote.
+
+2007-08-22  Jason Rumney  <jasonr@gnu.org>
+
+        * w32reg.c (SYSTEM_DEFAULT_RESOURCES): Add missing NULL terminator.
+
 2007-08-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * puresize.h (BASE_PURESIZE): Increase to 1140000.