Merge from mainline.

1 files changed, 267 insertions, 29 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 87649d3db20..356637b0709 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,241 @@
+2011-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.h (BYTE_MARK_STACK): New macro.
+        (mark_byte_stack): Only declare if BYTE_MARK_STACK is set.
+
+        * bytecode.c (BYTE_MAINTAIN_TOP): New macros.
+        (struct byte_stack): Only define `top' and `bottom' if used.
+        (mark_byte_stack): Only define if used.
+        (BEFORE_POTENTIAL_GC, AFTER_POTENTIAL_GC): Nullify if BYTE_MAINTAIN_TOP
+        is not set.
+        (Fbyte_code): Don't set `bottom' unless BYTE_MAINTAIN_TOP is set.
+
+        * term.c (OUTPUT_IF): Use OUTPUT.
+
+        * alloc.c (Fgarbage_collect): When using stack scanning, don't
+        redundantly scan byte-code stacks, catchlist, and handlerlist.
+
+2011-02-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m (Fx_create_frame, ns_set_name_as_filename)
+        (Fns_read_file_name): Replace B_ with BVAR.
+
+        * nsterm.m (ns_term_init): Use KVAR.
+
+2011-02-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (internal_terminal_init): Use KVAR.
+
+        * w32fns.c (Fx_create_frame): Use KVAR.
+
+        * w32term.c (w32_create_terminal): Use KVAR.
+
+        * s/ms-w32.h (MODE_LINE_BINARY_TEXT): Remove.
+        (getloadavg): Declare prototype which was removed from lisp.h.
+
+        * xdisp.c (decode_mode_spec): Don't use MODE_LINE_BINARY_TEXT.
+
+        * fileio.c (Finsert_file_contents, Fwrite_region):
+        Remove references to buffer_file_type.
+        (syms_of_fileio): Don't intern and staticpro
+        find-buffer-file-type.
+
+        * callproc.c (syms_of_callproc): Remove references to
+        buffer_file_type.
+
+        * buffer.c (reset_buffer_local_variables): Don't set
+        buffer_file_type.
+        (init_buffer_once): Likewise.
+        (syms_of_buffer): Don't define buffer-file-type.
+
+        * buffer.h (struct buffer): Remove buffer_file_type.
+
+2011-02-16  Tom Tromey  <tromey@parfait>
+
+        * callint.c (Fcall_interactively): Update for change to field names.
+        * doc.c (Fsubstitute_command_keys): Update for change to field names.
+        * cmds.c (Fself_insert_command): Update for change to field names.
+        * keymap.c (Fcurrent_active_maps, Fkey_binding)
+        (Fdescribe_buffer_bindings): Update for change to field names.
+        * macros.c (Fstart_kbd_macro, end_kbd_macro, Fend_kbd_macro)
+        (store_kbd_macro_char, Fcall_last_kbd_macro, Fexecute_kbd_macro):
+        Update for change to field names.
+        * keyboard.c (echo_char, echo_dash, echo_now, cancel_echoing)
+        (echo_length, echo_truncate, cmd_error, command_loop_1)
+        (read_char, kbd_buffer_store_event_hold, make_lispy_event)
+        (menu_bar_items, tool_bar_items, read_char_minibuf_menu_prompt)
+        (read_key_sequence, Fcommand_execute, Fexecute_extended_command)
+        (Fdiscard_input, init_kboard, init_keyboard, mark_kboards):
+        Update for change to field names.
+        * xfns.c (Fx_create_frame): Update for change to field names.
+        * xterm.c (x_connection_closed, x_term_init): Update for change to
+        field names.
+        * term.c (term_get_fkeys_1, CONDITIONAL_REASSIGN, init_tty):
+        Update for change to field names.
+        * window.c (window_scroll_pixel_based, window_scroll_line_based):
+        Update for change to field names.
+        * frame.c (make_frame_without_minibuffer, Fhandle_switch_frame)
+        (delete_frame): Update for change to field names.
+        * lisp.h (DEFVAR_KBOARD): Update for change to field names.
+        * keyboard.h (struct kboard): Rename all Lisp_Object fields.
+        (KBOARD_INTERNAL_FIELD, KVAR): New macros.
+
+2011-02-16  Tom Tromey  <tromey@redhat.com>
+
+        * lisp.h (DEFVAR_BUFFER_DEFAULTS): Use BVAR.
+
+2011-02-16  Tom Tromey  <tromey@parfait>
+
+        * xfns.c (x_create_tip_frame, Fx_show_tip): Replace B_ with BVAR.
+        * xfaces.c (compute_char_face): Replace B_ with BVAR.
+        * xdisp.c (pos_visible_p, init_iterator, reseat_1)
+        (message_dolog, update_echo_area, ensure_echo_area_buffers)
+        (with_echo_area_buffer, setup_echo_area_for_printing)
+        (set_message_1, update_menu_bar, update_tool_bar)
+        (text_outside_line_unchanged_p, redisplay_internal)
+        (try_scrolling, try_cursor_movement, redisplay_window)
+        (try_window_reusing_current_matrix, row_containing_pos)
+        (try_window_id, get_overlay_arrow_glyph_row, display_line)
+        (Fcurrent_bidi_paragraph_direction, display_mode_lines)
+        (decode_mode_spec_coding, decode_mode_spec, display_count_lines)
+        (get_window_cursor_type, note_mouse_highlight): Replace B_ with
+        BVAR.
+        * window.c (window_display_table, unshow_buffer, window_loop)
+        (window_min_size_2, set_window_buffer, Fset_window_buffer)
+        (select_window, Fforce_window_update, temp_output_buffer_show)
+        (Fset_window_configuration, save_window_save): Replace B_ with
+        BVAR.
+        * w32fns.c (x_create_tip_frame, Fx_show_tip, Fw32_shell_execute):
+        Replace B_ with BVAR.
+        * undo.c (record_point, record_insert, record_delete)
+        (record_marker_adjustment, record_first_change)
+        (record_property_change, Fundo_boundary, truncate_undo_list)
+        (Fprimitive_undo): Replace B_ with BVAR.
+        * syntax.h (Vstandard_syntax_table, CURRENT_SYNTAX_TABLE)
+        (SETUP_BUFFER_SYNTAX_TABLE): Replace B_ with BVAR.
+        * syntax.c (update_syntax_table, dec_bytepos, Fsyntax_table)
+        (Fset_syntax_table, Fmodify_syntax_entry, skip_chars)
+        (skip_syntaxes, scan_lists): Replace B_ with BVAR.
+        * search.c (compile_pattern_1, compile_pattern, looking_at_1)
+        (string_match_1, fast_looking_at, newline_cache_on_off)
+        (search_command, search_buffer, simple_search, boyer_moore)
+        (Freplace_match): Replace B_ with BVAR.
+        * process.c (get_process, list_processes_1, Fstart_process)
+        (Fmake_serial_process, Fmake_network_process)
+        (read_process_output, send_process, exec_sentinel)
+        (status_notify, setup_process_coding_systems): Replace B_ with
+        BVAR.
+        * print.c (PRINTDECLARE, PRINTPREPARE, PRINTFINISH, printchar)
+        (strout, print_string, temp_output_buffer_setup, print_object):
+        Replace B_ with BVAR.
+        * msdos.c (IT_frame_up_to_date): Replace B_ with BVAR.
+        * minibuf.c (read_minibuf, get_minibuffer, Fread_buffer):
+        Replace B_ with BVAR.
+        * marker.c (Fmarker_buffer, Fset_marker, set_marker_restricted)
+        (set_marker_both, set_marker_restricted_both, unchain_marker):
+        Replace B_ with BVAR.
+        * lread.c (readchar, unreadchar, openp, readevalloop)
+        (Feval_buffer, Feval_region): Replace B_ with BVAR.
+        * lisp.h (DOWNCASE_TABLE, UPCASE_TABLE): Replace B_ with BVAR.
+        * keymap.c (Flocal_key_binding, Fuse_local_map)
+        (Fcurrent_local_map, push_key_description)
+        (Fdescribe_buffer_bindings): Replace B_ with BVAR.
+        * keyboard.c (command_loop_1, read_char_minibuf_menu_prompt)
+        (read_key_sequence): Replace B_ with BVAR.
+        * intervals.h (TEXT_PROP_MEANS_INVISIBLE): Replace B_ with BVAR.
+        * intervals.c (set_point_both, get_local_map): Replace B_ with
+        BVAR.
+        * insdel.c (check_markers, insert_char, insert_1_both)
+        (insert_from_string_1, insert_from_gap, insert_from_buffer_1)
+        (adjust_after_replace, replace_range, del_range_2)
+        (modify_region, prepare_to_modify_buffer)
+        (Fcombine_after_change_execute): Replace B_ with BVAR.
+        * indent.c (buffer_display_table, recompute_width_table)
+        (width_run_cache_on_off, current_column, scan_for_column)
+        (Findent_to, position_indentation, compute_motion, vmotion):
+        Replace B_ with BVAR.
+        * fringe.c (get_logical_cursor_bitmap)
+        (get_logical_fringe_bitmap, update_window_fringes): Replace B_
+        with BVAR.
+        * frame.c (make_frame_visible_1): Replace B_ with BVAR.
+        * font.c (font_at): Replace B_ with BVAR.
+        * fns.c (Fbase64_encode_region, Fbase64_decode_region, Fmd5):
+        Replace B_ with BVAR.
+        * filelock.c (unlock_all_files, Flock_buffer, Funlock_buffer)
+        (unlock_buffer): Replace B_ with BVAR.
+        * fileio.c (Fexpand_file_name, Ffile_directory_p)
+        (Ffile_regular_p, Ffile_selinux_context)
+        (Fset_file_selinux_context, Ffile_modes, Fset_file_modes)
+        (Fset_file_times, Ffile_newer_than_file_p, decide_coding_unwind)
+        (Finsert_file_contents, choose_write_coding_system)
+        (Fwrite_region, build_annotations, Fverify_visited_file_modtime)
+        (Fset_visited_file_modtime, auto_save_error, auto_save_1)
+        (Fdo_auto_save, Fset_buffer_auto_saved): Replace B_ with BVAR.
+        * editfns.c (region_limit, Fmark_marker, save_excursion_save)
+        (save_excursion_restore, Fprevious_char, Fchar_before)
+        (general_insert_function, Finsert_char, Finsert_byte)
+        (make_buffer_string_both, Finsert_buffer_substring)
+        (Fcompare_buffer_substrings, subst_char_in_region_unwind)
+        (subst_char_in_region_unwind_1, Fsubst_char_in_region)
+        (Ftranslate_region_internal, save_restriction_restore)
+        (Fchar_equal): Replace B_ with BVAR.
+        * dispnew.c (Fframe_or_buffer_changed_p): Replace B_ with BVAR.
+        * dispextern.h (WINDOW_WANTS_MODELINE_P)
+        (WINDOW_WANTS_HEADER_LINE_P): Replace B_ with BVAR.
+        * dired.c (directory_files_internal): Replace B_ with BVAR.
+        * data.c (swap_in_symval_forwarding, set_internal)
+        (Fmake_local_variable, Fkill_local_variable, Flocal_variable_p):
+        Replace B_ with BVAR.
+        * composite.c (fill_gstring_header)
+        (composition_compute_stop_pos, composition_adjust_point)
+        (Ffind_composition_internal): Replace B_ with BVAR.
+        * coding.c (decode_coding, encode_coding)
+        (make_conversion_work_buffer, decode_coding_gap)
+        (decode_coding_object, encode_coding_object)
+        (Fdetect_coding_region, Ffind_coding_systems_region_internal)
+        (Funencodable_char_position, Fcheck_coding_systems_region):
+        Replace B_ with BVAR.
+        * cmds.c (Fself_insert_command, internal_self_insert): Replace B_
+        with BVAR.
+        * charset.c (Ffind_charset_region): Replace B_ with BVAR.
+        * character.h (FETCH_CHAR_ADVANCE, INC_BOTH, DEC_BOTH)
+        (ASCII_CHAR_WIDTH): Replace B_ with BVAR.
+        * character.c (chars_in_text, Fget_byte): Replace B_ with BVAR.
+        * category.h (Vstandard_category_table): Replace B_ with BVAR.
+        * category.c (check_category_table, Fcategory_table)
+        (Fset_category_table, char_category_set): Replace B_ with BVAR.
+        * casetab.c (Fcurrent_case_table, set_case_table): Replace B_ with
+        BVAR.
+        * casefiddle.c (casify_object, casify_region): Replace B_ with
+        BVAR.
+        * callproc.c (Fcall_process, Fcall_process_region): Replace B_
+        with BVAR.
+        * callint.c (check_mark, Fcall_interactively): Replace B_ with
+        BVAR.
+        * bytecode.c (Fbyte_code): Replace B_ with BVAR.
+        * buffer.h (FETCH_CHAR, FETCH_CHAR_AS_MULTIBYTE, BVAR): Replace B_
+        with BVAR.
+        * buffer.c (Fbuffer_live_p, Fget_file_buffer)
+        (get_truename_buffer, Fget_buffer_create)
+        (clone_per_buffer_values, Fmake_indirect_buffer, reset_buffer)
+        (reset_buffer_local_variables, Fbuffer_name, Fbuffer_file_name)
+        (Fbuffer_local_value, buffer_lisp_local_variables)
+        (Fset_buffer_modified_p, Frestore_buffer_modified_p)
+        (Frename_buffer, Fother_buffer, Fbuffer_enable_undo)
+        (Fkill_buffer, Fset_buffer_major_mode, set_buffer_internal_1)
+        (set_buffer_temp, Fset_buffer, set_buffer_if_live)
+        (Fbarf_if_buffer_read_only, Fbury_buffer, Ferase_buffer)
+        (Fbuffer_swap_text, swapfield_, Fbuffer_swap_text)
+        (Fset_buffer_multibyte, swap_out_buffer_local_variables)
+        (record_overlay_string, overlay_strings, init_buffer_once)
+        (init_buffer, syms_of_buffer): Replace B_ with BVAR.
+
+2011-02-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (redisplay_internal): Resynchronize `w' if the selected
+        window is changed inside calls to do_pending_window_change.
+        (Bug#8020)
+
 2011-02-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove no-longer needed getloadavg symbols.
@@ -54,8 +292,8 @@
         * xmenu.c (apply_systemfont_to_dialog): Apply to *dialog.font.
         (apply_systemfont_to_menu): Set resources *menubar*font and
         *popup*font.  Remove defflt.
-        (set_frame_menubar, create_and_show_popup_menu): Call
-        apply_systemfont_to_menu before lw_create_widget.
+        (set_frame_menubar, create_and_show_popup_menu):
+        Call apply_systemfont_to_menu before lw_create_widget.
 
 2011-02-14  Tom Tromey  <tromey@redhat.com>
 
@@ -84,8 +322,8 @@
         (PRINTPREPARE, PRINTFINISH, temp_output_buffer_setup)
         (print_object): Use B_.
         * font.c (font_at): Use B_.
-        * fns.c (Fbase64_encode_region, Fbase64_decode_region, Fmd5): Use
-        B_.
+        * fns.c (Fbase64_encode_region, Fbase64_decode_region, Fmd5):
+        Use B_.
         * callint.c (check_mark, Fcall_interactively): Use B_.
         * editfns.c (region_limit, Fmark_marker, save_excursion_save)
         (save_excursion_restore, Fprevious_char, Fchar_before)
@@ -108,8 +346,8 @@
         (Freplace_match): Use B_.
         * indent.c (buffer_display_table, recompute_width_table)
         (width_run_cache_on_off, current_column, scan_for_column)
-        (Findent_to, position_indentation, compute_motion, vmotion): Use
-        B_.
+        (Findent_to, position_indentation, compute_motion, vmotion):
+        Use B_.
         * casefiddle.c (casify_object, casify_region): Use B_.
         * casetab.c (Fcurrent_case_table, set_case_table): Use B_.
         * cmds.c (Fself_insert_command, internal_self_insert): Use B_.
@@ -123,8 +361,8 @@
         (Fdo_auto_save, Fset_buffer_auto_saved): Use B_.
         * minibuf.c (read_minibuf, get_minibuffer, Fread_buffer): Use B_.
         * marker.c (Fmarker_buffer, Fset_marker, set_marker_restricted)
-        (set_marker_both, set_marker_restricted_both, unchain_marker): Use
-        B_.
+        (set_marker_both, set_marker_restricted_both, unchain_marker):
+        Use B_.
         * insdel.c (check_markers, insert_char, insert_1_both)
         (insert_from_string_1, insert_from_gap, insert_from_buffer_1)
         (adjust_after_replace, replace_range, del_range_2)
@@ -148,8 +386,8 @@
         (make_conversion_work_buffer, decode_coding_gap)
         (decode_coding_object, encode_coding_object)
         (Fdetect_coding_region, Ffind_coding_systems_region_internal)
-        (Funencodable_char_position, Fcheck_coding_systems_region): Use
-        B_.
+        (Funencodable_char_position, Fcheck_coding_systems_region):
+        Use B_.
         * charset.c (Ffind_charset_region): Use B_.
         * window.c (window_display_table, unshow_buffer, window_loop)
         (window_min_size_2, set_window_buffer, Fset_window_buffer)
@@ -406,8 +644,8 @@
         callers changed.
         * editfns.c (general_insert_function): Change signature to
         match changes to insert functions' signatures.
-        * keymap.c (map_keymap_char_table_item, map_keymap_internal): Use
-        explicit cast when converting between void * and function pointer
+        * keymap.c (map_keymap_char_table_item, map_keymap_internal):
+        Use explicit cast when converting between void * and function pointer
         types, as C89 requires this.
 
 2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
@@ -527,7 +765,7 @@
 2011-02-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         format-time-string now supports subsecond time stamp resolution
-        * editfns.c (emacs_nmemftime): Renamed from emacs_memftimeu,
+        * editfns.c (emacs_nmemftime): Rename from emacs_memftimeu,
         for consistency with its new argument and with gnulib nstrftime.
         All callers changed.  New argument NS.
         (Fformat_time_string): Check that the time argument's microseconds
@@ -857,11 +1095,11 @@
         (history_delete_duplicates, inhibit_x_resources)
         (last_nonmenu_event, load_in_progress, max_specpdl_size)
         (minibuffer_auto_raise, print_escape_newlines, scroll_margin)
-        (use_dialog_box, use_file_dialog): Remove declaration.  Include
-        globals.h.
+        (use_dialog_box, use_file_dialog): Remove declaration.
+        Include globals.h.
         * keymap.h (Voverriding_local_map)
-        (Voverriding_local_map_menu_flag, meta_prefix_char): Remove
-        declaration.
+        (Voverriding_local_map_menu_flag, meta_prefix_char):
+        Remove declaration.
         * keyboard.h (Vdouble_click_time, Vfunction_key_map)
         (Vinput_method_function, Vkey_translation_map)
         (Vlucid_menu_bar_dirty_flag, Vthis_original_command)
@@ -879,16 +1117,16 @@
         (focus_follows_mouse): Remove declaration.
         * fontset.h (Valternate_fontname_alist, Vfontset_alias_alist)
         (Vignore_relative_composition, Votf_script_alist)
-        (Vuse_default_ascent, Vvertical_centering_font_regexp): Remove
-        declaration.
+        (Vuse_default_ascent, Vvertical_centering_font_regexp):
+        Remove declaration.
         * font.h (Vfont_log): Remove declaration.
         * dosfns.h (Vdos_display_scancodes, Vdos_version)
         (Vdos_windows_version, dos_codepage, dos_country_code)
         (dos_decimal_point, dos_hyper_key, dos_keyboard_layout)
-        (dos_keypad_mode, dos_super_key, dos_timezone_offset): Remove
-        declaration.
-        * disptab.h (Vglyph_table, Vstandard_display_table): Remove
-        declaration.
+        (dos_keypad_mode, dos_super_key, dos_timezone_offset):
+        Remove declaration.
+        * disptab.h (Vglyph_table, Vstandard_display_table):
+        Remove declaration.
         * dispextern.h (Vface_remapping_alist, Vglyphless_char_display)
         (Vmouse_autoselect_window, Voverflow_newline_into_fringe)
         (Vshow_trailing_whitespace, Vtool_bar_button_margin)
@@ -916,10 +1154,10 @@
         (Vselect_safe_coding_system_function)
         (Vtranslation_table_for_input, coding_system_require_warning)
         (eol_mnemonic_dos, eol_mnemonic_mac, eol_mnemonic_undecided)
-        (eol_mnemonic_unix, inherit_process_coding_system): Remove
-        declaration.
-        * charset.h (Vcharset_list, Vcurrent_iso639_language): Remove
-        declaration.
+        (eol_mnemonic_unix, inherit_process_coding_system):
+        Remove declaration.
+        * charset.h (Vcharset_list, Vcurrent_iso639_language):
+        Remove declaration.
         * character.h (Vauto_fill_chars, Vchar_direction_table)
         (Vchar_script_table, Vchar_width_table, Vprintable_chars)
         (Vscript_representative_chars, Vtranslation_table_vector)
@@ -1034,8 +1272,8 @@
         (w32_strict_fontnames, w32_strict_painting): Remove.
         (Vhourglass_delay, Vmenu_bar_mode, Vtool_bar_mode)
         (Vw32_recognize_altgr, Vwindow_system_version)
-        (w32_num_mouse_buttons, w32_use_visible_system_caret): Remove
-        declaration.
+        (w32_num_mouse_buttons, w32_use_visible_system_caret):
+        Remove declaration.
         * w32console.c (syms_of_ntterm): Update.
         (w32_use_full_screen_buffer): Remove.
         (Vtty_defined_color_alist): Remove declaration.