Merge from trunk

1 files changed, 37 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a09fbac8c35..96dc0066fd9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,43 @@
         * xfns.c (Fx_create_frame): If frame height is too big, try
         sizes 24 and 10. Bug #3643.
 
+2010-01-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Try and fix bug#788, hopefully for real this time.
+        * keymap.c (shadow_lookup): Add `remap' arg.
+        (describe_map, describe_vector): Update calls to shadow_lookup.
+        (Fwhere_is_internal): Fix up handling of `remapped_sequences' and
+        `remapped' so this flag is applicable to `sequence'.  Be careful to
+        perform remapping during shadow_lookup check of remapped_sequences.
+
+2010-01-24  Eric Bélanger  <snowmaniscool@gmail.com>  (tiny change)
+
+        * image.c (png_load): Use png_sig_cmp instead of the obsolete
+        png_check_sig, which has been removed in libpng 1.4.
+
+2010-01-23  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+        * filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x
+        lacks this header file).
+
+2010-01-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xdisp.c (draw_glyphs): Update `start' for left_overwritten case
+        as in Emacs 22.
+
+2010-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * lisp.h (make_pure_string): String pointer arg now points to const.
+
+        * alloc.c (find_string_data_in_pure, make_pure_string): String pointer
+        args now point to const.
+
+2010-01-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * lread.c (Fload): Don't treat files without .elc extension as
+        byte-compiled if they are ``magic'', i.e. `openp' returned -2 for
+        them.  (bug#5303)
+
 2010-01-20  Kenichi Handa  <handa@m17n.org>
 
         * coding.c (consume_chars): If ! multibyte and the encoder is ccl,