merge trunk

1 files changed, 512 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f35c67039c..84730fede8a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -24,6 +24,516 @@
         (append_glyph, produce_image_glyph, append_stretch_glyph)
         (note_mouse_highlight): Likewise.
 
+2010-09-26  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * process.c (add_keyboard_wait_descriptor)
+        (delete_keyboard_wait_descriptor): Reinstate ifdef subprocesses.
+        (wait_reading_process_output): Don't pass write_mask to select
+        if SELECT_CANT_DO_WRITE_MASK is defined.
+        (SELECT_CANT_DO_WRITE_MASK): Define if SELECT_CANT_DO_WRITE_MASK.
+
+        * process.h (add_read_fd, delete_read_fd, add_write_fd)
+        (delete_write_fd): Declare.
+
+        * process.c (gpm_wait_mask, max_gpm_desc): Remove.
+        (write_mask): New variable.
+        (max_input_desc): Renamed from max_keyboard_desc.
+        (fd_callback_info): New variable.
+        (add_read_fd, delete_read_fd, add_write_fd, delete_write_fd): New
+        functions.
+        (Fmake_network_process): FD_SET write_mask.
+        (deactivate_process): FD_CLR write_mask.
+        (wait_reading_process_output): Connecting renamed to Writeok.
+        check_connect removed.  check_write is new.  Remove references to
+        gpm.  Use Writeok/check_write unconditionally (i.e. no #ifdef
+        NON_BLOCKING_CONNECT) instead of Connecting.
+        Loop over file descriptors and call callbacks in fd_callback_info
+        if file descriptor is ready for I/O.
+        (add_gpm_wait_descriptor): Just call add_keyboard_wait_descriptor.
+        (delete_gpm_wait_descriptor): Just call delete_keyboard_wait_descriptor.
+        (keyboard_bit_set): Use max_input_desc.
+        (add_keyboard_wait_descriptor, delete_keyboard_wait_descriptor): Remove
+        #ifdef subprocesses. Use max_input_desc.
+        (init_process): Initialize write_mask and fd_callback_info.
+
+        * keyboard.c (readable_events, gobble_input): Remove DBUS code.
+
+        * dbusbind.c: Include process.h.
+        (dbus_fd_cb, xd_find_watch_fd, xd_toggle_watch)
+        (xd_read_message_1): New functions.
+        (xd_add_watch, xd_remove_watch): Call xd_find_watch_fd.  Handle
+        watch for both read and write.
+        (Fdbus_init_bus): Also register xd_toggle_watch.
+        (Fdbus_call_method_asynchronously, Fdbus_method_return_internal)
+        (Fdbus_method_error_internal, Fdbus_send_signal): Remove call
+        to dbus_connection_flush.
+        (xd_read_message):  Move most of the code to xd_read_message_1.
+        Call xd_read_message_1 until status is COMPLETE.
+
+2010-09-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term.c: Do not include sys/ioctl.h, not needed.
+        (init_tty): Reorder code to reduce the number of #ifdefs.  No code
+        changes.
+
+2010-09-26  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * process.h: Set up GnuTLS support.
+
+        * process.c (make_process, Fstart_process)
+        (read_process_output, send_process): Set up GnuTLS support for
+        process input/output file descriptors.
+
+        * gnutls.h: The GnuTLS glue for Emacs, macros and enums.
+
+        * gnutls.c: The source code for GnuTLS support in Emacs.
+
+        * emacs.c: Set up GnuTLS support and call syms_of_gnutls.
+
+        * config.in: Set up GnuTLS support.
+
+        * Makefile.in (LIBGNUTLS_LIBS, LIBGNUTLS_CFLAGS, ALL_CFLAGS)
+        (obj, LIBES): Set up GnuTLS support.
+
+2010-09-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32.c (get_emacs_configuration_options): Fix previous change.
+
+2010-09-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * insdel.c (prepare_to_modify_buffer): Ensure the mark marker is
+        alive before using it (Bug#6977).
+
+2010-09-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * xdisp.c (face_before_or_after_it_pos): EMACS_INT/int fixup.
+
+        * dispextern.h: EMACS_INT/int fixup.
+
+        * xdisp.c (string_pos_nchars_ahead, init_iterator): EMACS_INT/int
+        fixup.
+
+        * xrdb.c (magic_file_p): EMACS_INT/int fixup.
+
+2010-09-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.c (Fpos_visible_in_window_p, Fdelete_other_windows)
+        (Fselect_window, window_scroll_pixel_based)
+        (window_scroll_line_based, Frecenter, Fset_window_configuration):
+        Use EMACS_INT for buffer positions.
+
+        * textprop.c (validate_interval_range, interval_of)
+        (property_change_between_p, Fadd_text_properties)
+        (set_text_properties_1, Fremove_text_properties)
+        (Fremove_list_of_text_properties, Ftext_property_any)
+        (Ftext_property_not_all, copy_text_properties)
+        (text_property_list, extend_property_ranges)
+        (verify_interval_modification): Use EMACS_INT for buffer
+        positions.
+
+        * term.c (fast_find_position, term_mouse_highlight): Use EMACS_INT
+        for buffer positions.
+
+        * process.c (read_process_output, send_process)
+        (Fprocess_send_region, status_notify): Use EMACS_INT for buffer
+        and string positions and size.
+
+        * print.c (print_object, print_string, strout): Use EMACS_INT for
+        string indices.
+
+        * minibuf.c (string_to_object): Use EMACS_INT for string position
+        and size.
+
+        * marker.c (verify_bytepos): Use EMACS_INT for buffer positions.
+
+        * lread.c <read_from_string_index, read_from_string_index_byte>
+        <read_from_string_limit, readchar_count>: Define EMACS_INT.
+        (readchar, unreadchar, read_internal_start): Use EMACS_INT for
+        buffer positions and string length.
+
+        * keyboard.c <last_point_position, last_non_minibuf_size>: Declare
+        EMACS_INT.
+        (echo_truncate, adjust_point_for_property, read_char)
+        (gen_help_event, make_lispy_event, modify_event_symbol)
+        (Fexecute_extended_command, stuff_buffered_input): Use EMACS_INT
+        for buffer positions and string length.
+
+        * keyboard.h (gen_help_event): Adjust prototype.
+
+        * termhooks.h <struct input_event>: Make `code' member EMACS_INT.
+
+        * commands.h <last_point_position>: Declare EMACS_INT.
+
+        * xdisp.c <help_echo_pos>: Define as EMACS_INT.
+        (truncate_echo_area): Accept EMACS_INT argument.
+
+        * dispextern.h <help_echo_pos>: Declare EMACS_INT.
+
+        * lisp.h (truncate_echo_area): Adjust prototype.
+
+        * composite.c (composition_adjust_point): Return EMACS_INT.
+
+        * composite.h (composition_adjust_point): Adjust prototype.
+
+2010-09-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * process.c (Fmake_network_process): When arg :host is 'local,
+        use address 127.0.0.1, not name "localhost".  (Bug#6781)
+
+2010-09-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * indent.c (Fcurrent_indentation, indented_beyond_p)
+        (compute_motion): Use EMACS_INT for buffer position variables.
+
+        * lisp.h (indented_beyond_p): Adjust prototype.
+
+        * buffer.c (overlay_strings): Return EMACS_INT.
+
+        * buffer.h (overlay_strings): Adjust prototype.
+
+        * region-cache.c (pp_cache): Adjust format to arguments.
+
+        * eval.c <specpdl_size, lisp_eval_depth>: Declare EMACS_INT.
+        (call_debugger): Use EMACS_INT for specpdl_size related variables.
+        (verror): Use EMACS_INT for size of allocated buffer.
+
+        * keyboard.c (make_lispy_position): Use EMACS_INT for buffer
+        positions.
+
+        * xdisp.c (redisplay_internal, try_window_id)
+        (set_cursor_from_row, find_first_unchanged_at_end_row): Use
+        EMACS_INT for buffer positions.
+
+        * dispextern.h (set_cursor_from_row): Adjust prototype.
+
+        * dispnew.c (increment_matrix_positions)
+        (increment_row_positions, copy_glyph_row_contents)
+        (mode_line_string, marginal_area_string): Use EMACS_INT for buffer
+        positions.
+
+        * dispextern.h (mode_line_string, marginal_area_string)
+        (increment_matrix_positions, increment_row_positions): Adjust
+        prototypes.
+
+        * data.c (Faref, Faset): Use EMACS_INT for string length and
+        positions.
+
+        * cmds.c (internal_self_insert): Use EMACS_INT for the count of
+        characters to insert.
+
+        * ccl.c (Fccl_execute_on_string): Use EMACS_INT for string
+        position and size.
+
+        * syntax.c (scan_words, update_syntax_table)
+        (prev_char_comend_first, back_comment, skip_chars)
+        (skip_syntaxes, Fforward_comment, Fbackward_prefix_chars): Use
+        EMACS_INT for buffer and string positions.
+
+        * syntax.h (scan_words, update_syntax_table): Adjust prototypes.
+
+        * casefiddle.c (operate_on_word): Use EMACS_INT for buffer
+        positions.
+
+2010-09-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * scroll.c (calculate_scrolling, line_ins_del)
+        (calculate_direct_scrolling, scroll_cost): Fix EMACS_INT/int
+        conversion.
+
+        * region-cache.c (move_cache_gap, set_cache_region, pp_cache)
+        (region_cache_backward, region_cache_forward)
+        (revalidate_region_cache, set_cache_region): FIX EMACS_INT/int
+        conversion.
+
+        * xdisp.c (message_dolog): Fix EMACS_INT/int conversion.
+
+        * eval.c (verror): Fix EMACS_INT/int conversion.
+
+        * print.c (PRINTDECLARE, PRINTPREPARE, strout, print_string)
+        (print_preprocess, print_check_string_charset_prop)
+        (print_object): Fix EMACS_INT/int conversion.
+
+        * xdisp.c (message_dolog): Fix EMACS_INT/int conversion.
+
+2010-09-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * callproc.c (Fcall_process): Use EMACS_INT for count of
+        characters read from the subprocess.
+
+        * bidi.c (struct bidi_paragraph_info): Use EMACS_INT for buffer
+        positions.
+        (bidi_cache_search, bidi_cache_find): Use EMACS_INT for buffer
+        positions.
+
+        * buffer.c (struct sortvec): Use EMACS_INT for buffer positions.
+        (struct sortstrlist, overlay_str_len): Use EMACS_INT for string
+        length.
+        (advance_to_char_boundary, Fset_buffer_multibyte)
+        (overlays_at, overlays_in, mouse_face_overlay_overlaps)
+        (overlay_touches_p, record_overlay_string, overlay_strings)
+        (recenter_overlay_lists, fix_start_end_in_overlays)
+        (modify_overlay, Fmove_overlay, report_overlay_modification)
+        (evaporate_overlays): Use EMACS_INT for buffer positions.
+
+        * lisp.h (fix_start_end_in_overlays, overlay_touches_p): Adjust
+        prototypes.
+
+        * dispextern.h (struct bidi_saved_info): Use EMACS_INT for buffer
+        positions.
+
+        * fns.c (Fcompare_strings, Fstring_lessp, concat)
+        (string_make_unibyte, Fstring_as_unibyte, Fsubstring)
+        (Fsubstring_no_properties, substring_both, Ffillarray)
+        (Fclear_string, mapcar1, Fmapconcat, Fmapcar, Fmapc)
+        (Fbase64_encode_region, Fbase64_encode_string, base64_encode_1)
+        (Fbase64_decode_region, Fbase64_decode_string, base64_decode_1)
+        (Fmd5): Use EMACS_INT for buffer and string positions and length
+        variables and arguments.
+
+        * lisp.h (substring_both): Adjust prototype.
+
+2010-09-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        Remove W32 API function pointer unused since 2005-02-15 (revno 2005-02-15T23:19:26Z!jasonr@gnu.org).
+        * w32fns.c (clipboard_sequence_fn): Don't declare.
+        (globals_of_w32fns): Don't initialize it.
+
+2010-09-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * syntax.c (back_comment): Detect the case where a 1-char comment
+        starter is also the 2nd char of a 2-char comment ender.
+
+2010-09-23  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_tool_bar_menu_proxy): Set gtk-menu-items to TRUE.
+
+2010-09-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * eval.c (verror): EMACS_INT/int cleanup.
+
+        * lisp.h (SPECPDL_INDEX): Cast to int, since we're not going to
+        unwind_protect more than 2GB worth of functions.
+
+        * editfns.c (Finsert_char): EMACS_INT/int cleanup.
+
+        * lisp.h: Have oblookup take EMACS_INT to allow interning big
+        string and avoid compiler warnings.
+        (USE_SAFE_ALLOCA): Cast to int to avoid compilation warnings in
+        all users.
+
+        * lread.c (oblookup): EMACS_INT/int cleanup.
+
+        * cmds.c (Fforward_line, Fdelete_char): EMACS_INT/int cleanup.
+
+2010-09-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * editfns.c (clip_to_bounds): Return an EMACS_INT value.
+
+        * lisp.h (clip_to_bounds): Adjust prototype.
+
+        * intervals.c (adjust_for_invis_intang): Return EMACS_INT value.
+
+2010-09-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * lisp.h: doprnt.c EMACS_INT/int cleanup.
+
+        * doprnt.c (doprnt): EMACS_INT/int cleanup.
+
+        * doc.c (Fsnarf_documentation, get_doc_string): EMACS_INT/int
+        cleanup.
+
+        * lisp.h: Change the definition of all marker.c functions that
+        take and return buffer stuff to be EMACS_INT instead of int.
+
+        * marker.c (buf_charpos_to_bytepos, CONSIDER, set_marker_both)
+        (buf_charpos_to_bytepos, bytepos_to_charpos)
+        (buf_bytepos_to_charpos, Fbuffer_has_markers_at)
+        (set_marker_restricted, set_marker_both): Convert int to EMACS_INT
+        for all buffer positions.
+
+2010-09-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * intervals.c (traverse_intervals, rotate_right, rotate_left)
+        (split_interval_right, find_interval, next_interval)
+        (delete_node, delete_interval, interval_deletion_adjustment)
+        (adjust_intervals_for_deletion, merge_interval_right)
+        (merge_interval_left, graft_intervals_into_buffer)
+        (copy_intervals): Convert EMACS_UINTs to EMACS_INT.
+
+        * intervals.h (traverse_intervals): Update prototype.
+
+2010-09-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * indent.c (compute_motion): Use EMACS_INT for arguments to
+        region_cache_forward.
+
+        * region-cache.c (struct boundary, struct region_cache): Use
+        EMACS_INT for positions.
+        (find_cache_boundary, move_cache_gap, insert_cache_boundary)
+        (delete_cache_boundaries, set_cache_region)
+        (invalidate_region_cache, know_region_cache)
+        (region_cache_forward, region_cache_backward, pp_cache): Use
+        EMACS_INT for buffer positions.
+
+        * region-cache.h (know_region_cache, invalidate_region_cache)
+        (region_cache_forward, region_cache_backward): Adjust prototypes.
+
+        * search.c (string_match_1, fast_c_string_match_ignore_case)
+        (looking_at_1, scan_buffer, scan_newline)
+        (find_next_newline_no_quit, find_before_next_newline)
+        (search_command, trivial_regexp_p, search_buffer, simple_search)
+        (boyer_moore, wordify, Freplace_match): Use EMACS_INT for buffer
+        and string positions and length.
+
+        * lisp.h (scan_buffer, scan_newline, find_next_newline_no_quit)
+        (find_before_next_newline): Adjust prototypes.
+
+        * editfns.c (transpose_markers, update_buffer_properties)
+        (buildmark, clip_to_bounds, Fgoto_char, overlays_around)
+        (get_pos_property, Fconstrain_to_field)
+        (Fline_beginning_position, Fline_end_position, Fprevious_char)
+        (Fchar_after, Fchar_before, Finsert_char)
+        (Finsert_buffer_substring, Fcompare_buffer_substrings)
+        (Fsubst_char_in_region, Fformat, Ftranspose_regions): Use
+        EMACS_INT for buffer and string position variables.
+        (Finsert_char): Protect against too large insertions.
+
+        * lisp.h (clip_to_bounds): Adjust prototype.
+
+        * intervals.c (traverse_intervals, rotate_right, rotate_left)
+        (balance_an_interval, split_interval_right, split_interval_left)
+        (find_interval, next_interval, update_interval)
+        (adjust_intervals_for_insertion, delete_node, delete_interval)
+        (interval_deletion_adjustment, adjust_intervals_for_deletion)
+        (offset_intervals, merge_interval_right, merge_interval_left)
+        (graft_intervals_into_buffer, adjust_for_invis_intang)
+        (move_if_not_intangible, get_local_map, copy_intervals)
+        (copy_intervals_to_string, compare_string_intervals)
+        (set_intervals_multibyte_1): Use EMACS_INT for buffer positions
+        and for interval tree size.
+
+        * intervals.h (traverse_intervals, split_interval_right)
+        (split_interval_left, find_interval, offset_intervals)
+        (graft_intervals_into_buffer, copy_intervals)
+        (copy_intervals_to_string, move_if_not_intangible, get_local_map)
+        (update_interval): Adjust prototypes.
+
+        * xdisp.c (check_point_in_composition, reconsider_clip_changes):
+        Use EMACS_INT for buffer position variables and arguments.
+
+        * composite.c (get_composition_id, find_composition)
+        (run_composition_function, compose_text)
+        (composition_gstring_width, autocmp_chars)
+        (composition_update_it, Ffind_composition_internal): Use EMACS_INT
+        for buffer positions and string length variables and arguments.
+
+        * composite.h (get_composition_id, find_composition, compose_text)
+        (composition_gstring_width): Adjust prototypes.
+
+        * editfns.c (Fformat): Use EMACS_INT for string size variables.
+
+        * xdisp.c (store_mode_line_noprop, display_mode_element): Use
+        EMACS_INT for string positions.
+
+        * intervals.c (get_property_and_range): Use EMACS_INT for buffer
+        position arguments.
+
+        * intervals.h (get_property_and_range): Adjust prototype.
+
+        * character.c (parse_str_as_multibyte, str_as_multibyte)
+        (parse_str_to_multibyte, str_to_multibyte, str_as_unibyte)
+        (string_count_byte8, string_escape_byte8, c_string_width)
+        (strwidth, lisp_string_width, multibyte_chars_in_text): Use
+        EMACS_INT for string length variables and arguments.
+
+        * character.h (parse_str_as_multibyte, str_as_multibyte)
+        (parse_str_to_multibyte, str_to_multibyte, str_as_unibyte)
+        (c_string_width, strwidth, lisp_string_width): Adjust
+        prototypes.
+
+        * font.c (font_intern_prop): Use EMACS_INT for string length
+        variables.
+
+        * font.c (font_intern_prop): Use EMACS_INT for string length
+        variables.
+
+        * fns.c (Fstring_as_multibyte): Use EMACS_INT for string length
+        variables.
+
+        * alloc.c <total_string_size>: Declare as EMACS_INT, not int.
+        (Fmake_string): Protect against too large strings.
+        (live_string_p, live_cons_p, live_symbol_p, live_float_p)
+        (live_misc_p): Use ptrdiff_t instead of int for pointer
+        differences.
+        (string_bytes, check_sblock, check_string_free_list)
+        (allocate_string_data, compact_small_strings, Fmake_string)
+        (Fmake_bool_vector, make_string, make_unibyte_string)
+        (make_multibyte_string, make_string_from_bytes)
+        (make_specified_string_string, Fmake_list, Fmake_vector): Use
+        EMACS_INT for string length variables and arguments.
+        (find_string_data_in_pure, make_pure_string, make_pure_c_string)
+        (Fpurecopy): Use EMACS_INT for string size.
+        (mark_vectorlike, mark_char_table, mark_object): Use EMACS_UINT
+        for vector size.
+
+        * lisp.h (make_string, make_unibyte_string, make_multibyte_string)
+        (make_string_from_bytes, make_specified_string_string)
+        (make_pure_string, string_bytes, check_point_in_composition):
+        Adjust prototypes.
+
+2010-09-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * editfns.c (Fsubst_char_in_region, Ftranslate_region_internal)
+        (check_translation): Use EMACS_INT for buffer positions and
+        length.
+
+        * undo.c (record_marker_adjustment, record_delete)
+        (record_change, record_point, record_insert)
+        (record_property_change, Fprimitive_undo): Use EMACS_INT for
+        buffer positions.
+
+        * lisp.h (record_marker_adjustment, record_delete)
+        (record_change, record_point, record_insert)
+        (record_property_change, Fprimitive_undo): Adjust prototypes.
+
+2010-09-22  Juanma Barranquero  <lekktu@gmail.com>
+            Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (get_emacs_configuration_options): Fix buffer overrun.
+
+2010-09-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * minibuf.c (Fminibuffer_contents)
+        (Fminibuffer_contents_no_properties)
+        (Fminibuffer_completion_contents): Use EMACS_INT for minibuffer
+        positions.
+
+        * keyboard.c (command_loop_1): Use EMACS_INT to compare point with
+        mark.
+
+        * alloc.c (make_uninit_string, make_uninit_multibyte_string)
+        (allocate_string_data): Accept EMACS_INT for string length.
+
+        * editfns.c (Ffield_string, Ffield_string_no_properties)
+        (make_buffer_string, make_buffer_string_both, Fbuffer_substring)
+        (Fbuffer_substring_no_properties, find_field, Fdelete_field)
+        (Ffield_string, Ffield_string_no_properties, Ffield_beginning)
+        (Ffield_end): Use EMACS_INT for buffer positions.
+
+        * insdel.c (prepare_to_modify_buffer): Use EMACS_INT to compare
+        point with mark.
+
+        * lisp.h (allocate_string_data, make_uninit_string)
+        (make_uninit_multibyte_string, make_buffer_string)
+        (make_buffer_string_both): Adjust prototypes.
+
+2010-09-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xml.c: Switch to GNU indentation.
+        (make_dom): Change parse tree format to match xml.el.
+        (Fxml_parse_html_string_internal): Rename from html-parse-string.
+        (Fxml_parse_string_internal): Rename from xml-parse-string.
+
 2010-09-22  Kenichi Handa  <handa@m17n.org>
 
         * xdisp.c (compute_stop_pos): Call composition_compute_stop_pos
@@ -18809,7 +19319,7 @@
         (Ffont_shape_text): New function.
         (Fopen_font): If the font size is not given, use 12-pixel.
         (Ffont_at): New arg STRING.
-        (syms_of_font): Initalize font_charset_alist.
+        (syms_of_font): Initialize font_charset_alist.
         Declare Ffont_shape_text as a Lisp function.  Call syms_of_XXfont
         conditionally.
 
@@ -19806,7 +20316,7 @@
 
         * font.c (font_unparse_fcname): Fix typo (swidth->width).
         (font_list_entities): Check driver_list->on.
-        (register_font_driver): Initalize `on' member to 0.
+        (register_font_driver): Initialize `on' member to 0.
         (font_update_drivers): New function.
         (Fclear_font_cache): Check driver_list->on.