merge emacs-23

1 files changed, 149 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7daa09c703f..45aed177ef2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -14,6 +14,155 @@
         * lread.c (read_emacs_mule_char): Adjust for the change of
         emacs_mule_charset.
 
+2010-11-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
+        of w32api >= 3.15.  (Bug#6989)  (Bug#7452)
+
+2010-11-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * alloc.c (mark_terminals): Ensure that the image cache is marked
+        even if the terminal object was marked earlier (Bug#6301).
+
+2010-11-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * editfns.c (Fbyte_to_string): Signal an error arg is not a byte.
+
+2010-11-20  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (menubar_map_cb): New function (Bug#7425).
+        (xg_update_frame_menubar): Connect signal map to menubar_map_cb.
+        Use 23 as menubar height if 0. (Bug#7425).
+
+2010-11-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c (init_gconf): Check HAVE_G_TYPE_INIT.
+
+        * config.in (HAVE_G_TYPE_INIT): New symbol.
+
+2010-11-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * lread.c (Fload): Mention `load-in-progress' and
+        `load-file-name'.  (Bug#7346)
+
+2010-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (kbd_buffer_nr_stored): Define only ifdef subprocesses.
+        (kbd_buffer_store_event_hold, kbd_buffer_get_event)
+        (tty_read_avail_input): Call kbd_buffer_nr_stored only ifdef
+        subprocesses.  Use buffer_free only ifdef subprocesses.
+
+        * process.c (init_process) [subprocesses]: Init kbd_is_on_hold in
+        the subprocesses version, not in the non-subprocesses one.
+
+        * Makefile.in: Don't use ## comment, it breaks the MSDOS build.
+
+        * xfns.c (x_real_positions): Fix declaration-after-statement
+        problem.
+
+2010-11-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (free_image): Don't garbage the frame here, since this
+        function can be called while redisplaying (Bug#7210).
+        (uncache_image): Garbage the frame here (Bug#6426).
+
+2010-11-04  Chong Yidong  <cyd@stupidchicken.com>
+
+        * process.c (Fmake_network_process): Don't apply Bug#5173 fix for
+        Windows.
+
+2010-11-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * process.c (Fmake_network_process): Don't call turn_on_atimers around
+        `connect' (Bug#5723).
+
+2010-11-04  Helmut Eller  <eller.helmut@gmail.com>
+
+        * process.c (Fmake_network_process): Call `select' for interrupted
+        `connect' rather than creating new socket (Bug#5173).
+
+2010-11-04  Kenichi Handa  <handa@m17n.org>
+
+        * font.c (font_delete_unmatched): Check Vface_ignored_fonts.
+        Don't sheck SPEC if it is nil.
+        (font_list_entities): Call font_delete_unmatched if
+        Vface_ignored_fonts is non-nil.
+
+2010-11-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispextern.h (TRY_WINDOW_CHECK_MARGINS)
+        (TRY_WINDOW_IGNORE_FONTS_CHANGE): New defines.
+
+        * xdisp.c (try_window): Change arg from CHECK_MARGINS to FLAGS.
+        Don't abort with fonts change if TRY_WINDOW_IGNORE_FONTS_CHANGE is
+        set in FLAGS.  Callers with non-zero CHECK_MARGINS changed to use
+        TRY_WINDOW_CHECK_MARGINS.
+
+        * xfns.c (Fx_show_tip): Undo last change.  Call try_window with
+        TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423).
+
+2010-11-04  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our
+        parent is the root window.  Check this after traversing window tree.
+
+        * xterm.c (x_term_init): Initialize Xatom_net_frame_extents.
+
+        * xterm.h (struct x_display_info): Xatom_net_frame_extents is new.
+
+        * xfns.c (x_real_positions): Try to get _NET_FRAME_EXTENTS first
+        before traversing window tree (Bug#5721).
+
+2010-11-03  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (CRT_DIR): New variable, set by configure.
+        * m/amdx86-64.h, m/ibms390x.h (START_FILES, LIB_STANDARD):
+        Use $CRT_DIR rather than HAVE_LIB64_DIR.  (Bug#5655)
+
+2010-11-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * process.c (kbd_is_on_hold): New variable.
+        (hold_keyboard_input, unhold_keyboard_input, kbd_on_hold_p):
+        New functions.
+        (wait_reading_process_output): If kbd_on_hold_p returns non-zero,
+        select on empty input mask.
+        (init_process): Initialize kbd_is_on_hold to 0.
+
+        * process.h (hold_keyboard_input, unhold_keyboard_input)
+        (kbd_on_hold_p): Declare.
+
+        * keyboard.c (input_available_signal): Declare.
+        (kbd_buffer_nr_stored): New function.
+        (kbd_buffer_store_event_hold): If kbd_buffer_nr_stored returns
+        more than KBD_BUFFER_SIZE/2, stop reding input (Bug#6571).
+        (kbd_buffer_get_event): If input is suspended and kbd_buffer_nr_stored
+        returns less than KBD_BUFFER_SIZE/4, resume reding input (Bug#6571).
+        (tty_read_avail_input): If input is on hold, return.
+        Don't read more that free slots in kbd_buffer (Bug#6571).
+
+2010-10-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (x_connection_closed): Print informative error message
+        when aborting on GTK.  This requires using shut_down_emacs
+        directly instead of Fkill_emacs.
+
+2010-10-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (Fdbus_call_method_asynchronously)
+        (Fdbus_register_signal, Fdbus_register_method): Check, whether
+        `dbus-registered-objects-table' is initialized.
+
+2010-10-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (x_connection_closed): Kill Emacs unconditionally.
+
+2010-10-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.c (Fframep, Fwindow_system): Deprecate use as a predicate.
+
+        * dispnew.c (syms_of_display) <initial-window-system, window-system>:
+        Deprecate use as a boolean flag.
+
 2010-10-18  Ken Brown  <kbrown@cornell.edu>
 
         * s/cygwin.h (SIGNALS_VIA_CHARACTERS): New define (bug#7225).