1 files changed, 2726 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b52d6c1dffe..8a3714bcf0d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,2696 @@
+2010-08-26  Kenichi Handa  <handa@m17n.org>
+
+        * xdisp.c (compute_stop_pos): Pay attention to bidi scan direction
+        on calling composition_compute_stop_pos.
+
+2010-08-25  Kenichi Handa  <handa@m17n.org>
+
+        * fontset.c (reorder_font_vector): Prefer a font-spec specifying
+        :otf.
+
+        * composite.c (composition_compute_stop_pos): Don't break
+        composition at PT.
+        (composition_reseat_it): Likewise.  Fix calculation of character
+        position starting a composition.
+        (Fcomposition_get_gstring): Don't limit the number of components
+        for automatic composition.
+
+2010-08-25  Kenichi Handa  <handa@m17n.org>
+
+        * composite.c (composition_compute_stop_pos): In forward search,
+        pay attention to the possibility that some character after ENDPOS
+        will be composed with charactrs before ENDPOS.
+
+2010-08-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keyboard.c (command_loop_1): Don't clobber primary selection
+        during handle-switch-frame (Bug#6872).
+
+2010-08-23  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c: Accept UNIX domain sockets as bus address.
+        (Fdbus_close_bus): New function.
+        (Vdbus_registered_buses): New variable.
+        (xd_initialize): Implement string as bus address.
+        (Fdbus_init_bus): Add bus to Vdbus_registered_buses).
+        (Fdbus_get_unique_name, Fdbus_call_method)
+        (Fdbus_call_method_asynchronously, Fdbus_method_return_internal)
+        (Fdbus_method_error_internal, Fdbus_send_signal)
+        (Fdbus_register_signal, Fdbus_register_method): Remove bus type
+        check.  This is done in xd_initialize_bus.  Adapt doc string, if
+        necessary.
+        (xd_pending_messages, xd_read_queued_messages): Loop over buses in
+        Vdbus_registered_buses.
+        (Vdbus_registered_objects_table): Create hash.
+
+2010-08-22  Juri Linkov  <juri@jurta.org>
+
+        * keyboard.c (Fexecute_extended_command): Move reading a command name
+        with `completing-read' to a new Elisp function `read-extended-command'.
+        Call it to read a command to `function'  (bug#5364, bug#5214).
+
+2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs.c (main): Remove handling of --unibyte arg (Bug#6886).
+
+2010-08-22  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP
+        instead of SAFE_ALLOCA.
+
+2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA
+        (Bug#6214).
+
+2010-08-22  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * doc.c (Fsnarf_documentation): Set skip_file only if p[1] is S.
+
+2010-08-22  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * doc.c (Fsnarf_documentation): Initialize skip_file before
+        build-files test.
+
+2010-08-22  Peter O'Gorman  <pogma@thewrittenword.com>  (tiny change)
+
+        * s/hpux10-20.h (HAVE_TERMIOS, NO_TERMIO, ORDINARY_LINK):
+        New definitions.
+        (HAVE_TERMIO): Remove.
+
+2010-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * deps.mk (sysdep.o, msdos.o): Depend on sysselect.h.
+
+        * sysselect.h [WINDOWSNT]: Don't define the FD_* and select stuff
+        for w32.
+
+        * s/ms-w32.h (HAVE_SYS_TIMEB_H): Don't #undef HAVE_SYS_SELECT_H,
+        it's done in nt/config.nt.
+
+        * makefile.w32-in ($(BLD)/sysdep.$(O)): Depend on sysselect.h.
+
+        * unexcoff.c (report_error, make_hdr, write_segment)
+        (copy_text_and_data, copy_sym, mark_x, adjust_lnnoptrs, unexec):
+        Convert argument lists and prototypes to ANSI C.
+        (make_hdr, write_segment): Remove unused variables.
+        (unexec): Remove commented-out line.  Initialize `new' to shut up
+        compiler warnings.
+
+2010-08-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Simplify termio code.
+        All non-MSDOS non-WINDOWSNT platforms define HAVE_TERMIOS, so
+        HAVE_TERMIO code is obsolete.
+        Replace HAVE_TERMIOS conditionals with !DOS_NT.
+        * systty.h: Do not define HAVE_TCATTR.
+        Remove HAVE_TERMIO, HAVE_LTCHARS and HAVE_TCHARS code.
+        Do not define EMACS_HAVE_TTY_PGRP.  Only define
+        EMACS_GET_TTY_PGRP for !DOS_NT.
+        * sysdep.c: Include sysselect.h unconditionally.  Do not include
+        sys/ioctl.h and termios.h, systty.h does it.  Use
+        HAVE_SYS_UTSNAME_H instead of USG as an include guard.
+        (init_baud_rate): Remove HAVE_TERMIO code.
+        (child_setup_tty): Remove HAVE_TERMIO code.
+        (emacs_get_tty, emacs_set_tty): Remove HAVE_TERMIO, HAVE_TCHARS
+        and HAVE_LTCHARS code.  Use !DOS_NT instead of HAVE_TCATTR.
+        (new_ltchars, new_tchars): Remove, unused.
+        (init_sys_modes): Remove HAVE_TERMIO, HAVE_TCHARS and HAVE_LTCHARS
+        code.  Remove special casing for __mips__, it was a no-op.  Remove
+        HAVE_TCATTR conditional, it is implied by HAVE_TERMIOS.
+        (init_sys_modes): Remove HPUX special case.
+        * process.c: Include stdlib.h unconditionally.  Do not include
+        fcntl.h, systty.h does it.  Remove conditional code for
+        HAVE_SERIAL, it is always true.
+        (process_send_signal): Remove HAVE_TERMIOS conditional, it's
+        always true when SIGNALS_VIA_CHARACTERS is true.
+        (Fcontinue_process, Fprocess_send_eof): Simplify conditionals:
+        !WINDOWSNT means HAVE_TERMIOS.
+        (create_process): Remove HAVE_TERMIOS, it's inside a HAVE_PTYS
+        conditional, which is true for all HAVE_TERMIOS systems.
+        * keyboard.c (init_keyboard): Do not use HAVE_TERMIO, use !DOS_NT
+        instead of HAVE_TERMIOS.
+        * emacs.c (shut_down_emacs): Use !defined DOS_NT instead of
+        EMACS_HAVE_TTY_PGRP.
+        * callproc.c (child_setup): Move EMACS_SET_TTY_PGRP use to the
+        non-MSDOS, non-WINDOWSNT code, it's only defined for such systems
+        anyway.
+
+2010-08-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (buffer_posn_from_coords): Fix off-by-one error in
+        mirroring pixel positions.
+
+2010-08-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * alloc.c (malloc_sbrk_used, malloc_sbrk_unused): Remove,
+        write only.
+        (init_alloc_once): Remove writes to malloc_sbrk_unused, and
+        malloc_sbrk_used, nothing uses them.
+
+        * puresize.h: Remove code assuming PNTR_COMPARISON_TYPE is not
+        defined, unconditionally defined in lisp.h.
+
+        * term.c: Do not include <termios.h>, systty.h does it.
+
+        * s/unixware.h (HAVE_TCATTR):
+        * s/aix4-2.h (HAVE_TCATTR): Remove definitions, not needed.
+        systty.h defines it when HAVE_TERMIOS is defined.
+
+2010-08-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (buffer_posn_from_coords): Fix last change for text
+        terminals: add one-character offset for R2L lines.
+
+        * emacs.c <emacs_version>: Add a comment regarding
+        msdos/mainmake.v2's dependency on the syntax of this declaration.
+
+2010-08-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (buffer_posn_from_coords): Fix calculation of buffer
+        position for R2L lines by mirroring the pixel position wrt the
+        text are box.  Improve commentary.
+
+2010-08-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * image.c (imagemagick_clear_image): Remove debugging output.
+
+2010-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * cmds.c (Vself_insert_face, Vself_insert_face_command): Remove.
+        (Qpost_self_insert_hook, Vpost_self_insert_hook): New vars.
+        (internal_self_insert): Run Qpost_self_insert_hook rather than handle
+        self-insert-face.
+        (syms_of_cmds): Initialize the new vars.
+
+2010-08-19  Jason Rumney  <jasonr@gnu.org>
+
+        * w32menu.c (set_frame_menubar): Remove call to undefined function.
+
+        * w32fns.c (w32_wnd_proc): Don't check context before initializing.
+
+2010-08-19  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".
+
+2010-08-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * xterm.c (x_draw_bar_cursor):
+        * w32term.c (x_draw_bar_cursor): If the character under cursor is
+        R2L, draw the bar cursor on its right rather than on its left.
+
+2010-08-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (Fdefmacro): Only obey one declaration.
+
+        * casefiddle.c (casify_region): Setup gl_state.
+
+2010-08-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (ns_define_frame_cursor): Call x_update_cursor (Bug#6868).
+
+2010-08-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (update_frame_tool_bar): Literal stings are const char*.
+
+2010-08-18  David De La Harpe Golden  <david@harpegolden.net>
+
+        * nsselect.m (QCLIPBOARD, NXPrimaryPboard): Define.
+        (symbol_to_nsstring): Map QCLIPBOARD => NSGeneralPboard,
+        QPRIMARY => NXPrimaryPboard.
+        (ns_string_to_symbol): NSGeneralPboard => QCLIPBOARD,
+        NXPrimaryPboard => QPRIMARY.
+        (nxatoms_of_nsselect): NXPrimaryPboard = PrimarySelection,
+        NXSecondaryPboard = SecondarySelection.
+        (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
+
+2010-08-18  Joakim Verona  <joakim@verona.se>
+
+        * image.c: Add support for ImageMagick.  When HAVE_IMAGEMAGICK is
+        defined:
+        (imagemagick_image_p): New function to test for ImageMagic image.
+        (imagemagick_load): New function to load ImageMagick image.
+        (imagemagick_load_image): New function, helper for imagemagick_load.
+        (imagemagick-types): New function.
+        (Qimagemagick): New Lisp_object.
+        (imagemagick-render-type): New variable, decides which renderer to use.
+
+2010-08-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL
+        is a string.
+
+2010-08-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m (ns_frame_parm_handlers): Add a slot for the
+        x_set_tool_bar_position handler.
+
+2010-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c <w32_frame_parm_handlers>: Add a slot for the
+        x_set_tool_bar_position handler, needed to support changes from
+        2010-07-29T16:49:59Z!jan.h.d@swipnet.se for positioning the tool bar.  (Bug#6796)
+
+2010-08-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsselect.m: include keyboard.h for QPRIMARY, remove its
+        declaration (Bug#6863).
+        (syms_of_nsselect): Don't intern QPRIMARY.
+
+        * xselect.c: Remove declaration of QPRIMARY (Bug#6864).
+
+        * keyboard.h (QPRIMARY): Declare (Bug#6864).
+
+2010-08-16  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keyboard.c (command_loop_1): Avoid setting selection twice,
+        since it's done in deactivate-mark as well.
+        (Vselect_active_regions): Change default to t.  Replace `lazy'
+        with non-default value `only', meaning only set PRIMARY for
+        temporarily active regions.
+
+        * insdel.c (prepare_to_modify_buffer): Handle `only' value of
+        select-active-regions.
+
+2010-08-15  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * keyboard.c (parse_tool_bar_item): Put in a bad label if :label
+        isn't a string.
+
+2010-08-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * keyboard.c (parse_tool_bar_item): Avoid excessive use of strlen.
+
+2010-08-15  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * keyboard.c (parse_tool_bar_item): malloc buf.
+        Set TOOL_BAR_ITEM_LABEL to empty string if not set to
+        new_lbl (Bug#6855).
+
+2010-08-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * xterm.c (x_draw_stretch_glyph_string):
+        * w32term.c (x_draw_stretch_glyph_string): In R2L rows, display
+        the cursor on the right edge of the stretch glyph.
+
+        * xdisp.c (window_box_right_offset, window_box_right):
+        Fix commentary.
+
+        * xdisp.c (Fcurrent_bidi_paragraph_direction): Fix paragraph
+        direction when point is inside a run of whitespace characters.
+
+        * bidi.c (bidi_at_paragraph_end): Remove obsolete comment.
+
+2010-08-14  Jason Rumney  <jasonr@gnu.org>
+
+        * keyboard.c (lispy_function_keys): Do not define VK_PACKET (bug#4836)
+
+2010-08-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * fns.c (Fmake_hash_table): Doc fix (Bug#6851).
+
+2010-08-13  Jason Rumney  <jasonr@gnu.org>
+
+        * w32menu.c (simple_dialog_show): Use unicode message box if available.
+        (MessageBoxW_Proc): New function typedef.
+        (unicode-message-box): New function pointer.
+        (globals_of_w32menu): Import it from user32.dll. (Bug#5629)
+
+2010-08-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * frame.h (Qtool_bar_position): Declare.
+
+        * xfns.c (Fx_create_frame): Call x_default_parameter for
+        Qtool_bar_position.
+
+2010-08-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * unexcoff.c: Remove the parts used when "emacs" is not defined.
+        (report_error, report_error_1): Ditto.
+        (write_segment): Remove "#if 0" unused code.
+        (make_hdr): Remove code that was "#ifndef NO_REMAP" before
+        NO_REMAP was removed (in 2010-07-29T03:25:08Z!dann@ics.uci.edu).
+        (start_of_text): Remove unused function (was used only if NO_REMAP
+        was NOT defined).
+
+        * msdos.c (IT_set_face): Fix format string to match argument
+        types.
+        (IT_write_glyphs, IT_note_mode_line_highlight)
+        (IT_set_frame_parameters): Remove unused variables.
+        (x_set_menu_bar_lines): Declare set_menu_bar_lines.
+        (IT_set_terminal_modes): Disambiguate expression in if clause.
+        (Fmsdos_remember_default_colors): Return Qnil.
+        (IT_set_frame_parameters): Add parens to disambiguate boolean
+        expression for logging the cursor type to termscript.
+        (keyboard_layout_list, keypad_translate_map)
+        (grey_key_translate_map): Add braces in inner initializers.
+        (dos_rawgetc): Add parens in condition for mouse-3 button-press.
+        (dos_rawgetc): Remove unused label.
+        (XMenuActivate): Add braces to remove ambiguous `else'.
+        (dos_ttraw): Always return a value.
+        (spawnve): Declare.
+        (run_msdos_command): Cast 3rd arg of spawnve to "char **".
+
+        * dosfns.h (x_set_title): Declare.
+
+        * w16select.c (Fw16_set_clipboard_data, Fw16_get_clipboard_data):
+        Remove unused variables.
+
+        * dosfns.c (Fint86, Fdos_memget, Fdos_memput): Remove unused
+        variables.
+        (init_dosfns): Declare get_lim_data.
+        (system_process_attributes): Declare Fget_internal_run_time.
+
+        * xmenu.c (xmenu_show) [!USE_X_TOOLKIT && !USE_GTK]: Fix argument
+        list to be consistent with menu.h.
+
+        * w32menu.c (add_menu_item, name_is_separator): Shut up compiler
+        warnings due to mixing of "char *" and "const char *".
+
+2010-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Introduce a new comment style "c" flag.
+        * syntax.c (SYNTAX_FLAGS_COMMENT_STYLEB)
+        (SYNTAX_FLAGS_COMMENT_STYLEC): New macros.
+        (SYNTAX_FLAGS_COMMENT_STYLE): Use them, add an argument.
+        (syntax_prefix_flag_p): New function.
+        (Fstring_to_syntax): Understand new "c" flag.
+        (Finternal_describe_syntax_value): Recognize new flag; use the
+        SYNTAX_FLAGS_* macros.
+        (scan_sexps_forward, Fparse_partial_sexp): Change representation of
+        comment style to accomodate the new styles.
+        (back_comment, forw_comment, Fforward_comment, scan_lists)
+        (scan_sexps_forward): Update code to obey the new comment style flag.
+
+        * syntax.h: Move SYNTAX_FLAGS_FOO() macros to syntax.c.
+
+        * casefiddle.c (casify_region): Use the new syntax_prefix_flag_p.
+
+2010-08-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (x_defined_color): If USE_GTK, call xg_check_special_colors
+        first.
+        (Fx_hide_tip): Check FRAME_LIVE_P (f) before calling xg_hide_tooltip.
+
+        * gtkutil.h (xg_check_special_colors): Declare.
+
+        * gtkutil.c (xg_check_special_colors, style_changed_cb): New functions.
+        (xg_create_frame_widgets): Connect theme name changes to
+        style_changed_cb.
+
+        * xterm.c (emacs_class): New char[] for EMACS_CLASS.
+        (xim_open_dpy, xim_initialize, xim_close_dpy): Use emacs_class.
+        (x_term_init): Use char[] display_opt and name_opt instead of
+        string literal. file is const char*.
+
+        * xsmfns.c (NOSPLASH_OPT): Change to char[].
+        (smc_save_yourself_CB): Do xstrdup on all ->type and ->name for
+        props.  Free them at the end.
+
+        * xselect.c (Fx_get_atom_name): Use char empty[] instead of literal "".
+
+        * xrdb.c (get_system_app): Make path const and use char *p for
+        non-const char.
+
+        * xmenu.c (Fx_popup_dialog): error_name is const char*.
+        (xmenu_show): error parameter is const char **. pane_string is const
+        char *.
+        (button_names): Is const char *.
+        (xdialog_show): error_name and pane_string is const.
+
+        * process.h (synch_process_death): Is const char*.
+
+        * w32menu.c (w32_menu_show):
+        * nsmenu.m (ns_menu_show): error parameter is const char **.
+
+        * menu.h (w32_menu_show, ns_menu_show, xmenu_show): error parameter
+        is const char **.
+
+        * menu.c (Fx_popup_menu): error_name is const.
+
+        * keyboard.h (_widget_value): Add defined USE_GTK.  Replace Boolean
+        with unsigned char and XtPointer with void *.
+
+        * gtkutil.h: Replace widget_value with struct _widget_value.
+        (enum button_type, struct _widget_value): Remove and use the one from
+        keyboard.h.
+
+        * gtkutil.c (get_utf8_string): Always return an allocated string.
+        Parameter is const.
+        (create_dialog, xg_create_one_menuitem, create_menus)
+        (xg_item_label_same_p, xg_update_menu_item): Free result from
+        get_utf8_string.
+        (xg_separator_p, xg_item_label_same_p): label is const.
+
+        * font.h (font_open_by_name): Make name const.
+
+        * font.c (font_open_by_name): Make name const.
+
+        * floatfns.c (matherr): Use a const char* variable for x->name.
+
+        * emacs.c (main): Pass char[] to putenv instead of literal.
+
+        * callproc.c (synch_process_death): Make const.
+        (Fcall_process): Make signame const.
+
+        * nsterm.h (parseKeyEquiv, addSubmenuWithTitle)
+        (addDisplayItemWithImage): Use const char*.
+
+        * nsmenu.m (parseKeyEquiv, addSubmenuWithTitle)
+        (addDisplayItemWithImage, update_frame_tool_bar): Use const char*.
+
+        * nsfont.m (ns_descriptor_to_entity): Use const char*.
+
+        * keyboard.h (_widget_value): name, value and key are const char*.
+
+        * unexmacosx.c (unexec_error): Use const char *.
+
+2010-08-09  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * font.h (font_parse_xlfd, font_parse_fcname, font_unparse_fcname)
+        (font_parse_name, font_open_by_name):
+        * font.c (font_parse_xlfd, font_parse_fcname, font_unparse_fcname)
+        (font_parse_name, font_open_by_name): Remove const.
+
+2010-08-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+        Use autoconf determined WORDS_BIGENDIAN instead of hardcoded
+        definition.
+
+        * m/alpha.h: Don't define/undef WORDS_BIG_ENDIAN.
+        * m/amdx86-64.h: Likewise.
+        * m/arm.h: Likewise.
+        * m/hp800.h: Likewise.
+        * m/ia64.h: Likewise.
+        * m/ibmrs6000.h: Likewise.
+        * m/ibms390.h: Likewise.
+        * m/intel386.h: Likewise.
+        * m/iris4d.h: Likewise.
+        * m/m68k.h: Likewise.
+        * m/macppc.h: Likewise.
+        * m/mips.h: Likewise.
+        * m/sh3.h: Likewise.
+        * m/sparc.h: Likewise.
+        * m/template.h: Likewise.
+        * m/vax.h: Likewise.
+        * m/xtensa.h: Likewise.
+        * fringe.c (init_fringe_bitmap): Test WORDS_BIGENDIAN instead of
+        WORDS_BIG_ENDIAN.
+        * lisp.h: Likewise.
+        * md5.c: Likewise.
+        * sound.c (le2hl, le2hs, be2hl, be2hs): Likewise.
+
+2010-08-09  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Use const char* instead of char*.
+        Reduce the number of warnings with -Wwrite-strings.
+        * xrdb.c (get_environ_db, get_system_name):
+        * unexelf.c (find_section):
+        * term.c (string_cost, string_cost_one_line, per_line_cost)
+        (get_named_tty, init_tty):
+        * sysdep.c (sys_subshell):
+        * sound.c (sound_perror, sound_warning, vox_open, vox_init)
+        (alsa_sound_perror, alsa_open, alsa_configure, alsa_init):
+        * search.c (Freplace_match):
+        * process.c (Fmake_network_process, send_process, init_process):
+        * lread.c (Fload, init_lread):
+        * keymap.c (Fdescribe_buffer_bindings, describe_map_tree):
+        * keyboard.c (parse_tool_bar_item, struct event_head):
+        * gtkutil.h (xg_get_font_name):
+        * gtkutil.c (get_dialog_title, create_dialog, xg_get_font_name)
+        (make_widget_for_menu_item, make_menu_item, create_menus)
+        (xg_make_tool_item):
+        * font.c (parse_matrix, font_parse_name):
+        * floatfns.c (rounding_driver, float_error_fn_name):
+        * filelock.c (get_boot_time_1, lock_file_1):
+        * fileio.c (barf_or_query_if_file_exists, check_writable):
+        * editfns.c (get_system_name, get_operating_system_release)
+        (Fencode_time, Fset_time_zone_rule):
+        * dispextern.h (string_cost, per_line_cost, get_named_tty, init_tty):
+        * buffer.c (defvar_per_buffer): Use const.
+
+2010-08-08  Kenichi Handa  <handa@m17n.org>
+
+        * charset.c: Include <stdlib.h>.
+        (struct charset_sort_data): New struct.
+        (charset_compare): New function.
+        (Fsort_charsets): New function.
+        (syms_of_charset): Declare Fsort_charsets as a Lisp function.
+
+        * coding.c (decode_coding_iso_2022): Fix checking of dimension
+        number in CTEXT extended segment.
+
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32fns.c (syms_of_w32fns) <x-max-tooltip-size>: Fix typo in docstring.
+        * xfns.c (syms_of_xfns) <x-max-tooltip-size>: Reflow docstring.
+
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * fns.c (Fsubstring_no_properties, Fnthcdr, Ffeaturep)
+        (Fhash_table_size): Fix typos in docstrings.
+        (Fmake_hash_table): Doc fix.
+
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuf.c (syms_of_minibuf) <read-buffer-function>:
+        Doc fix (bug#5625).
+
+2010-08-08  Ken Brown  <kbrown@cornell.edu>
+
+        * dired.c (DIRENTRY_NONEMPTY) [cygwin]: Use d_ino instead of
+        the MSDOS definition.
+
+2010-08-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Use const char* instead of char*.
+        * xterm.c (x_create_toolkit_scroll_bar):
+        * xfont.c (xfont_list_pattern):
+        * xfns.c (x_default_scroll_bar_color_parameter)
+        (xic_create_fontsetname, x_default_font_parameter)
+        (x_screen_planes):
+        * xdisp.c (c_string_pos, number_of_chars, reseat_to_string)
+        (store_mode_line_string, decode_mode_spec, display_string):
+        * menu.c (digest_single_submenu):
+        * keymap.h (initial_define_key, initial_define_lispy_key):
+        * keymap.c (initial_define_key, initial_define_lispy_key):
+        * image.c (image_error, image_keyword):
+        * gtkutil.h (xg_create_widget, xg_create_scroll_bar):
+        * gtkutil.c (xg_create_widget, xg_create_scroll_bar):
+        * ftfont.c (struct fc_charset_table, ftfont_spec_pattern)
+        (ftfont_list, ftfont_match):
+        * frame.c (frame_parm_table):
+        * font.h (font_intern_prop, font_parse_xlfd, font_parse_fcname)
+        (font_unparse_fcname, font_unparse_fcname, font_open_by_name)
+        (font_add_log, font_deferred_log):
+        * font.c (font_intern_prop, font_parse_xlfd, font_parse_fcname)
+        (font_unparse_fcname, font_unparse_fcname, font_open_by_name)
+        (font_add_log, font_deferred_log):
+        * emacs.c (argmatch):
+        * dispextern.h (struct it):
+        * coding.c (ENCODE_DESIGNATION):
+        * charset.c (define_charset_internal): Use const.
+
+        * s/freebsd.h (DECLARE_GETPWUID_WITH_UID_T): Remove, unused.
+
+        * xrdb.c: Remove include guard.
+        Remove DECLARE_GETPWUID_WITH_UID_T conditional it had no effect.
+        Remove #if 0 code.  Replace malloc->xmalloc, free->xfree,
+        realloc->xrealloc instead of using #defines.
+
+2010-08-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * cmds.c (Fforward_line, Fbeginning_of_line, Fend_of_line):
+        * editfns.c (Fline_beginning_position, Fline_end_position):
+        State in the doc strings that start and end of line are in the
+        logical order.
+
+        * xdisp.c (display_line): Move the handling of overlay arrow after
+        the call to find_row_edges.  (Bug#6699)
+
+2010-08-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keyboard.c (command_loop_1):
+        * insdel.c (prepare_to_modify_buffer): Don't call validate_region.
+
+2010-08-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * insdel.c (prepare_to_modify_buffer): Save active region text to
+        Vsaved_region_selection.
+
+        * xselect.c (QPRIMARY): Move to keyboard.c.
+
+        * keyboard.c (Vselect_active_regions): Move from simple.el.
+        (Vsaved_region_selection, Qx_set_selection, QPRIMARY, Qlazy): New vars.
+        (command_loop_1): Set window selection prior to deactivating the mark.
+
+2010-08-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * alloc.c (lisp_malloc):
+        * buffer.c (set_buffer_internal, set_buffer_internal_1):
+        * charset.h (emacs_mule_charset):
+        * dispextern.h (inhibit_free_realized_faces, redraw_frame)
+        (redraw_garbaged_frames, scroll_cost, update_frame, scrolling)
+        (bitch_at_user):
+        * lisp.h (Fcheck_coding_system, Fget_text_property)
+        (Qfunction, Qcompletion_ignore_case, QCwidth, QCsize):
+        Remove duplicate declarations.
+
+2010-08-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * process.c: Simplify include logic.
+
+        * keyboard.h (quit_char): Add declaration.
+        * process.h (QCport, QCspeed, QCprocess, QCbytesize, QCstopbits)
+        (QCparity, Qodd, Qeven, QCflowcontrol, Qhw, Qsw, QCsummary):
+        Add declarations.
+        * sysdep.c:
+        * w32.c: Remove the above declarations.
+
+        Remove extern declarations in .c files, .h files have them.
+        * xterm.c:
+        * xdisp.c:
+        * msdos.c:
+        * image.c:
+        * gtkutil.c:
+        * fileio.c:
+        * eval.c: Remove declarations.
+
+        * frame.c (frame_params): Make const.
+
+        * lisp.h (fatal_error_signal, emacs_root_dir): Add declaration.
+
+        * emacs.c (emacs_copyright, emacs_version): Make static.
+        (Vinitial_window_system, Vauto_save_list_file_name)
+        (Vinhibit_redisplay): Remove declarations.
+        (main): Remove HAVE_SHM code, unused.  Remove _I386 conditional
+        for AIX.
+
+        Use const for some arrays and functions.
+        * xterm.h (xg_set_icon_from_xpm_data):
+        * xfns.c (xg_set_icon_from_xpm_data):
+        * term.c (fkeys):
+        * keyboard.c (lispy_accent_keys, lispy_function_keys)
+        (lispy_multimedia_keys, lispy_kana_keys, iso_lispy_function_keys)
+        (lispy_drag_n_drop_names, scroll_bar_parts, modify_event_symbol)
+        (frame.c frame_parms):
+        * emacs-icon.h (gnu_xpm_bits):
+        * callint.c (callint_argfuns): Use const.
+
+2010-08-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * sysdep.c: Move include term.h last of includes (Bug#6812).
+
+2010-08-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (realloc_glyph_pool): Zero out newly allocated glyphs.
+
+        * msdos.c (IT_display_cursor): Log cursor position on termscript.
+
+        * .gdbinit (pgx): Display the avoid_cursor_p flag.
+
+2010-08-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/xdisp.$(O)): Update dependencies.
+
+2010-08-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.h (x_get_focus_frame): Declare.
+
+        * keyboard.h (poll_for_input_1): Unconditionally declare.
+
+        * nsterm.h (x_set_menu_bar_lines): Declare.
+
+        * window.c: Don't include menu.h, it depends on lots of other .h-files.
+
+        * xfaces.c (x_create_gc, x_free_gc): Convert to ANSI C prototypes.
+
+        * window.c: Include menu.h.
+
+        * unexmacosx.c (print_region_list, print_regions)
+        (build_region_list, find_emacs_zone_regions)
+        (unexec_regions_merge, read_load_commands, dump_it)
+        (unexec_init_emacs_zone): Convert to ANSI C prototypes.
+
+        * term.c: Check HAVE_SYS_IOCTL_H.
+
+        * sysdep.c: Check HAVE_TERM_H.
+
+        * process.c: Check HAVE_UTIL_H.  Include nsterm.h if HAVE_NS.
+
+        * nsterm.m (ns_init_paths, ns_alloc_autorelease_pool)
+        (ns_ring_bell, ns_defined_color, hide_hourglass)
+        (x_display_pixel_height, x_display_pixel_width, syms_of_nsterm):
+        Convert to ANSI C prototypes.
+        (x_set_window_size, ns_draw_fringe_bitmap, judge): Move declarations
+        before code.
+
+        * nsterm.h : Include sysselect.h.
+        (x_sync, x_get_focus_frame, x_set_mouse_position)
+        (x_set_mouse_pixel_position, x_make_frame_visible)
+        (x_make_frame_invisible, x_iconify_frame, x_char_width, x_char_height)
+        (x_pixel_width, x_pixel_height, x_set_frame_alpha, x_set_tool_bar_lines)
+        (x_activate_menubar, free_frame_menubar, ns_init_paths, ns_select)
+        (syms_of_nsterm, syms_of_nsfns, syms_of_nsmenu, syms_of_nsselect):
+        Declare.
+
+        * nsmenu.m (popup_activated, name_is_separator)
+        (syms_of_nsmenu): Convert to ANSI C prototypes.
+        (runMenuAt): Prototypes and move declarations before code.
+
+        * nsimage.m (ns_load_image): Move NSTRACE after declarations.
+
+        * nsfont.m (ns_fallback_entity, syms_of_nsfont): Convert to ANSI C
+        prototypes.
+
+        * nsfns.m (have_menus_p, ns_display_info_for_name)
+        (x_set_cursor_type, ns_appkit_version_str)
+        (ns_appkit_version_int, ns_do_applescript)
+        (x_set_scroll_bar_default_width, x_sync, compute_tip_xy)
+        (syms_of_nsfns): Convert to ANSI C prototypes.
+
+        * menu.h (x_set_menu_bar_line): Declare.
+        (free_menubar_widget_value_tree et.al): Add HAVE_NS for these functions.
+
+        * lisp.h (fmod_float): Declare.
+
+        * image.c (xpm_scan, xpm_make_color_table_v)
+        (xpm_put_color_table_v, xpm_get_color_table_v)
+        (xpm_make_color_table_h, xpm_put_color_table_h)
+        (xpm_get_color_table_h, xpm_str_to_color_key, xpm_load_image)
+        (xpm_load): Convert to ANSI C prototypes.
+
+        * emacs.c: Include nsterm.h if HAVE_NS.
+
+        * bidi.c (bidi_dump_cached_states): Fix fprintf warning.
+
+2010-08-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * process.c: Remove HAVE_SOCKETS #ifdefs inside #ifdef
+        subprocesses, only MSDOS does not define HAVE_SOCKETS.
+        (socket_options): Use const char* for name.
+
+2010-08-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        Fix changes in 2010-08-05T23:15:24Z!dann@ics.uci.edu..2010-08-05T23:34:12Z!dann@ics.uci.edu for Windows build.
+
+        * xmenu.c [USE_X_TOOLKIT || USE_GTK]:
+        Don't declare xmalloc_widget_value and digest_single_submenu.
+
+        * w32font.c (Qlatin): Remove declaration.
+
+        * menu.h (xmalloc_widget_value, digest_single_submenu): Declare.
+
+        * dired.c (compile_pattern): Restore declaration.
+
+2010-08-05  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Remove extern declarations in .c files, .h files have them.
+        * data.c:
+        * dired.c:
+        * editfns.c:
+        * filelock.c:
+        * fns.c:
+        * font.c:
+        * fontset.c:
+        * frame.c:
+        * fringe.c:
+        * ftfont.c:
+        * gtkutil.c:
+        * indent.c:
+        * keyboard.c:
+        * keymap.c:
+        * lread.c:
+        * menu.c:
+        * print.c:
+        * search.c:
+        * sound.c:
+        * window.c:
+        * xdisp.c:
+        * xfaces.c:
+        * xfns.c:
+        * xfont.c:
+        * xftfont.c:
+        * xmenu.c:
+        * xterm.c: Remove declarations.
+
+        Cleanup syssignal.h.
+        * syssignal.h (sighold, sigrelse, RETSIGTYPE): Remove, unused.
+        (main_thread): Move down to remove #ifdef.
+        (SIGMASKTYPE, SIGEMPTYMASK, SIGFULLMASK, sigmask, sigunblock):
+        Remove conditional definition following unconditional ones.
+
+        * lisp.h: Remove HAVE_SHM code, unused.
+        (QCmap, QCrehash_size, QCrehash_threshold, QCsize, QCtest)
+        (QCweakness, Qabove_handle, Qbackquote, Qbar, Qbelow_handle)
+        (Qborder, Qbottom, Qbox, Qcircular_list, Qcomma, Qcomma_at)
+        (Qcomma_dot, Qcursor, Qdefault, Qdown, Qend_scroll, Qeq, Qeql)
+        (Qequal, Qfile_exists_p, Qfont_param, Qfringe, Qfunction)
+        (Qfunction_documentation, Qhandle, Qhbar, Qheader_line, Qhollow)
+        (Qidentity, Qleft_margin, Qmenu, Qmenu_bar_update_hook)
+        (Qmode_line_inactive, Qmouse, Qoverriding_local_map)
+        (Qoverriding_terminal_local_map, Qratio, Qregion, Qright_margin)
+        (Qscroll_bar, Qtool_bar, Qtop, Qup, Qvertical_border, Qwhen)
+        (Qwindow_scroll_functions, Vafter_load_alist)
+        (Vauto_save_list_file_name, Vface_alternative_font_family_alist)
+        (Vface_alternative_font_registry_alist, Vface_font_rescale_alist)
+        (Vface_ignored_fonts, Vinhibit_redisplay, Vminibuffer_list)
+        (Vprint_length, Vprint_level, Vscalable_fonts_allowed)
+        (Vshell_file_name, Vsystem_name, Vwindow_scroll_functions)
+        (Vwindow_system_version, Vx_no_window_manager, initial_argc)
+        (initial_argv, last_nonmenu_event, load_in_progress)
+        (noninteractive_need_newline, scroll_margin): Add declarations.
+
+        * keyboard.h (xmalloc_widget_value, digest_single_submenu): Remove
+        declarations, menu.h has them.
+        (QCbutton, QCtoggle, QCradio, QClabel, extra_keyboard_modifiers)
+        (Vinput_method_function, Qinput_method_function)
+        (Qevent_symbol_element_mask, last_event_timestamp):
+        * dispextern.h (Voverflow_newline_into_fringe):
+        * font.h (QCantialias, Qp, syms_of_ftfont, syms_of_xfns)
+        (syms_of_ftxfont, syms_of_xftfont, syms_of_bdffont)
+        (syms_of_w32font, syms_of_nsfont):
+        * fontset.h (find_font_encoding, Qlatin):
+        * frame.h (Qtooltip, Qrun_hook_with_args, Vmenu_bar_mode)
+        (Vtool_bar_mode, set_frame_menubar):
+        * ftfont.h (ftfont_font_format, ftfont_get_fc_charset):
+        * xterm.h (Qx_gtk_map_stock):
+        * keymap.h (meta_prefix_char): Add declarations.
+
+        * term.c: Remove dead code.
+
+        Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux.
+        * term.c (dissociate_if_controlling_tty): Use USG5 instead of
+        USG.  This is equivalent to defined (USG) && !defined (BSD_PGRPS),
+        which is what was there before BSD_PGRPS was removed.
+
+2010-08-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * deps.mk (unexcoff.o): Rename unexec.[co] => unexcoff.[co].
+
+        * unexcoff.c: Renamed from unexec.c.
+
+2010-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * sysdep.c (child_setup_tty): Comment-out left-over non-ICANON code.
+
+2010-08-03  Johan Bockgård  <bojohan@gnu.org>
+
+        * data.c (Flocal_variable_p): Handle variable aliases correctly.
+        (Bug#6744)
+
+2010-08-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_create_toolkit_scroll_bar): Only set XtNbeNiceToColormap
+        to TRUE if depth of screen is < 16.
+
+        * gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless
+        USE_GTK_TOOLTIP.
+        (xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP.
+        (xg_show_tooltip, xg_hide_tooltip): Do nothing unless USE_GTK_TOOLTIP.
+        (xg_create_frame_widgets): Surround tooltip-related code with ifdef
+        USE_GTK_TOOLTIP.
+        (xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP.
+
+        * xterm.h (USE_GTK_TOOLTIP): New define.
+        (struct x_output): Put ttip_* inside ifdef USE_GTK_TOOLTIP.
+
+        * sysdep.c (child_setup_tty): Enable ICANON in lflags and set VEOF
+        to Control-D (Bug#6771).
+
+2010-08-02  Juanma Barranquero  <lekktu@gmail.com>
+
+        * editfns.c (Fregion_beginning, Fregion_end): Doc fixes (bug#6493).
+        Wording by Drew Adams <drew.adams@oracle.com>.
+
+2010-08-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.h (struct x_output): Add ttip_widget, ttip_window and
+        ttip_lbl.
+
+        * xterm.c (x_clear_frame): Check FRAME_GTK_WIDGET (f) before
+        calling gtk_widget_queue_draw.
+        (x_free_frame_resources): Call xg_free_frame_widgets.
+
+        * xfns.c (x_gtk_use_system_tooltips): New variable.
+        (Fx_show_tip): If USE_GTK and x_gtk_use_system_tooltips, call
+        new gtkutil tooltip functions to show the tooltip.
+        (Fx_hide_tip): Call xg_hide_tooltip.
+        (syms_of_xfns): Defvar x-gtk-use-system-tooltips.
+
+        * gtkutil.h (xg_free_frame_widgets, xg_prepare_tooltip)
+        (xg_show_tooltip, xg_hide_tooltip): Declare.
+
+        * gtkutil.c (hierarchy_ch_cb, qttip_cb, xg_prepare_tooltip)
+        (xg_show_tooltip, xg_hide_tooltip, xg_free_frame_widgets):
+        New functions.
+        (xg_create_frame_widgets): Set ttip_* to 0.  Set a dummy tooltip
+        text so qttip_cb is called.  Connect query-tooltip to qttip_cb.
+        Remove code that is commented out.
+
+2010-08-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fdefine_key, Flookup_key): Say what event is invalid.
+
+2010-07-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xselect.c (x_own_selection): Use list4.
+
+2010-07-30  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * buffer.c (Qwindow): Do not define, already defined in data.c.
+        (syms_of_buffer): Do not intern and staticpro Qwindow.  (Bug#6760)
+
+2010-07-29  Chad Brown  <yandros@mit.edu>
+
+        Replace tests for SYSV_SYSTEM_DIR with HAVE_DIRENT_H, set via autoconf.
+        * dired.c, sysdep.c: Test HAVE_DIRENT_H instead of SYSV_SYSTEM_DIR.
+        * config.in: Undef HAVE_DIRENT_H.
+        * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/gnu-linux.h,
+        * s/msdos.h, s/usg5-4.h: Don't define SYSV_SYSTEM_DIR.
+
+2010-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Rename s/usg5-4.h -> s/usg5-4-common.h.
+        * s/usg5-4.h: Rename file to ...
+        * s/usg5-4-common.h: ... this for consistency with what we do for BSD.
+        * s/unixware.h:
+        * s/sol2-6.h:
+        * s/irix6-5.h: Update includes accordingly.
+
+2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (x_set_tool_bar_position): Remove debug fprintf.
+
+        * xterm.h (struct x_output): Add toolbar_top_height,
+        toolbar_bottom_height, toolbar_left_width, toolbar_right_width.
+        Remove toolbar_height.
+        If USE_GTK: Add hbox_widget and toolbar_in_hbox.
+        (FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
+        (FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
+        (FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
+
+        * xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
+
+        * xfns.c (x_set_tool_bar_position): New function.
+        (xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
+        (x_frame_parm_handlers): Add x_set_tool_bar_position.
+        (syms_of_xfns): If USE_GTK, provide move-toolbar.
+
+        * window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
+        and FRAME_TOOLBAR_LEFT_WIDTH.
+
+        * gtkutil.h (xg_change_toolbar_position): Declare.
+
+        * gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
+        (xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
+        (xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
+        (xg_create_frame_widgets): Create a hobox for placing widgets
+        vertically.  Use gtk_box_pack_start.
+        (xg_height_or_width_changed): Renamed from xg_height_changed.
+        (x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
+        (xg_update_frame_menubar, free_frame_menubar): Change to
+        xg_height_or_width_changed.
+        (xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
+        size correctly.  Remove hardcoded 4, instead use handlebox size -
+        toolbar size.
+        (xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
+        size correctly.  Use handlebox size + toolbar size as additional size.
+        (xg_pack_tool_bar): POS is a new parameter.
+        Set orientation of tool bar based on pos.
+        Only make handlebox_widget if NULL.
+        Check if tool bar goes to vbox or hbox depending on pos.
+        (xg_update_tool_bar_sizes): New function.
+        (update_frame_tool_bar): Remove old_req, new_req.  Do not get tool bar
+        height, call xg_update_tool_bar_sizes instead.
+        (free_frame_tool_bar): Remove from hbox or vbox depending on
+        toolbar_in_hbox,  Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
+        (xg_change_toolbar_position): New function.
+
+        * frame.h (struct frame): Add tool_bar_position.
+        (Qbottom): Declare.
+
+        * frame.c (Qtool_bar_position): New variable.
+        (make_frame): Set tool_bar_position to Qtop.
+        (frame_parms): Add tool-bar-position.
+        (x_report_frame_params): Store tool_bar_position.
+        (x_set_fringe_width): Reset wm size hint after fringe changes.
+
+2010-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Make lisp_time_argument declaration work on all systems.
+        * lisp.h (lisp_time_argument): Move declaration ...
+        * systime.h (lisp_time_argument): ... here
+        * editfns.c (lisp_time_argument): Remove declaration.  (Bug#6751)
+
+2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * vm-limit.c (POINTER): Add typedef for it.
+        (start_of_data): Change return type from POINTER to char *.
+
+        * frame.h (Qtty_color_mode): Move declaration out of ifdef
+        HAVE_WINDOW_SYSTEM.
+
+2010-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vm-limit.c: Do not include sys/resource.h, mem-limits.h does it.
+        Remove reference to __osf__, unused.
+
+        * mem-limits.h: Remove duplicated includes.
+        (NULL): Remove definition, unused.
+        (POINTER): Remove definition.
+        (start_of_data): Use char* in prototype, as the function
+        definition does.
+
+        Remove extern declarations from .c files, and them to .h files.
+        * keyboard.h (Qhelp_echo, waiting_for_input)
+        (input_available_clear_time, ignore_mouse_drag_p)
+        (Vdouble_click_time, real_this_command, Vthis_original_command):
+        * keymap.h (Qremap, Qmenu_item, Voverriding_local_map)
+        (Voverriding_local_map_menu_flag):
+        * lisp.h (Qinteractive_form, use_file_dialog)
+        (Qcursor_in_echo_area, QCascent, QCmargin, QCrelief, Qcount)
+        (Qextension_data, QCconversion, QCcolor_symbols, QCheuristic_mask)
+        (QCindex, QCmatrix, QCcolor_adjustment, QCmask)
+        (Qrisky_local_variable, map_char_table_for_charset, Vprint_level)
+        (Qfunction, debug_on_next_call, Qfield)
+        (Vinhibit_field_text_motion, Vuser_login_name, lisp_time_argument)
+        (Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string)
+        (Qfile_directory_p, Qinsert_file_contents)
+        (Qcompletion_ignore_case, Qcompletion_ignore_case)
+        (Vcompletion_regexp_list, Vhistory_length, completion_ignore_case)
+        (history_delete_duplicates, minibuffer_auto_raise, Qonly)
+        (Qfile_name_handler_alist, Qfront_sticky, Qrear_nonsticky)
+        (Qminibuffer_prompt)
+        (Vtemporary_file_directory,char_ins_del_vector, Qface):
+        * xterm.h (gray_bitmap_width, gray_bitmap_height)
+        (gray_bitmap_bits, xic_create_fontsetname):
+        * coding.h (Vtranslation_table_for_input): Add extern declarations.
+
+        * xsmfns.c (Vuser_login_name):
+        * xrdb.c (Vdouble_click_time):
+        * xfaces.c (xic_create_fontsetname):
+        * w32select.c (waiting_for_input):
+        * print.c (minibuffer_auto_raise):
+        * msdos.c (Qhelp_echo):
+        * macros.c (real_this_command):
+        * keymap.c (Voverriding_local_map):
+        * xterm.c (poll_for_input_1, gray_bitmap_width)
+        (gray_bitmap_height, gray_bitmap_bits;
+        * xmenu.c ( Voverriding_local_map)
+        (Voverriding_local_map_menu_flag; Qmenu_item; use_dialog_box)
+        (use_file_dialog, Xt_app_con):
+        * xdisp.c (minibuffer_auto_raise, Voverriding_local_map)
+        (Voverriding_local_map_menu_flag, Qmenu_item, Qface, Qinvisible)
+        (Qwidth, Qinvisible, Qwindow, Qpriority, Qtool_bar_lines)
+        (Qtool_bar_lines, ignore_mouse_drag_p):
+        * minibuf.c (Voverriding_local_map, Qfield, Qfront_sticky)
+        (Qrear_nonsticky, nconc2):
+        * keyboard.c (current_global_map, minibuf_level, Qmenu_item)
+        (Vhistory_length, Vtranslation_table_for_input, Qcomposition)
+        (Qdisplay, Qafter_string, Qbefore_string, Qundefined):
+        * fileio.c (use_dialog_box, use_file_dialog, Vuser_login_name)
+        (minibuf_level, minibuffer_auto_raise, lisp_time_argument):
+        * eval.c (Qinteractive_form, Qrisky_local_variable, Qfunction)
+        (gc_in_progress):
+        * doc.c (Voverriding_local_map, Qremap):
+        * dired.c (completion_ignore_case, Qcompletion_ignore_case)
+        (Vcompletion_regexp_list):
+        * coding.c (Qmac, Qinsert_file_contents, Qwrite_region)
+        (Qcompletion_ignore_case):
+        * callint.c (Qcursor_in_echo_area, Qfile_directory_p, Qonly)
+        (Vhistory_length, Vthis_original_command, real_this_command)
+        (Qface, Qminibuffer_prompt, history_delete_duplicates):
+        * image.c (Qrisky_local_variable):
+        * fontset.c (QCname):
+        * fns.c (minibuffer_auto_raise, QCname):
+        * dispnew.c (char_ins_del_cost):
+        * composite.c (font_fill_lglyph_metrics):
+        * cmds.c (Qface, Vtranslation_table_for_input):
+        * charset.c (map_char_table_for_charset, Qfile_name_handler_alist):
+        * ccl.c (charset_unicode):
+        * callproc.c (Vtemporary_file_directory):
+        * buffer.c (emacs_strerror): Remove extern declarations.
+
+        * data.c (Qwindow): Make non-static, used from other files too.
+        * frame.c (validate_x_resource_name): Remove shadow definition for i.
+
+        * unexec.c (make_hdr): Remove references to NO_REMAP, COFF,
+        SEGMENT_MASK, SECTION_ALIGNMENT, ADJUST_EXEC_HEADER.
+        * s/usg5-4.h (COFF):
+        * s/template.h:
+        * s/msdos.h (COFF, NO_REMAP):
+        * s/ms-w32.h (NO_REMAP):
+        * s/hpux10-20.h (NO_REMAP):
+        * m/sparc.h (SEGMENT_MASK):
+        * m/m68k.h (NO_REMAP):
+        * m/intel386.h (SEGMENT_MASK):
+        * m/arm.h (NO_REMAP):
+        * m/alpha.h (COFF):
+        * m/template.h: Remove references to unused defines.
+
+2010-07-28  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c (Ftool_bar_get_system_style): Also check for
+        Qtext_image_horiz.
+
+        * xdisp.c (Qtext_image_horiz): Define.
+        (syms_of_xdisp): Initialize Qtext_image_horiz.  Add text-image-horiz
+        to documentation of tool-bar-style.
+
+        * lisp.h (Qtext_image_horiz): Declare.
+
+        * gtkutil.c (xg_make_tool_item, xg_show_toolbar_item): Handle tool bar
+        style text_image_horiz.
+
+2010-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacs.c (Fkill_emacs): Remove return statement.
+
+        * term.c (Qspace, QCalign_to, QCwidth): Remove declarations.
+        (encode_terminal_code, produce_composite_glyph): Remove unused variables.
+        (set_tty_color_mode, term_mouse_highlight, term_get_fkeys): Remove
+        local extern declarations.
+
+        * xmenu.c: Do not included lwlib.h, not needed.
+
+        * m/iris4d.h (XUINT, XSET): Remove, not needed.
+
+        * process.c: Move definitions earlier to minimize #ifdefs.
+
+        * xterm.h (x_get_customization_string, x_load_resources)
+        (x_get_resource, x_text_icon, x_text_icon, x_check_errors)
+        (x_check_errors, x_property_data_to_lisp, defined_color)
+        (xic_set_xfontset, x_defined_color): Use const.
+
+        * xterm.c (xlwmenu_window_p, xlwmenu_redisplay): Remove declarations.
+        (x_text_icon, x_check_errors, x_connection_closed): Use const.
+
+        * xselect.c (selection_data_to_lisp_data)
+        (x_property_data_to_lisp):
+        * xrdb.c (x_get_string_resource, file_p)
+        (x_get_customization_string, magic_file_p, search_magic_path)
+        (get_system_app, get_user_app, x_load_resources, x_get_resource)
+        (x_get_string_resource): Use const.
+
+        * xfns.c: Include xlwmenu.h when USE_LUCID.
+        (x_defined_color, xic_set_xfontset): Use const.
+        (Fx_hide_tip): Remove local extern declaration.
+
+        * xfaces.c (Qmouse_face): Remove declaration.
+        (face_color_gray_p, tty_defined_color, defined_color)
+        (face_color_gray_p, face_color_supported_p): Add const.
+
+        * xdisp.c (do_mouse_tracking): Remove declaration.
+        (add_to_log): Use const.
+
+        * minibuf.c (Qmouse_face): Remove declaration.
+
+        * msdos.c (IT_note_mouse_highlight): Remove local extern declaration.
+
+        * keyboard.h (do_mouse_tracking): Add declaration.
+
+        * image.c (QCwidth, QCheight, QCforeground, QCbackground, QCfile)
+        (QCdata, QCtype, Qcenter): Remove declarations.
+
+        * frame.c (x_get_resource_string, x_get_string_resource)
+        (x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg)
+        (x_default_parameter): Use const.
+
+        * font.c (Qnormal, QCtype, QCfamily, QCweight, QCslant, QCwidth)
+        (QCheight, QCsize, QCname): Remove declarations.
+
+        * emacs.c (main): Remove local extern declaration.
+
+        * editfns.c (region_limit, syms_of_editfns): Remove local extern
+        declarations.
+
+        * dispnew.c: Remove duplicate #include <unistd.h>.
+        (update_window, update_frame_1, init_display): Remove local extern
+        declarations.
+
+        * dispextern.h (add_to_log): Remove declaration.
+        (x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg)
+        (x_frame_get_and_record_arg, x_default_parameter): Add const.
+
+        * dired.c (scmp): Add const.
+        (directory_files_internal): Remove local extern declaration.
+
+        * data.c (Finteractive_form): Use const.
+
+        * composite.c (syms_of_composite): Remove local extern declarations.
+
+        * charset.c (add_to_log): Remove declaration.
+
+        * character.c (strwidth, parse_str_to_multibyte): Add const.
+
+        * character.h (strwidth, parse_str_to_multibyte): Likewise.
+
+        * buffer.c (Fset_buffer_multibyte): Remove local extern declaration.
+
+        * lisp.h (Fkill_emacs): Mark as NO_RETURN.
+        (Lisp_Subr): Make doc and intspec constant.
+        (QCsize, Qspace, Qcenter, QCalign_to, QCdata, QCfile, QCtype)
+        (Qlocal, Qapply, Qnormal, QCfamily, QCweight, QCslant, QCwidth)
+        (QCheight, QCsize, QCname, QCwidth, QCforeground)
+        (QCbackground, add_to_log, stack_base, Vmark_even_if_inactive)
+        (display_arg): Add declarations.
+
+2010-07-27  Christoph Scholtes  <cschol2112@gmail.com>
+
+        * minibuf.c (Fread_buffer): Doc fix (bug#6528).
+
+        * window.c (Fwindow_height): Doc fix (bug#6518).
+
+2010-07-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * buffer.c (syms_of_buffer) <fringe-indicator-alist>: Doc fix.
+
+2010-07-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * keyboard.c (Ftop_level, Fexit_recursive_edit)
+        (Fabort_recursive_edit): Remove return statements in NO_RETURN
+        functions.
+
+        * frame.h (Qtty_color_mode): Add declaration.
+
+        * lisp.h (Ftop_level, Fexit_recursive_edit)
+        (Fabort_recursive_edit): Mark as NO_RETURN.
+
+2010-07-26  Kenichi Handa  <handa@m17n.org>
+
+        * font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the
+        number of glyphs gets smaller than the original length.  (Bug#6621)
+
+2010-07-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lread.c (unreadpure, mapatoms_1): Make static.
+
+2010-07-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * terminfo.c (tparam): Fix prototype of tparm.
+
+2010-07-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacs.c (main) [PROFILING]: Use __executable_start if defined to
+        find start of text segment.
+        * dispnew.c (safe_bcopy): Don't define if HAVE___EXECUTABLE_START
+        is defined.
+
+        * callproc.c (set_initial_environment): Avoid unbalanced braces.
+
+2010-07-25  Ken Brown  <kbrown@cornell.edu>
+
+        * vm-limit.c (check_memory_limits): Fix previous change;
+        accidentally reverted an earlier change.
+
+2010-07-25  Ken Brown  <kbrown@cornell.edu>
+
+        * mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead...
+        * vm-limit.c: ...add 'defined (CYGWIN)' here (Bug#6715).
+
+2010-07-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * callproc.c (relocate_fd): Set inside #ifndef WINDOWSNT.
+        * dired.c (opendir, readdir): Fix prototypes.
+        * editfns.c (w32_get_internal_run_time): Fix prototypes.
+        * keyboard.c (input_available_signal): Declare inside #ifdef SIGIO.
+        * ndir.h (opendir, readdir, seekdir, closedir): Fix prototypes.
+        (telldir): Remove declaration.
+        * ralloc.c (real_morecore, __morecore): Fix prototypes.
+        * sound.c (alsa_sound_perror): Declare inside #ifdef HAVE_ALSA.
+        * syssignal.h (strsignal): Fix prototype.
+        * term.c (tparam): Fix prototype.
+        (term_get_fkeys_address, term_get_fkeys_kboard, term_get_fkeys_1)
+        (term_get_fkeys): Set inside "#ifndef DOS_NT".
+        * vm-limit.c (check_memory_limits): Fix prototypes of real_morecore
+        and __morecore.
+        * w32gui.h (XParseGeometry): Fix prototype.
+        * w32heap.h (get_data_start, get_data_end, init_heap): Fix prototypes.
+        * w32term.c (my_set_focus): Declare inside #if 0.
+        * w32term.h (x_window_to_frame, x_display_info_for_name, w32_term_init)
+        (w32_fill_rect, w32_clear_window, init_crit, delete_crit, signal_quit)
+        (drain_message_queue, get_next_msg, post_msg, parse_button)
+        (ClipboardSequence_Proc): Fix prototypes.
+        (wait_for_sync): Remove declaration.
+
+2010-07-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32fns.c (w32_to_x_color): Remove, unused.
+
+2010-07-24  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lisp.h: Remove leftover P_.
+
+2010-07-24  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * ecrt0.c, unexalpha.c: Remove files, unused.
+
+2010-07-24  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * cmds.c (internal_self_insert): Make static.
+        * lisp.h (internal_self_insert): Remove declaration.
+
+2010-07-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * alloc.c (free_float):
+        * font.c [ENABLE_CHECKING] (font_match_xlfd, font_check_xlfd_parse):
+        * frame.c (delete_frame_handler):
+        * ralloc.c (reorder_bloc):
+        * w32menu.c (menubar_id_to_frame, add_left_right_boundary):
+        Remove unused static functions.
+
+        * menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS";
+        it is called only from NS code.
+
+        * w32term.c (my_set_focus): #ifdef away; it is called only from
+        "#ifdef 0" code.
+
+        * w32fns.c (x_edge_detection):
+        * xfaces.c (may_use_scalable_font_p):
+        Remove obsolete static declarations.
+
+2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * alloc.c (emacs_blocked_free, emacs_blocked_malloc)
+        (emacs_blocked_realloc, uninterrupt_malloc):
+        * fringe.c (w32_reset_fringes):
+        * image.c (convert_mono_to_color_image, lookup_rgb_color)
+        (init_color_table, XPutPixel, jpeg_resync_to_restart_wrapper):
+        * sound.c (be2hs, do_play_sound):
+        * vm-limit.c (get_lim_data, ret_lim_data):
+        * w32term.c (x_free_frame_resources):
+        * xfaces.c (x_create_gc, x_free_gc):
+        Convert definitions to standard C.
+
+2010-07-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (Feval, Ffuncall): Use the new names.
+
+        * lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED.
+        (DEFUN): Add braces around the union initialisation and use ## to
+        specify the right union alternative and avoid a cast.
+
+2010-07-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/keyboard.$(O)): Update dependencies.
+
+2010-07-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).
+
+2010-07-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_event_is_for_menubar): Also check that event window
+        is related to the menu bar (Bug#6499).
+        (xg_frame_resized): GTK_IS_MAPPED => gtk_widget_get_mapped, for Gtk 3.0.
+
+2010-07-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.h (x_menubar_window_to_frame): Second parameter is XEvent*.
+
+        * xterm.c (handle_one_xevent): Pass event to x_menubar_window_to_frame.
+
+        * xmenu.c (x_activate_menubar): Revert previous fix for Bug#6499,
+        i.e. don't put back ButtonRelease (Bug#6608).
+
+        * xfns.c (x_menubar_window_to_frame): Take XEvent as second parameter
+        instead of Window.  Call xg_event_is_for_menubar when
+        USE_GTK (Bug#6499).
+
+        * gtkutil.h (xg_event_is_for_menubar): Declare.
+
+        * gtkutil.c (xg_event_is_for_menubar): New function (Bug#6499).
+
+2010-07-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (x_set_foreground_color): Fix setting the cursor color
+        when it's the same as the old foreground.  (Bug#6609)
+
+2010-07-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (free_frame_menubar): Only call x_set_window_size if
+        widget is non-null (Bug#6645).
+
+2010-07-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * xterm.c (x_fully_uncatch_errors, x_trace_wire, x_check_font):
+        Convert old-style definition.
+
+        * xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of
+        timestamp argument.
+
+2010-07-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * fringe.c (update_window_fringes): Restore mistakenly reverted
+        code from 2010-04-17T12:33:05Z!eliz@gnu.org merged in 2010-04-20T13:31:28Z!eliz@gnu.org.
+
+2010-07-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (xm_scroll_callback, x_process_timeouts): K&R => prototype.
+        (SET_SAVED_KEY_EVENT): Remove (not used).
+        (SET_SAVED_MENU_EVENT): Rename to SET_SAVED_BUTTON_EVENT and
+        remove size parameter.
+        (handle_one_xevent): Check popup_activated () for menu for Xt also.
+        Remove #ifdef USE_GTK around finish = X_EVENT_DROP.
+        Remove #ifdef USE_MOTIF code that did SET_SAVED_BUTTON_EVENT for
+        ButtonRelease.
+        (x_set_window_size_1): scroll_bar_actual_width is always
+        SCROLL_BAR_COLS * COLUMN_WIDTH for the purpose of frame sizing.
+
+        * xdisp.c (pending_menu_activation): Remove extern declaration.
+        (prepare_menu_bars): Remove setting of pending_menu_activation.
+
+        * xmenu.c (pending_menu_activation): Remove.
+        (x_activate_menubar): Set popup_activated_flag for Xt also.
+        Remove setting of pending_menu_activation.
+        (set_frame_menubar): Remove check of pending_menu_activation.
+        Declare menubar_size before code.  Correct spelling in comment.
+
+2010-07-14  Kenichi Handa  <handa@m17n.org>
+
+        * font.c (font_open_entity): Cancel previous change.
+        (Ffont_get): Don't check FONT_ENTITY_INDEX of a font-object.
+
+2010-07-13  Eli Zaretskii  <eliz@gnu.org>
+
+        Remove subprocesses #ifdefs.
+        * process.c <inhibit_sentinels>: Move to the common part.
+        (Fwaiting_for_user_input_p): Move to the common part; return nil
+        if async subprocesses aren't supported.
+        * sysdep.c (wait_for_termination) [!MSDOS]: Don't compile on
+        MS-DOS.  Remove "#ifdef subprocesses".
+        (sys_subshell, sys_select): Remove "#ifdef subprocesses".
+        (gettimeofday): Remove "#ifdef subprocesses".
+        (wait_without_blocking): Remove function.
+        (flush_pending_output, child_setup_tty): Don't compile on MS-DOS.
+        Remove "#ifdef subprocesses".
+        (child_setup_tty): Use WINDOWSNT instead of DOS_NT, since not
+        compiled on MS-DOS.
+        * callproc.c (Fcall_process) [!MSDOS]: Don't call
+        wait_for_termination on MS-DOS.
+        * emacs.c (shut_down_emacs): Remove "#ifndef subprocesses" from
+        initialization of inhibit_sentinels.
+        * keyboard.c (record_asynch_buffer_change): Remove "#ifdef
+        subprocesses" conditional.
+        * callproc.c (Fcall_process) [!subprocesses]: Don't call
+        wait_for_termination, since `buffer' cannot be an integer when
+        async subprocesses are not supported
+        * xdisp.c (decode_mode_spec): Use `MSDOS' instead of `subprocesses'
+        for ifdefing away the call to Fprocess_status.
+
+        * process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef
+        away the entire body of the function.
+
+2010-07-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Remove subprocesses #ifdefs from term.c.
+        * process.c (add_keyboard_wait_descriptor)
+        (delete_keyboard_wait_descriptor): Move to common section, do
+        nothing when subprocesses is not defined.
+        * term.c (Fsuspend_tty, Fresume_tty, init_tty):
+        Remove subprocesses #ifdefs.
+
+        Convert maybe_fatal to standard C.
+        * lisp.h (verror): Declare.
+        * eval.c (verror): New function containing the code from ...
+        (error): ... this.  Call verror.
+        * term.c (vfatal): New function containing the code from ...
+        (fatal): ... this.  Call vfatal.
+        (maybe_fatal): Convert to standard C, use variable number of
+        arguments.  Declare as non-return.
+        (init_tty): Fix maybe_fatal call.
+
+2010-07-12  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * xterm.c (x_scroll_bar_set_handle, x_scroll_bar_expose)
+        (_scroll_bar_note_movement): Convert definitions to standard C.
+        * xmenu.c (menu_help_callback, pop_down_menu, xmenu_show):
+        * xfns.c (hack_wm_protocols, x_window, x_window): Likewise.
+
+2010-07-12  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * xterm.c (x_frame_of_widget, x_alloc_nearest_color_for_widget)
+        (x_alloc_lighter_color_for_widget, cvt_string_to_pixel)
+        (cvt_pixel_dtor, x_window_to_menu_bar, xt_action_hook)
+        (xaw_jump_callback, xaw_scroll_callback)
+        (x_create_toolkit_scroll_bar, x_set_toolkit_scroll_bar_thumb)
+        (x_wm_set_size_hint, x_activate_timeout_atimer): Convert
+        definitions to standard C.
+        * xmenu.c (menubar_id_to_frame, popup_get_selection)
+        (popup_activate_callback, popup_deactivate_callback)
+        (menu_highlight_callback, menubar_selection_callback)
+        (apply_systemfont_to_dialog, apply_systemfont_to_menu)
+        (free_frame_menubar, popup_selection_callback, as)
+        (create_and_show_popup_menu, dialog_selection_callback)
+        (create_and_show_dialog):
+        * xfns.c (hack_wm_protocols, x_window):
+        * xfaces.c (x_update_menu_appearance):
+        * widget.c (get_default_char_pixel_size, pixel_to_char_size)
+        (char_to_pixel_size, round_size_to_char, get_wm_shell)
+        (set_frame_size, update_wm_hints, setup_frame_gcs)
+        (update_various_frame_slots, update_from_various_frame_slots)
+        (EmacsFrameInitialize, EmacsFrameRealize, EmacsFrameResize)
+        (EmacsFrameSetValues, EmacsFrameQueryGeometry)
+        (EmacsFrameSetCharSize, widget_store_internal_border): Likewise.
+
+2010-07-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * dbusbind.c (xd_initialize): Don't compare boolean with a constant.
+
+2010-07-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * process.c (setup_process_coding_systems): Move to the part
+        shared by non-subprocesses systems, and make its body empty when
+        subprocesses is not defined.
+        (close_process_descs): Move to the part shared by non-subprocesses
+        systems.
+        (wait_reading_process_output) [!subprocesses]: Convert arg list to
+        ANSI C.
+
+2010-07-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * editfns.c (transpose_markers): Convert old-style definition.
+        * emacs.c (abort, shut_down_emacs, fixup_locale)
+        (synchronize_system_time_locale)
+        (synchronize_system_messages_locale, syms_of_emacs): Likewise.
+        * floatfns.c (extract_float, matherr, init_floatfns)
+        (syms_of_floatfns): Likewise.
+        * fns.c (make_hash_table): Likewise.
+        * ftfont.c (ftfont_get_otf, ftfont_otf_features)
+        (ftfont_otf_capability, ftfont_get_glyph_id, ftfont_get_metrics)
+        (ftfont_drive_otf, ftfont_shape_by_flt, ftfont_shape)
+        (ftfont_variation_glyphs): Likewise.
+        * gtkutil.c (xg_create_widget, xg_modify_menubar_widgets): Likewise.
+        * keymap.c (describe_map_tree, describe_map, describe_vector): Likewise.
+        * lread.c (read_filtered_event): Likewise.
+        * minibuf.c (read_minibuf_noninteractive, read_minibuf): Likewise.
+        * process.c (wait_reading_process_output): Likewise.
+        * scroll.c (do_line_insertion_deletion_costs): Likewise.
+        * search.c (search_buffer, boyer_moore): Likewise.
+        * syntax.c (scan_sexps_forward): Likewise.
+        * xdisp.c (try_scrolling): Likewise.
+        * xfaces.c (face_at_buffer_position, face_for_overlay_string)
+        (face_at_string_position): Likewise.
+        * xfns.c (x_default_scroll_bar_color_parameter): Likewise.
+        * xselect.c (x_get_window_property, receive_incremental_selection)
+        (x_get_window_property_as_lisp_data, lisp_data_to_selection_data):
+        Likewise.
+        * xterm.c (x_draw_relief_rect, x_draw_box_rect): Likewise.
+
+2010-07-12  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * callproc.c (child_setup): Remove subprocesses conditional.
+        Remove code dealing with SET_EMACS_PRIORITY, unused.
+
+        * buffer.c (Fset_buffer_multibyte): Remove subprocesses conditional.
+        * process.c (close_process_descs): Use DOS_NT instead of WINDOWSNT.
+
+        * emacs.c (__do_global_ctors, __do_global_ctors_aux)
+        (__do_global_dtors, __main): Use void in definition.
+        (main): Remove code dealing with SET_EMACS_PRIORITY, unused.
+        Remove SYMS_MACHINE code, unused.  Remove SYMS_SYSTEM, inline
+        the only users from ...
+        * s/ms-w32.h (SYMS_SYSTEM): ... here and ...
+        * s/msdos.h (SYMS_SYSTEM): ... here.  Remove.
+        (HAVE_VOLATILE): Remove, unused.
+
+        Convert more function definitions to standard C.
+        * xdisp.c (window_box_edges, handle_single_display_spec)
+        (display_string): Convert definition to standard C.
+        * scroll.c (do_direct_scrolling, scrolling_1):
+        * dispnew.c (allocate_matrices_for_frame_redisplay)
+        (mirrored_line_dance):
+        * coding.c (code_convert_string):
+        * charset.c (map_charset_chars):
+        * ccl.c (Fccl_program_p, Fccl_execute, Fccl_execute_on_string)
+        (Fregister_ccl_program, Fregister_code_conversion_map):
+        * keyboard.c (kbd_buffer_nr_stored): Likewise.
+        (head_table): Make static and const.
+
+2010-07-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
+        (PROFILING_LDFLAGS): Set from substitution.
+        (ALL_CFLAGS): Add C_WARNINGS_SWITCH and PROFILING_CFLAGS, put
+        CFLAGS last.
+
+2010-07-12  Kenichi Handa  <handa@m17n.org>
+
+        * Makefile.in (lisp): Change hebrew.el to hebrew.elc.
+        (shortlisp): Likewise.
+
+        * font.h (enum font_property_index): New member FONT_ENTITY_INDEX.
+
+        * font.c (font_open_entity): Record ENTITY in FONT_OBJECT's slot
+        of FONT_ENTITY_INDEX.
+        (Ffont_get): If KEY is :otf and the font-object doesn't have the
+        property, get the property value dynamically.
+        (Ffont_put): Accept font-entity and font-object too.
+        (Ffont_get_glyhphs): Renamed from Fget_font_glyphs.  Arguments and
+        return value changed.
+        (syms_of_font): Adjusted for the above change.
+
+2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * blockinput.h: Remove obsolete comment.
+
+        * lisp.h: Include <stddef.h>.
+        (OFFSETOF): Don't define.
+        (VECSIZE): Use offsetof instead of OFFSETOF.
+        (PSEUDOVECSIZE): Likewise.
+        * process.c (conv_sockaddr_to_lisp): Likewise.
+        * alloc.c: Don't include <stddef.h>.
+        * buffer.h (PER_BUFFER_VAR_OFFSET): Use offsetof.
+
+        * process.c: Remove obsolete comment.
+
+2010-07-11  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
+
+2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * callint.c (Fcall_interactively): Use strchr, strrchr instead of
+        index, rindex.
+        * doc.c (get_doc_string, Fsnarf_documentation): Likewise.
+        * editfns.c (Fuser_full_name, Fformat): Likewise.
+        * emacs.c (argmatch, sort_args, decode_env_path): Likewise.
+        * fileio.c (Ffile_symlink_p): Likewise.
+        * filelock.c (current_lock_owner): Likewise.
+        * font.c (font_parse_name, font_parse_family_registry): Likewise.
+        * fontset.c (fontset_pattern_regexp): Likewise.
+        * lread.c (read1): Likewise.
+        * sysdep.c (init_system_name): Likewise.
+        * xfns.c (select_visual): Likewise.
+        * s/hpux10-20.h (index, rindex): Don't define.
+        * s/ms-w32.h (index): Likewise.
+        * s/usg5-4.h: Likewise.
+
+        * callproc.c (relocate_fd): Use F_DUPFD if defined.
+
+        * alloc.c (pending_malloc_warning, malloc_warning): Add const.
+        * callproc.c (relocate_fd, getenv_internal_1, getenv_internal)
+        (egetenv): Likewise.
+        * doprnt.c (doprnt): Likewise.
+        * editfns.c (set_time_zone_rule, format2): Likewise.
+        * emacs.c (decode_env_path): Likewise.
+        * eval.c (signal_error, error): Likewise.
+        * insdel.c (replace_range_2): Likewise.
+        * keyboard.c (cmd_error_internal): Likewise.
+        * lread.c (isfloat_string, make_symbol, dir_warning): Likewise.
+        * print.c (write_string, write_string_1, print_error_message):
+        Likewise.
+        * vm-limit.c (warn_function, memory_warnings): Likewise.
+        * xdisp.c (message1, message1_nolog, message_with_string)
+        (vmessage, message, message_nolog): Likewise.
+        * emacs.c: Remove duplicate declaration.
+        * keyboard.h: Likewise.
+        * lisp.h: Update prototypes.
+
+        * eval.c: Fix indentation problem.
+
+        * keyboard.c: Include "process.h"
+
+        * eval.c: Remove obsolete noinline declaration.
+        * fns.c: Likewise.
+
+2010-07-11  Ken Raeburn  <raeburn@raeburn.org>
+
+        * doprnt.c (doprnt): Take a va_list argument instead of count and
+        pointer.
+        * eval.c (error): Change to a standard-C variadic function.
+        * xdisp.c (vmessage): Renamed from message, made static, and
+        changed to take a va_list argument.
+        (message): New variadic wrapper.
+        (message_nolog): Now a variadic function, calling vmessage.
+        * lisp.h: Include stdarg.h for va_list.
+        (doprnt, error, message, message_nolog): Decls updated.
+
+2010-07-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * process.c (syms_of_process) <delete-exited-processes>: Define
+        even if !subprocesses.
+        (delete_exited_processes): Ditto.
+
+        * msdos.c (syms_of_msdos) <delete-exited-processes>: Remove DEFVAR.
+        (delete_exited_processes): Don't define.
+
+2010-07-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.c (make_frame): Initialize menu_bar_lines and
+        tool_bar_lines members.
+        (make_initial_frame, make_terminal_frame): Initialize
+        menu_bar_lines using value of menu-bar-mode.
+
+        * msdos.c (IT_set_frame_parameters): Don't set menu-bar-lines.
+
+2010-07-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * process.c: Reshuffle #include's.  Condition some of the global
+        and static variables on `subprocesses'.
+        (hold_keyboard_input, unhold_keyboard_input, kbd_on_hold_p):
+        Leave only one implementation.
+        (Fget_buffer_process, Fprocess_inherit_coding_system_flag)
+        (kill_buffer_processes, Flist_system_processes)
+        (Fprocess_attributes, init_process, syms_of_process): Unify the
+        implementations for with subprocesses and without them.
+
+2010-07-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (set_frame_menubar): Must realize menubar_widget to get the
+        correct size for Motif.
+        (free_frame_menubar): Call x_set_window_size to update frame size.
+
+        * xfns.c (x_window): Set borderWidth to 0 for pane and
+        EmacsFrame.  Frame size calculation is wrong otherwise.
+
+2010-07-09  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
+        allows to suppress errors when polling in Emacs' main loop.
+        (Fdbus_init_bus, Fdbus_get_unique_name, Fdbus_call_method)
+        (Fdbus_call_method_asynchronously, Fdbus_method_return_internal)
+        (Fdbus_method_error_internal, Fdbus_send_signal)
+        (xd_get_dispatch_status, xd_read_message, Fdbus_register_signal)
+        (Fdbus_register_method): Use it.  (Bug#6579)
+
+2010-07-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * alloc.c: Convert DEFUNs to standard C.
+        * buffer.c:
+        * bytecode.c:
+        * callint.c:
+        * callproc.c:
+        * casefiddle.c:
+        * casetab.c:
+        * category.c:
+        * character.c:
+        * charset.c:
+        * chartab.c:
+        * cmds.c:
+        * coding.c:
+        * composite.c:
+        * data.c:
+        * dbusbind.c:
+        * dired.c:
+        * dispnew.c:
+        * doc.c:
+        * dosfns.c:
+        * editfns.c:
+        * emacs.c:
+        * eval.c:
+        * fileio.c:
+        * filelock.c:
+        * floatfns.c:
+        * fns.c:
+        * font.c:
+        * fontset.c:
+        * frame.c:
+        * fringe.c:
+        * image.c:
+        * indent.c:
+        * insdel.c:
+        * keyboard.c:
+        * keymap.c:
+        * lread.c:
+        * macros.c:
+        * marker.c:
+        * menu.c:
+        * minibuf.c:
+        * msdos.c:
+        * nsfns.m:
+        * nsmenu.m:
+        * nsselect.m:
+        * print.c:
+        * process.c:
+        * search.c:
+        * sound.c:
+        * syntax.c:
+        * term.c:
+        * terminal.c:
+        * textprop.c:
+        * undo.c:
+        * w16select.c:
+        * w32console.c:
+        * w32fns.c:
+        * w32font.c:
+        * w32menu.c:
+        * w32proc.c:
+        * w32select.c:
+        * window.c:
+        * xdisp.c:
+        * xfaces.c:
+        * xfns.c:
+        * xmenu.c:
+        * xselect.c:
+        * xsettings.c:
+        * xsmfns.c: Likewise.
+
+2010-07-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * process.c (kbd_is_on_hold, hold_keyboard_input)
+        (unhold_keyboard_input, kbd_on_hold_p) [!subprocesses]: Define.
+
+2010-07-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (set_frame_menubar, create_and_show_popup_menu)
+        (create_and_show_dialog): Don't call apply_systemfont_to_(menu|dialog)
+        unless USE_LUCID.
+
+2010-07-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * xdisp.c (store_mode_line_noprop_char): Remove K&R alternative
+        declaration.
+
+        Clean up include guards.
+        * tparam.c: Remove include guards for config.h, string.h and code
+        that assumes #ifndef emacs.
+        * termcap.c:
+        * unexalpha.c:
+        * sysdep.c:
+        * filemode.c:
+        * filelock.c:
+        * bidi.c: Likewise.
+
+        Remove prefix-args.c
+        * prefix-args.c: Remove file.
+        * autodeps.mk (ALLOBJS): Remove reference to prefix-args.
+        * Makefile.in (temacs${EXEEXT}): Remove references to
+        PRE_EDIT_LDFLAGS and POST_EDIT_LDFLAGS.
+        (mostlyclean): Remove reference to prefix-args.
+        (prefix-args): Remove.
+
+        Simplify cstart_of_data, start_of_code and related code.
+        * mem-limits.h: Remove !emacs and _LIBC conditional code.
+        (start_of_data): Merge into start_of_data function.
+        * sysdep.c (start_of_text): Remove.  Move simplified versions of
+        it in the only users: unexaix.c and unexec.c.
+        (read_input_waiting): Remove local declaration of quit_char.
+        (start, etext): Remove declarations.
+        (start_of_data): Merge with the version in mem-limits.h and move
+        to vm-limits.c.
+        * vm-limit.c (start_of_data): Merged and simplified version of the
+        code formerly in mem-limits.h and sysdep.c.
+        * unexec.c (start): New declaration, moved from sysdep.c.
+        (start_of_text): Simplified version of the code formerly in sysdep.c.
+        * unexaix.c (start_of_text): Simplified version of the code
+        formerly in sysdep.c.
+        * m/alpha.h (HAVE_TEXT_START): Remove.
+        (TEXT_START): Move ...
+        * unexalpha.c (TEXT_START): ... here.
+        * s/hpux10-20.h (TEXT_START): Remove.
+        * s/darwin.h (TEXT_START):
+        * m/mips.h (TEXT_START):
+        * m/macppc.h (HAVE_TEXT_START):
+        * m/m68k.h (TEXT_START):
+        * m/iris4d.h (TEXT_START):
+        * m/intel386.h (TEXT_START):
+        * m/ibmrs6000.h (TEXT_START):
+        * m/ia64.h (HAVE_TEXT_START):
+        * s/msdos.h (TEXT_START): Likewise.
+
+2010-07-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * alloc.c (overrun_check_malloc, overrun_check_realloc)
+        (overrun_check_free, xstrdup, allocate_string)
+        (allocate_string_data, compact_small_strings, Fmake_string)
+        (make_unibyte_string, make_multibyte_string)
+        (make_string_from_bytes, make_specified_string, make_float)
+        (Fcons, allocate_terminal, allocate_frame, make_pure_string)
+        (Fgarbage_collect): Replace bcopy, safe_bcopy, bzero, bcmp by
+        memcpy, memmove, memset, memcmp.
+        * atimer.c (start_atimer, set_alarm): Likewise.
+        * buffer.c (clone_per_buffer_values, report_overlay_modification)
+        (mmap_realloc, init_buffer_once): Likewise.
+        * callint.c (Fcall_interactively): Likewise.
+        * callproc.c (Fcall_process, Fcall_process_region, child_setup)
+        (getenv_internal_1): Likewise.
+        * casefiddle.c (casify_object): Likewise.
+        * ccl.c (ccl_driver): Likewise.
+        * character.c (str_as_multibyte, str_to_multibyte): Likewise.
+        * charset.c (load_charset_map_from_file)
+        (load_charset_map_from_file, load_charset_map_from_vector)
+        (Fdefine_charset_internal): Likewise.
+        * cm.c (Wcm_clear): Likewise.
+        * coding.c (decode_eol, decode_coding_object)
+        (Fset_coding_system_priority, make_subsidiaries): Likewise.
+        * data.c (Faset): Likewise.
+        * dired.c (directory_files_internal, file_name_completion_stat):
+        Likewise.
+        * dispnew.c (new_glyph_matrix, adjust_glyph_matrix)
+        (clear_glyph_row, copy_row_except_pointers)
+        (copy_glyph_row_contents, new_glyph_pool, realloc_glyph_pool)
+        (save_current_matrix, restore_current_matrix)
+        (build_frame_matrix_from_leaf_window, mirrored_line_dance)
+        (mirror_line_dance, scrolling_window): Likewise.
+        * doc.c (Fsnarf_documentation, Fsubstitute_command_keys):
+        Likewise.
+        * doprnt.c (doprnt): Likewise.
+        * editfns.c (Fuser_full_name, make_buffer_string_both)
+        (Fmessage_box, Fformat, Ftranspose_regions): Likewise.
+        * emacs.c (sort_args): Likewise.
+        * eval.c (Fapply, Ffuncall): Likewise.
+        * fileio.c (Ffile_name_directory, make_temp_name)
+        (Fexpand_file_name, search_embedded_absfilename)
+        (Fsubstitute_in_file_name, Ffile_symlink_p, Finsert_file_contents)
+        (auto_save_error): Likewise.
+        * fns.c (Fstring_equal, Fcopy_sequence, concat)
+        (string_to_multibyte, Fstring_as_unibyte, Fstring_as_multibyte)
+        (internal_equal, Fclear_string, larger_vector, copy_hash_table)
+        (Fmake_hash_table): Likewise.
+        * fringe.c (Fdefine_fringe_bitmap): Likewise.
+        * ftfont.c (ftfont_text_extents): Likewise.
+        * getloadavg.c (getloadavg): Likewise.
+        * image.c (define_image_type, make_image, make_image_cache)
+        (x_create_x_image_and_pixmap, xbm_image_p)
+        (w32_create_pixmap_from_bitmap_data, xbm_load, xpm_lookup_color)
+        (xpm_image_p, x_create_bitmap_from_xpm_data, xpm_load)
+        (init_color_table, x_build_heuristic_mask, pbm_image_p, pbm_load)
+        (png_image_p, png_read_from_memory, png_load, jpeg_image_p)
+        (tiff_image_p, tiff_read_from_memory, gif_image_p)
+        (gif_read_from_memory, gif_load, svg_image_p, gs_image_p):
+        Likewise.
+        * indent.c (scan_for_column, compute_motion): Likewise.
+        * insdel.c (gap_left, gap_right, make_gap_smaller, copy_text)
+        (insert_1_both, insert_from_gap, replace_range_2): Likewise.
+        * intervals.c (reproduce_tree, reproduce_tree_obj): Likewise.
+        * keyboard.c (echo_char, save_getcjmp, restore_getcjmp)
+        (kbd_buffer_store_event_hold, apply_modifiers_uncached)
+        (store_user_signal_events, menu_bar_items, tool_bar_items)
+        (process_tool_bar_item, append_tool_bar_item)
+        (read_char_minibuf_menu_prompt, read_key_sequence)
+        (Fread_key_sequence, Fread_key_sequence_vector, Frecent_keys):
+        Likewise.
+        * keymap.c (current_minor_maps, Fdescribe_buffer_bindings):
+        Likewise.
+        * lisp.h (STRING_COPYIN): Likewise.
+        * lread.c (Fload, read1, oblookup): Likewise.
+        * msdos.c (Frecent_doskeys): Likewise.
+        * nsfns.m (Fx_create_frame): Likewise.
+        * nsfont.m (nsfont_open, nsfont_text_extents, ns_glyph_metrics):
+        Likewise.
+        * nsimage.m (EmacsImage-initFromSkipXBM:width:height:)
+        (EmacsImage-initForXPMWithDepth:width:height:flip:length:):
+        Likewise.
+        * nsmenu.m (ns_update_menubar): Likewise.
+        * nsterm.m (ns_draw_fringe_bitmap, ns_term_init): Likewise.
+        * print.c (print_unwind, printchar, strout, print_string)
+        (print_error_message): Likewise.
+        * process.c (conv_lisp_to_sockaddr, set_socket_option)
+        (Fmake_network_process, Fnetwork_interface_list)
+        (Fnetwork_interface_info, read_process_output, Fprocess_send_eof)
+        (init_process): Likewise.
+        * ralloc.c (resize_bloc, r_alloc_sbrk, r_alloc_init): Likewise.
+        * regex.c (init_syntax_once, regex_compile, re_compile_fastmap):
+        Likewise.
+        * scroll.c (do_scrolling, do_direct_scrolling)
+        (scrolling_max_lines_saved): Likewise.
+        * search.c (search_buffer, wordify, Freplace_match): Likewise.
+        * sound.c (wav_init, au_init, Fplay_sound_internal): Likewise.
+        * syntax.c (skip_chars, skip_syntaxes): Likewise.
+        * sysdep.c (child_setup_tty, sys_subshell, emacs_get_tty)
+        (emacs_set_tty): Likewise.
+        * term.c (encode_terminal_code, calculate_costs)
+        (produce_special_glyphs, create_tty_output, init_tty, delete_tty):
+        Likewise.
+        * termcap.c (tgetst1, gobble_line): Likewise.
+        * termhooks.h (EVENT_INIT): Likewise.
+        * tparam.c (tparam1): Likewise.
+        * unexalpha.c (unexec): Likewise.
+        * unexec.c (write_segment): Likewise.
+        * unexmacosx.c (unexec_write_zero): Likewise.
+        * w32fns.c (w32_wnd_proc, Fx_create_frame, x_create_tip_frame)
+        (Fx_file_dialog, Fsystem_move_file_to_trash): Likewise.
+        * w32font.c (w32font_list_family, w32font_text_extents)
+        (w32font_list_internal, w32font_match_internal)
+        (w32font_open_internal, compute_metrics, Fx_select_font):
+        Likewise.
+        * w32menu.c (set_frame_menubar, add_menu_item)
+        (w32_menu_display_help, w32_free_submenu_strings): Likewise.
+        * w32term.c (XCreateGC, w32_initialize_display_info): Likewise.
+        * w32uniscribe.c (uniscribe_list_family): Likewise.
+        * w32xfns.c (get_next_msg, post_msg, prepend_msg): Likewise.
+        * window.c (make_window, replace_window, set_window_buffer)
+        (Fsplit_window): Likewise.
+        * xdisp.c (init_iterator, RECORD_OVERLAY_STRING, reseat_to_string)
+        (add_to_log, message3, x_consider_frame_title)
+        (append_space_for_newline, extend_face_to_end_of_line)
+        (decode_mode_spec_coding, init_glyph_string): Likewise.
+        * xfaces.c (x_create_gc, get_lface_attributes_no_remap)
+        (Finternal_copy_lisp_face, Finternal_merge_in_global_face)
+        (face_attr_equal_p, make_realized_face, make_face_cache)
+        (free_realized_faces, lookup_named_face, smaller_face)
+        (face_with_height, lookup_derived_face)
+        (x_supports_face_attributes_p, Finternal_set_font_selection_order)
+        (Finternal_set_font_selection_order, realize_default_face)
+        (compute_char_face, face_at_buffer_position)
+        (face_for_overlay_string, face_at_string_position, merge_faces):
+        Likewise.
+        * xfns.c (xic_create_fontsetname, Fx_create_frame)
+        (Fx_window_property, x_create_tip_frame)
+        (Fx_backspace_delete_keys_p): Likewise.
+        * xfont.c (xfont_list, xfont_match, xfont_list_family)
+        (xfont_text_extents): Likewise.
+        * xmenu.c (set_frame_menubar, xmenu_show): Likewise.
+        * xrdb.c (magic_file_p, x_get_resource): Likewise.
+        * xselect.c (x_queue_event, x_get_window_property)
+        (receive_incremental_selection): Likewise.
+        * xsmfns.c (x_session_check_input): Likewise.
+        * xterm.c (x_send_scroll_bar_event, SET_SAVED_MENU_EVENT)
+        (handle_one_xevent, x_check_errors, xim_initialize, x_term_init):
+        Likewise.
+        * character.h (BCOPY_SHORT): Removed.
+        * config.in: Regenerate.
+        * dispnew.c (safe_bcopy): Only define as dummy if PROFILING.
+        * emacs.c (main) [PROFILING]: Don't declare
+        dump_opcode_frequencies.
+        * lisp.h (safe_bcopy): Remove declaration.
+        (memset) [!HAVE_MEMSET]: Declare.
+        (memcpy) [!HAVE_MEMCPY]: Likewise.
+        (memmove) [!HAVE_MEMMOVE]: Likewise.
+        (memcmp) [!HAVE_MEMCMP]: Likewise.
+        * s/ms-w32.h (bzero, bcopy, bcmp, GAP_USE_BCOPY)
+        (BCOPY_UPWARD_SAFE, BCOPY_DOWNWARD_SAFE, HAVE_BCOPY, HAVE_BCMP):
+        Don't define.
+        (HAVE_MEMCMP, HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET): Define.
+        * s/msdos.h (GAP_USE_BCOPY, BCOPY_UPWARD_SAFE)
+        (BCOPY_DOWNWARD_SAFE): Don't define.
+        * sysdep.c (memset) [!HAVE_MEMSET]: Define.
+        (memcpy) [!HAVE_MEMCPY]: Define.
+        (memmove) [!HAVE_MEMMOVE]: Define.
+        (memcmp) [!HAVE_MEMCMP]: Define.
+
+2010-07-07  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-07-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.h:
+        * msdos.c:
+        * dosfns.c:
+        * w16select.c: Convert function definitions to ANSI C.
+
+        * msdos.h (ctrl_break_func, install_ctrl_break_check):
+        Remove unused prototypes.
+
+2010-07-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * coding.c, sysdep.c: Convert some more functions to standard C.
+
+2010-07-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * coding.c (decode_coding_gap, encode_coding_gap, decode_coding_object)
+        (encode_coding_object): Use SPECPDL_INDEX.
+        (syms_of_coding): Use DOS_NT.
+
+2010-07-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * intervals.h (interval): Use EMACS_UINT instead of unsigned EMACS_INT.
+
+        Make the function member of Lisp_Subr use standard C prototypes.
+        * lisp.h (struct Lisp_Subr): Use a union for the function member.
+        (DECL_ALIGN): Add a cast for the function.
+        * eval.c (Feval, Ffuncall): Use the proper type for each type
+        function call.
+
+2010-07-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
+        fringe face id, so face-remapping-alist works (Bug#6091).
+
+2010-07-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32.c, w32console.c, w32fns.c, w32font.c, w32heap.c, w32inevt.c
+        * w32menu.c, w32proc.c, w32reg.c, w32select.c, w32term.c
+        * w32uniscribe.c, w32xfns.c: Convert function definitions to standard C.
+
+2010-07-06  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * xterm.c (x_get_keysym_name): Change type of parameter to int.
+        * lisp.h: Declare x_get_keysym_name.
+        * keyboard.c (modify_event_symbol): Don't declare
+        x_get_keysym_name here.
+
+2010-07-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * ecrt0.c: Revert conversion to standard C.
+
+2010-07-05  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vm-limit.c (memory_warnings):
+        * keyboard.c (modify_event_symbol):
+        * floatfns.c (rounding_driver, ceiling2, floor2, truncate2)
+        (round2, emacs_rint):
+        * process.c (send_process, old_sigpipe): Convert function
+        definitions and declarations to standard C.
+
+2010-07-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * buffer.c, cm.c, eval.c, keyboard.c, process.c, term.c, vm-limit.c,
+        * xdisp.c: Convert function definitions to standard C.
+
+        * cm.c (cmputc): Arg C is now int, not char.
+        * process.c (Fmake_network_process): Cast sockaddr_in* to sockaddr*.
+
+2010-07-05  James Cloos  <cloos@jhcloos.com>
+
+        * xterm.h (Xatom_net_wm_name, Xatom_net_wm_icon_name): New.
+
+        * xterm.c (x_term_init): Intern the _NET_WM_NAME and
+        _NET_WM_ICON_NAME atoms.
+
+        * xfns.c (x_set_name_internal): Set the EWMH _NET_WM_NAME
+        and _NET_WM_ICON_NAME properties, too, matching what is
+        done in the Gtk+ case.
+
+2010-07-05  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (XTring_bell, XTset_terminal_window): Fix wrong prototype.
+
+        * xsmfns.c (SSDATA): New macro.
+        (smc_save_yourself_CB, x_session_initialize): Use SSDATA for strings
+        passed to strlen/strcpy/strcat.
+        (create_client_leader_window): Surround with #ifndef USE_GTK.  Cast
+        7:th arg to XChangeProperty to (unsigned char *)
+
+        * xsettings.c (something_changedCB, parse_settings)
+        (apply_xft_settings): Reformat prototype.
+        (something_changedCB, init_gconf): Remove unused variable i.
+        (read_settings): Remove unused variable long_len.
+
+        * gtkutil.c (xg_get_pixbuf_from_pix_and_mask)
+        (xg_get_image_for_pixmap, create_dialog)
+        (xg_get_file_with_selection, xg_get_file_name, update_cl_data)
+        (menuitem_highlight_callback, make_menu_item)
+        (xg_create_one_menuitem, create_menus, xg_update_menu_item)
+        (xg_create_scroll_bar, xg_update_scrollbar_pos)
+        (xg_set_toolkit_scroll_bar_thumb, xg_tool_bar_button_cb)
+        (xg_tool_bar_proxy_help_callback, xg_tool_bar_detach_callback)
+        (xg_tool_bar_attach_callback, xg_tool_bar_help_callback)
+        (xg_tool_bar_item_expose_callback): Reformat prototype.
+        (xg_update_menubar): GList *group => GSList *group.
+        (xg_modify_menubar_widgets): Initialize witem to 0, check witem != 0
+        before use.
+        (update_frame_tool_bar): 4:th param to xg_get_image_for_pixmap changed
+        to GTK_IMAGE (wimage).
+
+2010-07-05  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * atimer.c: Use "" instead of <> for local includes for
+        consistency with the rest of the code.
+
+        * xsmfns.c (smc_save_yourself_CB, smc_error_handler):
+        * xrdb.c (get_system_name):
+        * window.c (shrink_windows):
+        * syntax.c (forw_comment):
+        * scroll.c (calculate_scrolling, calculate_direct_scrolling)
+        (ins_del_costs):
+        * mem-limits.h (start_of_data):
+        * lread.c (readevalloop):
+        * gtkutil.c (xg_dialog_response_cb, xg_get_file_with_chooser)
+        (xg_get_file_with_selection, xg_update_menubar, xg_update_submenu):
+        * frame.c (x_get_focus_frame):
+        * floatfns.c (fmod_float):
+        * fileio.c (choose_write_coding_system):
+        * emacs.c (fatal_error_signal, init_cmdargs, argmatch)
+        (malloc_initialize_hook, sort_args, synchronize_locale):
+        * doprnt.c (doprnt):
+        * dired.c (compile_pattern):
+        * data.c (fmod_float):
+        * chartab.c (map_sub_char_table, map_sub_char_table_for_charset)
+        (map_char_table_for_charset):
+        * charset.c (define_charset_internal):
+        * alloc.c (Fgarbage_collect): Convert declarations or definitions
+        to standard C.
+
+2010-07-04  Tetsurou Okazaki  <okazaki@be.to>  (tiny change)
+            Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (read1): Fix up last change to not mess up `c'.
+
+2010-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * strftime.c: Revert conversion to standard C (2010-07-04T07:50:25Z!dann@ics.uci.edu).
+
+2010-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        Fix prototypes.
+
+        * atimer.c (start_atimer): Use EMACS_TIME, not struct timeval.
+        * dired.c (file_name_completion_stat): Use DIRENTRY, not struct dirent.
+        * fileio.c (read_non_regular, read_non_regular_quit): Add Lisp_Object
+        arg, as required by internal_condition_case_1.
+        * print.c (strout): Use const char* for arg PTR.
+        * regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object.
+        (analyse_first): Fix "const const".
+        * sysdep.c (set_file_times): Use EMACS_TIME, not struct timeval.
+        * unexelf.c (round_up, find_section): Use ElfW macro for arguments.
+        * xgselect.c (xg_select): Use SELECT_TYPE, EMACS_TIME.
+
+2010-07-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * alloc.c: Convert function definitions to standard C.
+        * atimer.c:
+        * bidi.c:
+        * bytecode.c:
+        * callint.c:
+        * callproc.c:
+        * casefiddle.c:
+        * casetab.c:
+        * category.c:
+        * ccl.c:
+        * character.c:
+        * charset.c:
+        * chartab.c:
+        * cmds.c:
+        * coding.c:
+        * composite.c:
+        * data.c:
+        * dbusbind.c:
+        * dired.c:
+        * dispnew.c:
+        * doc.c:
+        * doprnt.c:
+        * ecrt0.c:
+        * editfns.c:
+        * fileio.c:
+        * filelock.c:
+        * filemode.c:
+        * fns.c:
+        * font.c:
+        * fontset.c:
+        * frame.c:
+        * fringe.c:
+        * ftfont.c:
+        * ftxfont.c:
+        * gtkutil.c:
+        * indent.c:
+        * insdel.c:
+        * intervals.c:
+        * keymap.c:
+        * lread.c:
+        * macros.c:
+        * marker.c:
+        * md5.c:
+        * menu.c:
+        * minibuf.c:
+        * prefix-args.c:
+        * print.c:
+        * ralloc.c:
+        * regex.c:
+        * region-cache.c:
+        * scroll.c:
+        * search.c:
+        * sound.c:
+        * strftime.c:
+        * syntax.c:
+        * sysdep.c:
+        * termcap.c:
+        * terminal.c:
+        * terminfo.c:
+        * textprop.c:
+        * tparam.c:
+        * undo.c:
+        * unexelf.c:
+        * window.c:
+        * xfaces.c:
+        * xfns.c:
+        * xfont.c:
+        * xftfont.c:
+        * xgselect.c:
+        * xmenu.c:
+        * xrdb.c:
+        * xselect.c:
+        * xsettings.c:
+        * xsmfns.c:
+        * xterm.c: Likewise.
+
+2010-07-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (IT_set_frame_parameters): Fix setting of colors in
+        frames other than the initial one.  Fix reversal of colors when
+        `reverse' is specified in the frame parameters.  Call
+        update_face_from_frame_parameter instead of
+        internal-set-lisp-face-attribute.  Initialize screen colors from
+        initial_screen_colors[] when f->default_face_done_p is zero,
+        instead of depending on being called with default-frame-alist as
+        the alist argument.
+
+        * xfaces.c (update_face_from_frame_parameter): Move out of
+        HAVE_WINDOW_SYSTEM portion.  Condition window-system only parts
+        with HAVE_WINDOW_SYSTEM.
+
+        * msdos.c (IT_set_frame_parameters): Set menu-bar-lines according
+        to menu-bar-mode, if not set in the frame parameters or in
+        default-frame-alist.
+
+        * w32console.c (sys_tputs): Adjust argument list to prototype in
+        term.c.
+
+2010-07-03  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lisp.h (memory_warnings): Fix prototype.
+
+        * cm.h (evalcost): Fix prototype.
+
+        * cm.c (evalcost): Fix arg type.
+
+2010-07-02  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term.c (term_clear_mouse_face, Fidentity):
+        * syssignal.h (signal_handler_t):
+        * lisp.h (memory_warnings):
+        * coding.h (preferred_coding_system):
+        * cm.h (evalcost):
+        * blockinput.h (reinvoke_input_signal): Convert to standard C prototypes.
+
+2010-07-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * dosfns.h (msdos_stdcolor_idx, msdos_stdcolor_name): Remove P_
+        from prototypes.
+
+        * msdos.h (load_pixmap): Don't define away.
+
+2010-07-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * lisp.h:
+        * atimer.h: Remove define for P_.
+
+        * alloc.c: Remove __P and P_ from .c and .m files.
+        * atimer.c:
+        * buffer.c:
+        * callint.c:
+        * category.c:
+        * charset.c:
+        * chartab.c:
+        * cm.c:
+        * coding.c:
+        * composite.c:
+        * data.c:
+        * dired.c:
+        * dispnew.c:
+        * doc.c:
+        * editfns.c:
+        * emacs.c:
+        * eval.c:
+        * fileio.c:
+        * filelock.c:
+        * fns.c:
+        * font.c:
+        * fontset.c:
+        * frame.c:
+        * ftfont.c:
+        * ftxfont.c:
+        * gmalloc.c:
+        * gtkutil.c:
+        * image.c:
+        * indent.c:
+        * intervals.c:
+        * keyboard.c:
+        * keymap.c:
+        * lread.c:
+        * marker.c:
+        * menu.c:
+        * minibuf.c:
+        * print.c:
+        * process.c:
+        * scroll.c:
+        * search.c:
+        * sound.c:
+        * strftime.c:
+        * syntax.c:
+        * sysdep.c:
+        * term.c:
+        * terminal.c:
+        * textprop.c:
+        * unexalpha.c:
+        * w32console.c:
+        * w32fns.c:
+        * w32font.c:
+        * w32menu.c:
+        * w32term.c:
+        * w32uniscribe.c:
+        * window.c:
+        * xdisp.c:
+        * xfaces.c:
+        * xfns.c:
+        * xfont.c:
+        * xftfont.c:
+        * xmenu.c:
+        * xselect.c:
+        * xterm.c: Likewise.
+
+        Remove P_ and __P macros.
+        * atimer.h: Remove P_ and __P macros.
+        * buffer.h:
+        * category.h:
+        * ccl.h:
+        * character.h:
+        * charset.h:
+        * cm.h:
+        * coding.h:
+        * composite.h:
+        * dispextern.h:
+        * disptab.h:
+        * dosfns.h:
+        * font.h:
+        * fontset.h:
+        * frame.h:
+        * gtkutil.h:
+        * indent.h:
+        * intervals.h:
+        * keyboard.h:
+        * keymap.h:
+        * lisp.h:
+        * macros.h:
+        * md5.h:
+        * menu.h:
+        * msdos.h:
+        * nsterm.h:
+        * puresize.h:
+        * region-cache.h:
+        * syntax.h:
+        * syssignal.h:
+        * systime.h:
+        * termhooks.h:
+        * w32font.h:
+        * w32term.h:
+        * widget.h:
+        * window.h:
+        * xgselect.h:
+        * xsettings.h:
+        * xterm.h: Likewise.
+
+2010-07-02  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * lisp.h: Document that USE_LISP_UNION_TYPE is now enabled using autoconf.
+
+        Cleanup old code.
+        * dired.c (BSD4_3): Remove all uses, redundant with BSD4_2.
+        * syssignal.h: Remove code for Lynx, not supported anymore.
+        * vm-limit.c: Remove unused code the depends on emacs not being
+        defined and NO_LIM_DATA being defined.
+        * mem-limits.h: Remove dead code.
+
+2010-07-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * window.c (Fwindow_absolute_pixel_edges): Doc fix.
+
+        * window.c (calc_absolute_offset, Fwindow_absolute_pixel_edges)
+        (Fwindow_inside_absolute_pixel_edges): New functions (bug#5721).
+
+        * nsfns.m (compute_tip_xy): Do not convert coordinates from frame
+        parameters, they are already absolute.
+
+        * nsterm.m (x_set_window_size, initFrameFromEmacs):
+        Rename FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT.
+
+        * nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT.
+
+        * nsmenu.m (update_frame_tool_bar, free_frame_tool_bar):
+        Update FRAME_TOOLBAR_HEIGHT.
+
+        * nsmenu.m (free_frame_tool_bar, update_frame_tool_bar):
+        Add BLOCK/UNBLOCK_INPUT so asserts don't trigger.
+
+2010-06-30  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.c (get_future_frame_param, Fmake_terminal_frame): Don't
+        check default-frame-alist.
+
+2010-06-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * process.c (create_process): Avoid using invalid file descriptors.
+
+        * callproc.c (child_setup): Avoid closing a file descriptor twice.
+
+2010-06-30  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c (Ffont_get_system_normal_font, Ffont_get_system_font):
+        Improve documentation.  Return font regardless of use_system_font.
+        (syms_of_xsettings): Improve documentation for font-use-system-font.
+
+2010-07-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfaces.c (realize_face): Garbage the frame if a face is removed
+        (Bug#6593).
+
+2010-07-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * keyboard.c: Remove duplicate <setjmp.h>.
+        (read_key_sequence): Remove volatile qualifiers.
+
+2010-07-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispextern.h (FRINGE_HEIGHT_BITS): New define.
+        (struct glyph_row): New members left_fringe_offset and
+        right_fringe_offset.
+
+        * xterm.c (x_draw_fringe_bitmap): Don't clip bottom aligned bitmap
+        specially.
+        * w32term.c (w32_draw_fringe_bitmap): Likewise.
+        * nsterm.m (ns_draw_fringe_bitmap): Likewise.
+
+        * fringe.c (draw_fringe_bitmap_1): Don't clip bitmap here.
+        Take account of bitmap offset.
+        (draw_window_fringes): Take account of window vscroll.
+        (update_window_fringes): Likewise.  Extend top-aligned top indicator
+        or bottom-aligned bottom indicator to adjacent rows if it doesn't fit
+        in one row.  Don't set redraw_fringe_bitmaps_p outside row comparison.
+        Set left_fringe_offset and right_fringe_offset (Bug#5634, Bug#6325).
+
+2010-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32fns.c (Qtooltip): Declare.
+        Suggested by Andy Moreton <andrewjmoreton@gmail.com>.
+
+2010-07-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (x_activate_menubar): Send Press/Release for Gtk+ to avoid
+        grab on just Press (Bug#6499).
+
+2010-07-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.c (Qtooltip): New var.
+        (delete_frame): Use it.  Fix faulty if statement.  Don't update
+        mode line for tooltip frames.  Suggested by Martin Rudalics.
+
+        * xfns.c (x_create_tip_frame):
+        * w32fns.c (x_create_tip_frame): Use it.
+
+2010-06-17  Naohiro Aota  <naota@elisp.net>  (tiny change)
+
+        * xftfont.c (xftfont_open): Check font width one by one also when
+        spacing is dual.
+
+        * ftfont.c (ftfont_open): Ditto.
+
+2010-06-30  Glenn Morris  <rgm@gnu.org>
+
+        * s/sol2-6.h (INHIBIT_X11R6_XIM): Remove, handled by configure now.
+
+        * Makefile.in (CANNOT_DUMP): Update for configure name change.
+
+        * s/freebsd.h (USE_MMAP_FOR_BUFFERS):
+        * s/irix6-5.h (USE_MMAP_FOR_BUFFERS):
+        * s/darwin.h (SYSTEM_MALLOC):
+        * s/sol2-10.h (SYSTEM_MALLOC): Move to configure.
+
+2010-06-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m: extern declare Vmenu_bar_mode, Vtool_bar_mode.
+        (ns_get_screen): Don't assign integer to f.
+        (Fx_display_color_cells): Declarations before statements.
+
+2010-06-28  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (x_default_font_parameter): Remove got_from_system
+        (Bug#6526).
+
+        * xterm.h (gtk_widget_get_window, gtk_widget_get_mapped)
+        (gtk_adjustment_get_page_size, gtk_adjustment_get_upper): New
+        defines based on what configure finds.
+
+        * xterm.c (XTflash): Use gtk_widget_get_window.
+        (xg_scroll_callback): Use gtk_adjustment_get_upper and
+        gtk_adjustment_get_page_size.
+        (handle_one_xevent): Use gtk_widget_get_mapped.
+        (x_term_init): Remove HAVE_GTK_MULTIDISPLAY and associated error
+        messages.
+
+        * xmenu.c (create_and_show_popup_menu): Call gtk_widget_get_mapped.
+
+        * gtkutil.h: Replace HAVE_GTK_FILE_BOTH with
+        HAVE_GTK_FILE_SELECTION_NEW.
+
+        * gtkutil.c (xg_display_open, xg_display_close): Remove
+        HAVE_GTK_MULTIDISPLAY, it is always defined.
+        (xg_display_open): Return type is void.
+        (gtk_widget_set_has_window)
+        (gtk_dialog_get_action_area, gtk_dialog_get_content_area)
+        (gtk_widget_get_sensitive, gtk_adjustment_set_page_size)
+        (gtk_adjustment_set_page_increment)
+        (gtk_adjustment_get_step_increment): #define these if not found
+        by configure.
+        (remove_submenu): New define based on Gtk+ version.
+        (xg_set_cursor, xg_frame_resized, xg_event_is_for_scrollbar): Use
+        gtk_widget_get_window.
+        (xg_frame_resized, xg_update_frame_menubar): Use gtk_widget_get_mapped.
+        (xg_create_frame_widgets): Use gtk_widget_set_has_window.
+        (create_dialog): Use gtk_dialog_get_action_area and
+        gtk_dialog_get_content_area.
+        (xg_uses_old_file_dialog, xg_get_file_name): Remove HAVE_GTK_FILE_BOTH
+        and HAVE_GTK_FILE_CHOOSER_DIALOG_NEW.  File chooser is always
+        available, so checking for HAVE_GTK_FILE_SELECTION_NEW is enough.
+        (xg_update_menubar, xg_update_submenu, xg_show_toolbar_item): Use
+        g_object_ref and g_object_unref.
+        (xg_update_menu_item, xg_tool_bar_menu_proxy): Use
+        gtk_widget_get_sensitive.
+        (xg_update_submenu): Use remove_submenu.
+        (xg_update_scrollbar_pos): Don't use GtkFixedChild, use child
+        properties instead to get old x and y position.
+        (xg_set_toolkit_scroll_bar_thumb): Use gtk_adjustment_get_page_size,
+        gtk_adjustment_get_step_increment, gtk_adjustment_set_page_size,
+        gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment.
+        (xg_get_tool_bar_widgets): New function.
+        (xg_tool_bar_menu_proxy, xg_show_toolbar_item)
+        (update_frame_tool_bar): Call xg_get_tool_bar_widgets.
+        (toolbar_set_orientation): New #define based on if configure
+        finds gtk_orientable_set_orientation.
+        (xg_create_tool_bar): Call toolbar_set_orientation.
+        (xg_make_tool_item, xg_show_toolbar_item): Call gtk_box_pack_start
+        instead of gtk_box_pack_start_defaults.
+
+2010-06-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cmds.c (Fdelete_backward_char): Move into Lisp.
+
+2010-06-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * s/freebsd.h (BSD4_2): Remove redundant definition.
+        bsd-common.h defines it already.
+
+2010-06-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfns.c (Fx_create_frame): Don't consult X resouces when setting
+        menu-bar-lines and tool-bar-lines.  Use menu-bar-mode and
+        tool-bar-mode, which are now set using these X resources at
+        startup, to determine the defaults (Bug#2249).
+
+        * w32fns.c (Fx_create_frame):
+        * nsfns.m (Fx_create_frame): Likewise.
+
+        * frame.c (Vmenu_bar_mode, Vtool_bar_mode): New vars.
+
+2010-06-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gtkutil.c (xg_update_scrollbar_pos):
+        Avoid C99 mid-block variable declaration.
+
 2010-06-22  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xterm.c (x_scroll_bar_create): Remove call to xg_show_scroll_bar.
 
-        * gtkutil.h (xg_show_scroll_bar): : Remove.
+        * gtkutil.h (xg_show_scroll_bar): Remove.
 
         * gtkutil.c (xg_update_scrollbar_pos): Show/hide scroll bar as needed
         if height is less than scroll bar min size.
@@ -11,7 +2699,7 @@
         * xfns.c (x_default_font_parameter): Try to open font from system
         before using it (bug#6478).  Rename got_from_gconf to got_from_system.
 
-2010-06-22  Keith Packard <keithp@keithp.com> (tiny change)
+2010-06-22  Keith Packard  <keithp@keithp.com>  (tiny change)
 
         * font.c (font_parse_fcname): Allow . for sizes like 7.5 (bug#6437).
 
@@ -68,6 +2756,30 @@
 
         * m/ibms390x.h: Rather than duplicating ibms390.h, just include it.
 
+2010-06-26  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * alloc.c (Fmake_byte_code): Don't access undefined argument
+        (Bug#6517).
+
+2010-06-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (next_element_from_image): Ensure that after-strings are
+        read the next time we hit handle_stop (Bug#1336).
+
+2010-06-23  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lread.c (read1): Signal error if #s is not followed by paren.
+
+2010-06-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (free_image): Mark frame as garbaged (Bug#6426).
+
+        * keymap.c (Fdefine_key): Doc fix (Bug#6460).
+
+2010-06-15  Glenn Morris  <rgm@gnu.org>
+
+        * editfns.c (Fbyte_to_string): Pacify compiler.
+
 2010-06-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
@@ -159,8 +2871,8 @@
 
 2010-06-03  Andreas Schwab  <schwab@linux-m68k.org>
 
-        * process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4
-        address.  (Bug#6346)
+        * process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4 address.
+        (Bug#6346)
 
 2010-06-03  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -1367,7 +4079,7 @@
         (struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
         HAVE_XFT.
         (something_changedCB): store_font_changed_event is now
-        store_config_changed_event
+        store_config_changed_event.
         (parse_settings): Rename from parse_xft_settings.  Read
         non-xft xsettings outside #ifdef HAVE_XFT.
         (read_settings): Renamed from read_xft_settings.
@@ -1869,8 +4581,8 @@
         (syms_of_xsettings): Initialize current_font.
         defsubr Sfont_get_system_normal_font.
 
-        * xsettings.h (Ffont_get_system_normal_font,
-        xsettings_get_system_normal_font): Declare.
+        * xsettings.h (Ffont_get_system_normal_font)
+        (xsettings_get_system_normal_font): Declare.
 
         * xfns.c (extern xlwmenu_default_font): Remove.
         (Fx_create_frame): Remove setting of xlwmenu_default_font, moved
@@ -3116,7 +5828,7 @@
         (scroll_end_callback): Remove.
         (xg_create_scroll_bar): Add parameter end_callback, bind it to
         button-release-event.  Replace value-changed event with change-value,
-        bug #5177,
+        bug #5177.
         (xg_event_is_for_scrollbar): Only return true if button is less than 4,
         bug #5177.
 
@@ -3137,7 +5849,7 @@
 
 2009-12-12  Eli Zaretskii  <eliz@gnu.org>
 
-        * dispextern.h (struct text_pos): Use EMACS_INT;
+        * dispextern.h (struct text_pos): Use EMACS_INT.
         (struct glyph): Use EMACS_INT for charpos.
         (struct it): Use EMACS_INT for stop_charpos, end_charpos,
         region_beg_charpos, region_end_charpos,
@@ -3672,7 +6384,7 @@
         (store_symval_forwarding): Take into account the fact that Ints can
         now have more than one tag.
         * buffer.c (syms_of_buffer): Use LISP_INT_TAG.
-        buffer_slot_type_mismatch):
+        (buffer_slot_type_mismatch):
         * xfaces.c (face_attr_equal_p):
         * print.c (print_object):
         * alloc.c (mark_maybe_object, mark_object, survives_gc_p):
@@ -10703,8 +13415,8 @@
 2008-07-15  Chris Hall  <chris@web.workinglinux.com>  (tiny change)
             YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        (make_initial_frame): Call init_frame_faces(f) in CANNOT_DUMP case --
-        fix crash due to different init order.
+        * frame.c (make_initial_frame): Call init_frame_faces(f) in
+        CANNOT_DUMP case -- fix crash due to different init order.
 
 2008-07-15  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
@@ -10901,7 +13613,7 @@
         * m/macppc.h:
         * m/alpha.h: Use GNU_LINUX instead of LINUX.  Reorganize conditionals.
 
-        * m/ibms390x.h (XINT, XUINT): Don't define, same as the default
+        * m/ibms390x.h (XINT, XUINT): Don't define, same as the default.
         (SPECIAL_EMACS_INT):
         * m/ia64.h (SPECIAL_EMACS_INT):
         * m/amdx86-64.h (SPECIAL_EMACS_INT):
@@ -19533,7 +22245,7 @@
         * charset.c (charset_ordered_list_tick): New variable.
         (Fdefine_charset_internal): Increment charset_ordered_list_tick.
         (Funify_charset): New optional arg DEUNIFY.  If it is non-nil,
-        deunify intead of unify a charset.
+        deunify instead of unify a charset.
         (string_xstring_p): Add `const' to local variables.
         (find_charsets_in_text): Add `const' to arguments and local variables.
         (encode_char): Adjust for the change of Funify_charset.  Fix