From: Jan Djärv Date: Mon, 25 Jan 2010 07:45:12 +0000 (+0100) Subject: Merge from trunk X-Git-Tag: emacs-pretest-23.1.92~30 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/433bdc96cb7234e36f218df1588b17411f54ee57 Merge from trunk --- 433bdc96cb7234e36f218df1588b17411f54ee57 diff --cc src/ChangeLog index a09fbac8c3,3a62f0a2a1..96dc0066fd --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,8 -1,40 +1,45 @@@ +2010-01-25 Jan Djärv + + * xfns.c (Fx_create_frame): If frame height is too big, try + sizes 24 and 10. Bug #3643. + + 2010-01-24 Stefan Monnier + + 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 (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 (tiny change) + + * filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x + lacks this header file). + + 2010-01-23 YAMAMOTO Mitsuharu + + * xdisp.c (draw_glyphs): Update `start' for left_overwritten case + as in Emacs 22. + + 2010-01-22 YAMAMOTO Mitsuharu + + * 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 + + * 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 * coding.c (consume_chars): If ! multibyte and the encoder is ccl,