finally builds again

1 files changed, 538 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c3ce1ee1b0b..b0899d67ca8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,527 @@
+2012-09-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Check more robustly for timer_settime.
+        * Makefile.in (LIB_TIMER_TIME): New macro.
+        (LIBES): Add it.
+        * atimer.c (alarm_timer, alarm_timer_ok, set_alarm, init_atimer):
+        Use HAVE_TIMER_SETTIME, not SIGEV_SIGNAL, to decide whether to
+        call timer_settime.
+
+2012-09-26  Tomohiro Matsuyama  <tomo@cx4a.org>
+
+        * profiler.c (Fprofiler_cpu_start): Remove unnecessary flag SA_SIGINFO.
+
+2012-09-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/profiler.$(O)): Update dependencies.
+
+2012-09-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * character.h (MAYBE_UNIFY_CHAR): Remove.
+        * charset.c, charset.h (maybe_unify_char): Now static.
+        * charset.c (decode_char): Use maybe_unify_char, not MAYBE_UNIFY_CHAR.
+        Since this stuff is now private to charset.c, there's no need for
+        a public macro and no need to inline by hand.
+
+2012-09-26  Tomohiro Matsuyama  <tomo@cx4a.org>
+            Stefan Monnier  <monnier@iro.umontreal.ca>
+            Juanma Barranquero  <lekktu@gmail.com>
+
+        * profiler.c: New file.
+        * Makefile.in (base_obj): Add profiler.o.
+        * makefile.w32-in (OBJ2, GLOBAL_SOURCES): Add profiler.c.
+        ($(BLD)/profiler.$(O)): New target.
+        * emacs.c (main): Call syms_of_profiler.
+        * alloc.c (Qautomatic_gc): New constant.
+        (MALLOC_PROBE): New macro.
+        (xmalloc, xzalloc, xrealloc, lisp_malloc, lisp_align_malloc): Use it.
+        (total_bytes_of_live_objects): New function.
+        (Fgarbage_collect): Use it.  Record itself in backtrace_list.
+        Call malloc_probe for the memory profiler.
+        (syms_of_alloc): Define Qautomatic_gc.
+        * eval.c (eval_sub, Ffuncall): Reorder assignments to avoid
+        race condition.
+        (struct backtrace): Move definition...
+        * lisp.h (struct backtrace): ..here.
+        (Qautomatic_gc, profiler_memory_running): Declare vars.
+        (malloc_probe, syms_of_profiler): Declare functions.
+        * xdisp.c (Qautomatic_redisplay): New constant.
+        (redisplay_internal): Record itself in backtrace_list.
+        (syms_of_xdisp): Define Qautomatic_redisplay.
+
+2012-09-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/callproc.$(O)): Update dependencies.
+
+2012-09-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Prefer POSIX timers if available.
+        They avoid a race if the timer is too close to the current time.
+        * atimer.c (alarm_timer, alarm_timer_ok) [SIGEV_SIGNAL]: New static vars.
+        (set_alarm) [SIGEV_SIGNAL]: Use POSIX timers if available.
+        (init_atimer) [SIGEV_SIGNAL]: Initialize them.
+
+2012-09-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * coding.c (CHAR_STRING_ADVANCE_NO_UNIFY): Make it an alias of
+        CHAR_STRING_ADVANCE.
+        (STRING_CHAR_ADVANCE_NO_UNIFY): Make it an alias of
+        STRING_CHAR_ADVANCE.
+
+2012-09-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        Move Vlibrary_cache to emacs.c and reset before dumping.
+
+        * lisp.h (reset_image_types): Declare.
+        [WINDOWSNT] (Vlibrary_cache): Declare.
+
+        * image.c (reset_image_types): New function.
+
+        * emacs.c [WINDOWSNT] (Vlibrary_cache): Move from w32.c.
+        (syms_of_emacs) [WINDOWSNT] <Vlibrary_cache>: Initialize and staticpro.
+        (Fdump_emacs): Reset Vlibrary_cache and image_types.
+
+        * w32.c (Vlibrary_cache): Do not define; moved to emacs.c
+        (globals_of_w32) <Vlibrary_cache>: Do not initialize.
+
+        * w32.h (Vlibrary_cache): Do not declare.
+
+2012-09-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32proc.c (sys_signal): Handle all signals defined by the
+        MS-Windows runtime, not just SIGCHLD.  Actually install the signal
+        handlers for signals supported by Windows.  Don't override
+        term_ntproc as the handler for SIGABRT.
+        (sigaction): Rewrite to call sys_signal instead of duplicating its
+        code.
+        (sys_kill): Improve commentary.
+
+        * w32.c (term_ntproc): Accept (and ignore) one argument, for
+        consistency with a signature of a signal handler.  All callers
+        changed.
+        (init_ntproc): Accept an argument DUMPING.  If dumping, don't
+        install term_ntproc as a signal handler for SIGABRT, as that
+        should be done by the dumped Emacs.
+
+        * w32.h (init_ntproc, term_ntproc): Adjust prototypes.
+
+        * w32select.c (term_w32select): Protect against repeated
+        invocation by setting clipboard_owner to NULL after calling
+        DestroyWindow.
+
+        * emacs.c (shut_down_emacs, main): Adapt the calls to init_ntproc
+        and term_ntproc to their modified signatures.
+
+        * character.c (char_string, string_char): Remove calls to
+        MAYBE_UNIFY_CHAR.  See the discussion starting at
+        http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00433.html
+        for the details.
+
+2012-09-25  Chong Yidong  <cyd@gnu.org>
+
+        * xdisp.c (mode_line_inverse_video): Delete obsolete variable.
+
+2012-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * bytecode.c (exec_byte_code): Signal an error instead of aborting,
+        when encountering an unknown bytecode.
+
+2012-09-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        image.c, indent.c: Use bool for booleans.
+        * dispextern.h (struct image_type): Members valid_p, load, init
+        now return bool, not int.  All uses changed.
+        * image.c: Omit unnecessary static decls.
+        (x_create_bitmap_mask, x_build_heuristic_mask):
+        Return void, not int, since callers don't care about the return value.
+        (x_create_bitmap_mask, define_image_type, valid_image_p)
+        (struct image_keyword, parse_image_spec, image_spec_value)
+        (check_image_size, image_background)
+        (image_background_transparent, x_clear_image_1)
+        (postprocess_image, lookup_image, x_check_image_size)
+        (x_create_x_image_and_pixmap, xbm_image_p)
+        (Create_Pixmap_From_Bitmap_Data, xbm_read_bitmap_data)
+        (xbm_load_image, xbm_file_p, xbm_load, xpm_lookup_color)
+        (init_xpm_functions, xpm_valid_color_symbols_p, xpm_image_p)
+        (xpm_load, xpm_load_image, lookup_rgb_color, lookup_pixel_color)
+        (x_to_xcolors, x_build_heuristic_mask, pbm_image_p, pbm_load)
+        (png_image_p, init_png_functions, png_load_body, png_load)
+        (jpeg_image_p, init_jpeg_functions, jpeg_load_body, jpeg_load)
+        (tiff_image_p, init_tiff_functions, tiff_load, gif_image_p)
+        (init_gif_functions, gif_load, imagemagick_image_p)
+        (imagemagick_load_image, imagemagick_load, svg_image_p)
+        (init_svg_functions, svg_load, svg_load_image, gs_image_p)
+        (gs_load):
+        * nsimage.m (ns_load_image):
+        * nsterm.m (ns_defined_color):
+        * xfaces.c (tty_lookup_color, tty_defined_color, defined_color):
+        * xfns.c (x_defined_color):
+        * xterm.c (x_alloc_lighter_color_for_widget)
+        (x_alloc_nearest_color_1, x_alloc_nearest_color)
+        (x_alloc_lighter_color):
+        * indent.c (disptab_matches_widthtab, current_column)
+        (scan_for_column, string_display_width, indented_beyond_p)
+        (compute_motion, vmotion, Fvertical_motion):
+        Use bool for booleans.
+
+2012-09-24  Chong Yidong  <cyd@gnu.org>
+
+        * chartab.c (Fset_char_table_default): Obsolete function removed.
+
+2012-09-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Move pid_t related decls out of lisp.h.
+        * lisp.h, syswait.h (record_child_status_change, wait_for_termination)
+        (interruptible_wait_for_termination):
+        Move these decls from lisp.h to syswait.h, since they use pid_t.
+        Needed on FreeBSD; see Herbert J. Skuhra in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00571.html>.
+        * callproc.c: Include syswait.h.
+
+        gnutls.c, gtkutil.c: Use bool for boolean.
+        * gnutls.c (gnutls_global_initialized, init_gnutls_functions)
+        (emacs_gnutls_handle_error):
+        * gtkutil.c (xg_check_special_colors, xg_prepare_tooltip)
+        (xg_hide_tooltip, xg_create_frame_widgets)
+        (create_dialog, xg_uses_old_file_dialog)
+        (xg_get_file_with_chooser, xg_get_file_with_selection)
+        (xg_get_file_name, xg_have_tear_offs, create_menus, xg_create_widget)
+        (xg_item_label_same_p, xg_update_menubar)
+        (xg_modify_menubar_widgets, xg_event_is_for_menubar)
+        (xg_ignore_gtk_scrollbar, xg_set_toolkit_scroll_bar_thumb)
+        (xg_event_is_for_scrollbar, xg_pack_tool_bar, xg_make_tool_item)
+        (is_box_type, xg_tool_item_stale_p, xg_update_tool_bar_sizes)
+        (update_frame_tool_bar, free_frame_tool_bar):
+        * gtkutil.c, w32term.c, xterm.c (x_wm_set_size_hint):
+        * nsmenu.m (ns_update_menubar):
+        * nsmenu.m, w32menu.c, xmenu.c (set_frame_menubar):
+        * xfns.c (Fx_show_tip) [USE_GTK]:
+        Use bool for boolean.
+        * gtkutil.c (xg_update_frame_menubar):
+        * xmenu.c (update_frame_menubar):
+        Return void, not int, since caller ignores return value.
+        * gtkutil.c (xg_change_toolbar_position):
+        Return void, not 1.
+
+2012-09-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (BLOCKINPUT_H): Remove.
+        (SYSSIGNAL_H): New macro.
+        ($(BLD)/alloc.$(O), $(BLD)/atimer.$(O), $(BLD)/buffer.$(O))
+        ($(BLD)/callproc.$(O), $(BLD)/data.$(O), $(BLD)/dired.$(O))
+        ($(BLD)/dispnew.$(O), $(BLD)/editfns.$(O), $(BLD)/emacs.$(O))
+        ($(BLD)/eval.$(O), $(BLD)/fileio.$(O), $(BLD)/floatfns.$(O))
+        ($(BLD)/fns.$(O), $(BLD)/fontset.$(O), $(BLD)/frame.$(O))
+        ($(BLD)/fringe.$(O), $(BLD)/image.$(O), $(BLD)/insdel.$(O))
+        ($(BLD)/keyboard.$(O), $(BLD)/keymap.$(O), $(BLD)/lread.$(O))
+        ($(BLD)/menu.$(O), $(BLD)/w32inevt.$(O), $(BLD)/w32proc.$(O))
+        ($(BLD)/print.$(O), $(BLD)/process.$(O), $(BLD)/ralloc.$(O))
+        ($(BLD)/search.$(O), $(BLD)/sound.$(O), $(BLD)/sysdep.$(O))
+        ($(BLD)/term.$(O), $(BLD)/window.$(O), $(BLD)/xdisp.$(O))
+        ($(BLD)/xfaces.$(O), $(BLD)/w32fns.$(O), $(BLD)/w32menu.$(O))
+        ($(BLD)/w32term.$(O), $(BLD)/w32select.$(O), $(BLD)/w32reg.$(O))
+        ($(BLD)/w32xfns.$(O)): Update dependencies.
+
+2012-09-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * .gdbinit: Set breakpoint on terminate_due_to_signal, not on
+        fatal_error_backtrace.
+
+        * w32proc.c (sys_kill): Undo last change: don't do anything when
+        invoked to deliver SIGABRT to our own process.  This is now
+        handled by emacs_raise.
+
+2012-09-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32term.c (w32_read_socket): Remove leftover reference to
+        interrupt_input_pending.
+
+2012-09-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Do not use SA_NODEFER.
+        Problem reported by Dani Moncayo in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00557.html>.
+        * alloc.c (die):
+        * sysdep.c (emacs_abort): Do not reset signal handler.
+        * emacs.c (terminate_due_to_signal): Reset signal handler here.
+        * sysdep.c (init_signals): Do not use SA_NODEFER.  It wasn't
+        wanted even on POSIXish hosts, and it doesn't work on Windows.
+
+2012-09-23  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_term_init): Call fixup_locale before and after calling
+        gtk_init (Bug#12392).
+
+2012-09-23  Chong Yidong  <cyd@gnu.org>
+
+        * w32.c (w32_delayed_load): Remove LIBRARIES argument; always use
+        Vdynamic_library_alist.
+
+        * gnutls.c (init_gnutls_functions): Caller changed; remove arg.
+        (Fgnutls_available_p): Caller changed.
+
+        * xml.c (init_libxml2_functions, Flibxml_parse_html_region)
+        (Flibxml_parse_xml_region): Likewise.
+
+        * dispextern.h (struct image_type): Remove arg from init function.
+
+        * image.c (Finit_image_library, lookup_image_type)
+        (define_image_type): Remove now-unneeded second arg.
+        (init_xpm_functions, init_png_functions, init_jpeg_functions)
+        (init_tiff_functions, init_gif_functions, init_svg_functions):
+        Arglist and w32_delayed_load calling convention changed.
+        (gs_type): Remove init_gs_functions; there is no such function.
+        (valid_image_p, make_image): Fix caller to lookup_image_type.
+
+2012-09-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify and avoid signal-handling races (Bug#12471).
+        * alloc.c (die):
+        * sysdep.c (emacs_abort) [HAVE_NTGUI]:
+        Avoid recursive loop if there's a fatal error in the function itself.
+        * atimer.c (pending_atimers):
+        * blockinput.h: Don't include "atimer.h"; no longer needed.
+        (interrupt_input_pending): Remove.  All uses removed.
+        pending_signals now counts both atimers and ordinary interrupts.
+        This is less racy than having three separate pending-signal flags.
+        (block_input, unblock_input, totally_unblock_input, unblock_input_to)
+        (input_blocked_p):
+        Rename from their upper-case counterparts BLOCK_INPUT,
+        UNBLOCK_INPUT, TOTALLY_UNBLOCK_INPUT, UNBLOCK_INPUT_TO,
+        INPUT_BLOCKED_P, and turn into functions.  All uses changed.
+        This makes it easier to access volatile variables more accurately.
+        (BLOCK_INPUT_RESIGNAL): Remove.  All uses replaced by unblock_input ().
+        (input_blocked_p): Prefer this to 'interrupt_input_blocked', as
+        that's more reliable if the code is buggy and sets
+        interrupt_input_blocked to a negative value.  All uses changed.
+        * atimer.c (deliver_alarm_signal):
+        Remove.  No need to deliver this to the parent; any thread can
+        handle this signal now.  All uses replaced by underlying handler.
+        * atimer.c (turn_on_atimers):
+        * dispnew.c (handle_window_change_signal):
+        * emacs.c (handle_danger_signal):
+        * keyboard.c (kbd_buffer_get_event):
+        Don't reestablish signal handler; not needed with sigaction.
+        * blockinput.h (UNBLOCK_INPUT_TO, TOTALLY_UNBLOCK_INPUT)
+        (UNBLOCK_INPUT_TO):
+        Rework to avoid unnecessary accesses to volatile variables.
+        (UNBLOCK_INPUT_TO): Now a function.
+        (totally_unblock_input, unblock_input): New decls.
+        * data.c (handle_arith_signal, deliver_arith_signal): Move to sysdep.c
+        (init_data): Remove.  Necessary stuff now done in init_signal.
+        * emacs.c, xdisp.c: Include "atimer.h", since we invoke atimer functions.
+        * emacs.c (handle_fatal_signal, deliver_fatal_signal): Move to sysdep.c.
+        (fatal_error_code): Remove; no longer needed.
+        (terminate_due_to_signal): Rename from fatal_error_backtrace, since
+        it doesn't always backtrace.  All uses changed.  No need to reset
+        signal to default, since sigaction and/or die does that for us now.
+        Use emacs_raise (FOO), not kill (getpid (), FOO).
+        (main): Check more-accurately whether we're dumping.
+        Move fatal-error setup to sysdep.c
+        * floatfns.c: Do not include "syssignal.h"; no longer needed.
+        * gtkutil.c (xg_get_file_name, xg_get_font):
+        Remove no-longer-needed signal-mask manipulation.
+        * keyboard.c, process.c (POLL_FOR_INPUT):
+        Don't depend on USE_ASYNC_EVENTS, a symbol that is never defined.
+        * keyboard.c (read_avail_input): Remove.
+        All uses replaced by gobble_input.
+        (Ftop_level): Use TOTALLY_UNBLOCK_INPUT rather than open code.
+        (kbd_buffer_store_event_hold, gobble_input):
+        (record_asynch_buffer_change) [USABLE_SIGIO]:
+        (store_user_signal_events):
+        No need to mess with signal mask.
+        (gobble_input): If blocking input and there are terminals, simply
+        set pending_signals to 1 and return.  All hooks changed to not
+        worry about whether input is blocked.
+        (process_pending_signals): Clear pending_signals before processing
+        them, in case a signal comes in while we're processing.
+        By convention callers now test pending_signals before calling us.
+        (UNBLOCK_INPUT_TO, unblock_input, totally_unblock_input):
+        New functions, to support changes to blockinput.h.
+        (handle_input_available_signal): Now extern.
+        (reinvoke_input_signal): Remove.  All uses replaced by
+        handle_async_input.
+        (quit_count): Now volatile, since a signal handler uses it.
+        (handle_interrupt): Now takes bool IN_SIGNAL_HANDLER as arg.
+        All callers changed.  Block SIGINT only if not already blocked.
+        Clear sigmask reliably, even if Fsignal returns, which it can.
+        Omit unnecessary accesses to volatile var.
+        (quit_throw_to_read_char): No need to restore sigmask.
+        * keyboard.c (gobble_input, handle_user_signal):
+        * process.c (wait_reading_process_output):
+        Call signal-handling code rather than killing ourselves.
+        * lisp.h: Include <float.h>, for...
+        (IEEE_FLOATING_POINT): New macro, moved here to avoid duplication.
+        (pending_signals): Now volatile.
+        (syms_of_data): Now const if IEEE floating point.
+        (handle_input_available_signal) [USABLE_SIGIO]:
+        (terminate_due_to_signal, record_child_status_change): New decls.
+        * process.c (create_process): Avoid disaster if memory is exhausted
+        while we're processing a vfork, by tightening the critical section
+        around the vfork.
+        (send_process_frame, process_sent_to, handle_pipe_signal)
+        (deliver_pipe_signal): Remove.  No longer needed, as Emacs now
+        ignores SIGPIPE.
+        (send_process): No need for setjmp/longjmp any more, since the
+        SIGPIPE stuff is now gone.  Instead, report an error if errno
+        is EPIPE.
+        (record_child_status_change): Now extern.  PID and W are now args.
+        Return void, not bool.  All callers changed.
+        * sysdep.c (wait_debugging) [(BSD_SYSTEM || HPUX) && !defined (__GNU__)]:
+        Remove.  All uses removed.  This bug should be fixed now in a
+        different way.
+        (wait_for_termination_1): Use waitpid rather than sigsuspend,
+        and record the child status change directly.  This avoids the
+        need to futz with the signal mask.
+        (process_fatal_action): Move here from emacs.c.
+        (emacs_sigaction_flags): New function, containing
+        much of what used to be in emacs_sigaction_init.
+        (emacs_sigaction_init): Use it.  Block nonfatal system signals that are
+        caught by emacs, to make races less likely.
+        (deliver_process_signal): Rename from handle_on_main_thread.
+        All uses changed.
+        (BACKTRACE_LIMIT_MAX): Now at top level.
+        (thread_backtrace_buffer, threadback_backtrace_pointers):
+        New static vars.
+        (deliver_thread_signal, deliver_fatal_thread_signal):
+        New functions, for more-accurate delivery of thread-specific signals.
+        (handle_fatal_signal, deliver_fatal_signal): Move here from emacs.c.
+        (deliver_arith_signal): Handle in this thread, not
+        in the main thread, since it's triggered by this thread.
+        (maybe_fatal_sig): New function.
+        (init_signals): New arg DUMPING so that we can be more accurate
+        about whether we're dumping.  Caller changed.
+        Treat thread-specific signals differently from process-general signals.
+        Block all signals while handling fatal error; that's safer.
+        xsignal from SIGFPE only on non-IEEE hosts, treating it as fatal
+        on IEEE hosts.
+        When batch, ignore SIGHUP, SIGINT, SIGTERM if they were already ignored.
+        Ignore SIGPIPE unless batch.
+        (emacs_backtrace): Output backtrace for the appropriate thread,
+        which is not necessarily the main thread.
+        * syssignal.h: Include <stdbool.h>.
+        (emacs_raise): New macro.
+        * xterm.c (x_connection_signal): Remove; no longer needed
+        now that we use sigaction.
+        (x_connection_closed): No need to mess with sigmask now.
+        (x_initialize): No need to reset SIGPIPE handler here, since
+        init_signals does this for us now.
+
+2012-09-23  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (ns_dumpglyphs_image): dr is a new rect to draw image into,
+        background rect may be larger (Bug#12245).
+
+2012-09-23  Chong Yidong  <cyd@gnu.org>
+
+        * keyboard.c (timer_check): Avoid quitting during Fcopy_sequence.
+
+2012-09-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * .gdbinit: Just stop at fatal_error_backtrace.
+        See Stefan Monnier's request in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00549.html>.
+        Remove no-longer-used query of system type.
+
+2012-09-22  Chong Yidong  <cyd@gnu.org>
+
+        * search.c (Freplace_match): Doc fix (Bug#12325).
+
+        * minibuf.c (Finternal_complete_buffer): Doc fix (Bug#12391).
+
+        * editfns.c (Fline_beginning_position): Doc fix (Bug#12416).
+        (Fline_end_position): Doc fix.
+
+        * cmds.c (Fforward_char, Fbackward_char): Doc fix (Bug#12414).
+
+2012-09-22  Chong Yidong  <cyd@gnu.org>
+
+        * dispextern.h (struct image_type): Add new slot, storing a type
+        initialization function.
+
+        * image.c (define_image_type): Call the image initializer function
+        if it is defined.  Arguments and return value changed.
+        (valid_image_p, make_image): Callers changed.
+        (xbm_type, xpm_type, pbm_type, png_type, jpeg_type, tiff_type)
+        (gif_type, imagemagick_type, svg_type, gs_type):
+        Add initialization functions.
+        (Finit_image_library): Call lookup_image_type.
+        (CHECK_LIB_AVAILABLE): Macro deleted.
+        (lookup_image_type): Call define_image_type here, rather than via
+        Finit_image_library, and without using CHECK_LIB_AVAILABLE.
+        (syms_of_image): Move define_image_type calls for xbm_type and
+        pbm_type to lookup_image_type.
+
+2012-09-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (timer_check_2): Move calculation of 'timers' and
+        'idle_timers' from here ...
+        (timer_check): ... to here.  Use Fcopy_sequence to copy the timer
+        lists, to avoid infloops when the timer does something stupid,
+        like reinvoke itself with the same or smaller time-out.
+        (Bug#12447)
+
+2012-09-22  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fsplit_window_internal): Handle only Qt value of
+        Vwindow_combination_limit separately.
+        (Qtemp_buffer_resize): New symbol.
+        (Vwindow_combination_limit): New default value.
+        Rewrite doc-string.
+
+2012-09-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (next_overlay_string): Initialize it->end_charpos for
+        the new overlay string.  (Bug#10159)
+
+2012-09-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * emacs.c (shut_down_emacs): Don't assume stderr is buffered,
+        or that fprintf is async-signal-safe.  POSIX doesn't require
+        either assumption.
+
+2012-09-22  Chong Yidong  <cyd@gnu.org>
+
+        * buffer.c (Fset_buffer_modified_p): Handle indirect buffers
+        (Bug#8207).
+
+2012-09-22  Kenichi Handa  <handa@gnu.org>
+
+        * composite.c (composition_reseat_it): Handle the case that a
+        grapheme cluster is not covered by a single font (Bug#12352).
+
+2012-09-21  Chong Yidong  <cyd@gnu.org>
+
+        * image.c (define_image_type): Avoid adding duplicate types to
+        image_types (Bug#12463).  Suggested by Jörg Walter.
+
+2012-09-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * unexmacosx.c: Define LC_DATA_IN_CODE if not defined.
+        (print_load_command_name): Add case LC_DATA_IN_CODE.
+        (dump_it) [LC_DATA_IN_CODE]: Call copy_linkedit_data.
+
+2012-09-21  Glenn Morris  <rgm@gnu.org>
+
+        * eval.c (Frun_hook_with_args_until_success)
+        (Frun_hook_with_args_until_failure): Doc fixes.  (Bug#12393)
+
+2012-09-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * fileio.c (Ffile_selinux_context): Only call freecon when
+        lgetfilecon succeeded.
+        (Fset_file_selinux_context): Likewise.  (Bug#12444)
+
+2012-09-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (try_window_reusing_current_matrix): Under bidi
+        reordering, locate the cursor by calling set_cursor_from_row; if
+        that fails, clear the desired glyph matrix before returning a
+        failure indication to the caller.  Fixes leaving garbled display
+        when fast scrolling with a down-key.  (Bug#12403)
+        (compute_stop_pos_backwards): Fix a typo that caused crashes while
+        scrolling through multibyte text.
+
 2012-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * alloc.c (mark_object) <PVEC_WINDOW>: Mark prev/next_buffers *after*
@@ -42,7 +566,7 @@
         (Fx_create_frame): Call x_set_offset to correctly interpret
         top_pos in geometry.
 
-        * frame.c (read_integer, XParseGeometry): Moved from w32xfns.c.
+        * frame.c (read_integer, XParseGeometry): Move from w32xfns.c.
         (Fx_parse_geometry): If there is a space in string, call
         Qns_parse_geometry, otherwise do as on other terms (Bug#12368).
 
@@ -131,7 +655,7 @@
         (clean): Simplify nextstep entry.
         * ns.mk: Remove file.
 
-2012-09-16  Kenichi Handa  <handa@gnu.org>
+2012-09-17  Kenichi Handa  <handa@gnu.org>
 
         * font.c (Ffont_shape_gstring): Fix previous change; GLYPHs may
         not covert the last few charactes.
@@ -143,8 +667,8 @@
 
 2012-09-16  Martin Rudalics  <rudalics@gmx.at>
 
-        * window.c (Fwindow_parameter, Fset_window_parameter): Accept
-        any window as argument (Bug#12452).
+        * window.c (Fwindow_parameter, Fset_window_parameter):
+        Accept any window as argument (Bug#12452).
 
 2012-09-16  Jan Djärv  <jan.h.d@swipnet.se>
 
@@ -219,8 +743,8 @@
 2012-09-14  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Avoid out-of-range marker position (Bug#12426).
-        * insdel.c (replace_range, replace_range_2): Adjust
-        markers before overlays, as suggested by comments.
+        * insdel.c (replace_range, replace_range_2):
+        Adjust markers before overlays, as suggested by comments.
         (insert_1_both, insert_from_buffer_1, adjust_after_replace):
         Remove redundant check before calling offset_intervals.
 
@@ -519,8 +1043,8 @@
         in the internal border.
         (x_set_window_size): Remove static variables and their usage.
         (ns_redraw_scroll_bars): Fix NSTRACE arg.
-        (ns_after_update_window_line, ns_draw_fringe_bitmap): Remove
-        fringe/internal border adjustment (Bug#11052).
+        (ns_after_update_window_line, ns_draw_fringe_bitmap):
+        Remove fringe/internal border adjustment (Bug#11052).
         (ns_draw_fringe_bitmap): Make code more like other terms (xterm.c).
         (ns_draw_window_cursor): Remove fringe/internal border adjustment.
         (ns_fix_rect_ibw): Remove.
@@ -737,8 +1261,8 @@
         (init_signals) [FORWARD_SIGNAL_TO_MAIN_THREAD]: Initialize it;
         code moved here from emacs.c's main function.
         * sysdep.c, syssignal.h (handle_on_main_thread): New function,
-        replacing the old SIGNAL_THREAD_CHECK.  All uses changed.  This
-        lets callers save and restore errno properly.
+        replacing the old SIGNAL_THREAD_CHECK.  All uses changed.
+        This lets callers save and restore errno properly.
 
 2012-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
 
@@ -1047,8 +1571,8 @@
         * process.c: Include TERM_HEADER instead of listing all possible
         window-system headers.
 
-        * nsterm.h: Remove declarations now in frame.h.  Define
-        FRAME_X_SCREEN, FRAME_X_VISUAL.
+        * nsterm.h: Remove declarations now in frame.h.
+        Define FRAME_X_SCREEN, FRAME_X_VISUAL.
 
         * menu.c: Include TERM_HEADER instead of listing all possible
         window-system headers.
@@ -1244,8 +1768,8 @@
 
         * nsterm.h (NSPanel): New class variable dialog_return.
 
-        * nsmenu.m (initWithContentRect:styleMask:backing:defer:): Initialize
-        dialog_return.
+        * nsmenu.m (initWithContentRect:styleMask:backing:defer:):
+        Initialize dialog_return.
         (windowShouldClose:): Use stop instead of stopModalWithCode.
         (clicked:): Ditto, and also set dialog_return (Bug#12258).
         (timeout_handler:): Use stop instead of abortModal.  Send a dummy