from trunk

1 files changed, 35 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b382cb5a53..57dcaa4af6e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -10,20 +10,44 @@
         (syms_of_composite): Declare Lisp variable
         "auto-composition-mode" here.
 
+2010-01-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (x_term_init): Avoid garbage-collecting the new terminal
+        during call to vendor-specific-keysyms (Bug#5365).
+
+2010-01-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * keyboard.c (input_available_signal) [SYNC_INPUT]:
+        Call SIGNAL_THREAD_CHECK (Bug#5333).
+
+        * atimer.c (alarm_signal_handler) [!SYNC_INPUT]:
+        Call SIGNAL_THREAD_CHECK.
+
+2010-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Try to fix bug#5314.  This is probably not the final word, tho.
+        * buffer.c (Fset_buffer_modified_p): Try and be careful not to modify
+        recent-auto-save-p as a side-effect.
+        * buffer.h (BUF_AUTOSAVE_MODIFF): New macro.
+        * buffer.c (Fkill_buffer, reset_buffer):
+        * editfns.c (Fsubst_char_in_region):
+        * fileio.c (Finsert_file_contents, Fdo_auto_save)
+        (Fset_buffer_auto_saved, Frecent_auto_save_p): Use it.
+
 2010-01-13  Kenichi Handa  <handa@m17n.org>
 
         Display buffer name, etc. in mode line by composing correctly.
 
         * xdisp.c (reseat_to_string): Call composition_compute_stop_pos if
         STRING is not nil.
-        (display_mode_element): Adjusted for the change of
+        (display_mode_element): Adjust for the change of
         decode_mode_spec and display_line.
         (decode_mode_spec): Change arg MULTIBYTE to STRING.
         (display_string): Handle the case that STRING is non-null and
         LISP_STRING is not nil.
 
-        * xterm.c (x_draw_composite_glyph_string_foreground): Pay
-        attention to s->face->overstrike.
+        * xterm.c (x_draw_composite_glyph_string_foreground):
+        Pay attention to s->face->overstrike.
 
         * composite.c (composition_reseat_it): Don't check PT if STRING is
         non nil.
@@ -137,8 +161,8 @@
         (x_set_window_size): ... to here. bug #2568.
 
         * gtkutil.c (xg_clear_under_internal_border): New function.
-        (xg_frame_resized, xg_frame_set_char_size): Call
-        xg_clear_under_internal_border.
+        (xg_frame_resized, xg_frame_set_char_size):
+        Call xg_clear_under_internal_border.
         (xg_update_scrollbar_pos): Clear under old scroll bar position.
 
 2010-01-05  Chong Yidong  <cyd@stupidchicken.com>
@@ -262,8 +286,8 @@
         and atimer.h.
         (minibuf.o): Depend on systime.h and coding.h.  Don't depend on
         dispextern.h explicitly.
-        (print.o): Depend on termhooks.h, coding.h, and ccl.h.  Don't
-        depend explicitly on dispextern.h and composite.h.
+        (print.o): Depend on termhooks.h, coding.h, and ccl.h.
+        Don't depend explicitly on dispextern.h and composite.h.
         (process.o): Depend on character.h, xgselect.h, and sysselect.h.
         (regex.o): Don't depend on charset.h.
         (scroll.o): Depend on systime.h, coding.h, composite.h, and window.h.
@@ -442,8 +466,8 @@
 
 2009-12-04  Eli Zaretskii  <eliz@gnu.org>
 
-        * dispextern.h (enum prop_idx) <AUTO_COMPOSED_PROP_IDX>: Delete
-        unused enumeration value.
+        * dispextern.h (enum prop_idx) <AUTO_COMPOSED_PROP_IDX>:
+        Delete unused enumeration value.
 
 2009-12-03  Eli Zaretskii  <eliz@gnu.org>
 
@@ -574,8 +598,8 @@
 
 2009-11-21  Andreas Schwab  <schwab@linux-m68k.org>
 
-        * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
-        ignored second argument.  All callers changed.
+        * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH):
+        Remove ignored second argument.  All callers changed.
         * regex.c (STRING_CHAR, STRING_CHAR_AND_LENGTH, RE_STRING_CHAR)
         (RE_STRING_CHAR_AND_LENGTH): Likewise.
         * xdisp.c (string_char_and_length): Likewise.