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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 504-513)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: .cvsignore: Add `lock'.

 * gnus--rel--5.10  (patch 99-103)

   - Update from CVS

1 files changed, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e23f9bdacbf..fb8664b9fb6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-02  Richard M. Stallman  <rms@gnu.org>
+
+        * frame.c (Fframe_char_width): Doc fix.
+
+2005-07-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * xdisp.c (syms_of_xdisp) <redisplay-end-trigger-functions>:
+        Defvar it.
+
 2005-07-28  Juanma Barranquero  <lekktu@gmail.com>
 
         * w32fns.c (my_set_window_pos, my_show_window): Don't declare.
@@ -130,6 +139,11 @@
         * w32fns.c (Vx_hand_shape): Variable removed.
         (syms_of_w32fns): Intern and staticpro Qw32_charset_default.
 
+2005-07-19  Kenichi Handa  <handa@m17n.org>
+
+        * fns.c (Fstring_as_multibyte): Escape backslashes in the
+        docstring.
+
 2005-07-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * buffer.h (Fgenerate_new_buffer_name): Declare (for use in coding.c).