1. 22 Jun, 2011 2 commits
    • Paul Eggert's avatar
      GLYPH_DEBUG fixes · 85fece3e
      Paul Eggert authored
      The following patches are for when GLYPH_DEBUG && !XASSERT.
      * dispextern.h (trace_redisplay_p, dump_glyph_string):
      * dispnew.c (flush_stdout):
      * xdisp.c (dump_glyph_row, dump_glyph_matrix, dump_glyph):
      Mark as externally visible.
      * dispnew.c (check_window_matrix_pointers): Now static.
      * dispnew.c (window_to_frame_vpos):
      * xfns.c (unwind_create_frame):
      * xterm.c (x_check_font): Remove unused local.
      * scroll.c (CHECK_BOUNDS):
      * xfaces.c (cache_fache): Rename local to avoid shadowing.
      * xfns.c, w32fns.c (image_cache_refcount, dpyinfo_refcount): Now static.
      * xdisp.c (check_window_end): Now a no-op if !XASSERTS.
      (debug_first_unchanged_at_end_vpos, debug_last_unchanged_at_beg_vpos)
      (debug_dvpos, debug_dy, debug_delta, debug_delta_bytes, debug_end_vpos):
      Now static.
      (debug_method_add): Use va_list and vsprintf rather than relying
      on undefined behavior with wrong number of arguments.
      (dump_glyph, dump_glyph_row, Fdump_glyph_matrix):
      Don't assume ptrdiff_t and EMACS_INT are the same width as int.
      In this code, it's OK to assume C99 behavior for ptrdiff_t formats
      since we're not interested in debugging glyphs with old libraries.
      * xfaces.c (cache_face): Move debugging code earlier; this pacifies
      GCC 4.6.0's static checking.
      85fece3e
    • Paul Eggert's avatar
      * dispextern.h (struct face.stipple): · 0766b489
      Paul Eggert authored
      * image.c (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
      (x_bitmap_mask, x_allocate_bitmap_record)
      (x_create_bitmap_from_data, x_create_bitmap_from_file)
      (x_destroy_bitmap, x_destroy_all_bitmaps, x_create_bitmap_mask)
      (x_create_bitmap_from_xpm_data):
      * nsterm.h (struct ns_display_info.bitmaps_size, .bitmaps_last):
      * w32term.h (struct w32_display_info.icon_bitmap_id, .bitmaps_size)
      (.bitmaps_last):
      * xfaces.c (load_pixmap):
      * xterm.c (x_bitmap_icon, x_wm_set_icon_pixmap):
      * xterm.h (struct x_display_info.icon_bitmap_id, .bitmaps_size)
      (.bitmaps_last, struct x_output.icon_bitmap):
      Use ptrdiff_t, not int, for bitmap indexes.
      (x_allocate_bitmap_record): Check for size overflow.
      * dispextern.h, lisp.h: Adjust to API changes elsewhere.
      0766b489
  2. 18 Jun, 2011 1 commit
  3. 17 Jun, 2011 1 commit
  4. 13 Jun, 2011 1 commit
  5. 12 Jun, 2011 1 commit
    • Paul Eggert's avatar
      * lisp.h (UNSIGNED_CMP): New macro. · ea204efb
      Paul Eggert authored
      This fixes comparison bugs on 64-bit hosts.
      (ASCII_CHAR_P): Use it.
      * casefiddle.c (casify_object):
      * character.h (ASCII_BYTE_P, CHAR_VALID_P):
      (SINGLE_BYTE_CHAR_P, CHAR_STRING):
      * composite.h (COMPOSITION_ENCODE_RULE_VALID):
      * dispextern.h (FACE_FROM_ID):
      * keyboard.c (read_char): Use UNSIGNED_CMP.
      ea204efb
  6. 11 Jun, 2011 1 commit
    • Chong Yidong's avatar
      Cruft removal in struct image. · b50691aa
      Chong Yidong authored
      * src/dispextern.h (struct image): Replace data member, whose int_val
      and ptr_val fields were not used by anything, with a single
      lisp_val object.
      
      * src/image.c (Fimage_metadata, make_image, mark_image, tiff_load)
      (gif_clear_image, gif_load, imagemagick_load_image)
      (gs_clear_image, gs_load): Callers changed.
      b50691aa
  7. 31 May, 2011 1 commit
    • Paul Eggert's avatar
      Remove arbitrary limit of 2**31 entries in hash tables. · 0de4bb68
      Paul Eggert authored
      * category.c (hash_get_category_set): Use 'EMACS_UINT' and 'EMACS_INT'
      for hashes and hash indexes, instead of 'unsigned' and 'int'.
      * ccl.c (ccl_driver): Likewise.
      * charset.c (Fdefine_charset_internal): Likewise.
      * charset.h (struct charset.hash_index): Likewise.
      * composite.c (get_composition_id, gstring_lookup_cache):
      (composition_gstring_put_cache): Likewise.
      * composite.h (struct composition.hash_index): Likewise.
      * dispextern.h (struct image.hash): Likewise.
      * fns.c (next_almost_prime, larger_vector, cmpfn_eql):
      (cmpfn_equal, cmpfn_user_defined, hashfn_eq, hashfn_eql):
      (hashfn_equal, hashfn_user_defined, make_hash_table):
      (maybe_resize_hash_table, hash_lookup, hash_put):
      (hash_remove_from_table, hash_clear, sweep_weak_table, SXHASH_COMBINE):
      (sxhash_string, sxhash_list, sxhash_vector, sxhash_bool_vector):
      (Fsxhash, Fgethash, Fputhash, Fmaphash): Likewise.
      * image.c (make_image, search_image_cache, lookup_image):
      (xpm_put_color_table_h): Likewise.
      * lisp.h (struct Lisp_Hash_Table): Likewise, for 'count', 'cmpfn',
      and 'hashfn' members.
      * minibuf.c (Ftry_completion, Fall_completions, Ftest_completion):
      Likewise.
      * print.c (print): Likewise.
      * alloc.c (allocate_vectorlike): Check for overflow in vector size
      calculations.
      * ccl.c (ccl_driver): Check for overflow when converting EMACS_INT
      to int.
      * fns.c, image.c: Remove unnecessary static decls that would otherwise
      need to be updated by these changes.
      * fns.c (make_hash_table, maybe_resize_hash_table): Check for integer
      overflow with large hash tables.
      (make_hash_table, maybe_resize_hash_table, Fmake_hash_table):
      Prefer the faster XFLOAT_DATA to XFLOATINT where either will do.
      (SXHASH_REDUCE): New macro.
      (sxhash_string, sxhash_list, sxhash_vector, sxhash_bool_vector):
      Use it instead of discarding useful hash info with large hash values.
      (sxhash_float): New function.
      (sxhash): Use it.  No more need for "& INTMASK" due to above changes.
      * lisp.h (FIXNUM_BITS): New macro, useful for SXHASH_REDUCE etc.
      (MOST_NEGATIVE_FIXNUM, MOST_POSITIVE_FIXNUM, INTMASK): Rewrite
      to use FIXNUM_BITS, as this simplifies things.
      (next_almost_prime, larger_vector, sxhash, hash_lookup, hash_put):
      Adjust signatures to match updated version of code.
      (consing_since_gc): Now EMACS_INT, since a single hash table can
      use more than INT_MAX bytes.
      0de4bb68
  8. 28 May, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix cursor motion across display strings covering reordered text. · 0e14fe90
      Eli Zaretskii authored
       src/xdisp.c (set_cursor_from_row): Set start and stop points
       according to the row's direction when priming the loop that looks
       for the glyph on which to display cursor.
       (single_display_spec_intangible_p): Function deleted.
       (display_prop_intangible_p): Reimplement to call
       handle_display_spec instead of single_display_spec_intangible_p.
       Accept 3 additional arguments needed by handle_display_spec.  This
       fixes incorrect cursor motion across display property with complex
       values: lists, `(when COND...)' forms, etc.
       (single_display_spec_string_p): Support property values that are
       lists with the argument STRING its top-level element.
       (display_prop_string_p): Fix the condition for processing a
       property that is a list to be consistent with handle_display_spec.
       src/keyboard.c (adjust_point_for_property): Adjust the call to
       display_prop_intangible_p to its new signature.
       src/dispextern.h (display_prop_intangible_p): Adjust prototype.
      0e14fe90
  9. 25 May, 2011 1 commit
    • YAMAMOTO Mitsuharu's avatar
      Take account of periodic fringe bitmap's dependency on y-position in redrawing. · e61124cd
      YAMAMOTO Mitsuharu authored
      * dispextern.h (struct glyph_row): New member fringe_bitmap_periodic_p.
      
      * dispnew.c (shift_glyph_matrix, scrolling_window): Mark scrolled row
      for fringe update if it has periodic bitmap.
      (row_equal_p): Also compare left_fringe_offset,	right_fringe_offset,
      and fringe_bitmap_periodic_p.
      
      * fringe.c (get_fringe_bitmap_data): New function.
      (draw_fringe_bitmap_1, update_window_fringes): Use it.
      (update_window_fringes): Record periodicity of fringe bitmap in glyph
      row.  Mark glyph row for fringe update if periodicity changed.
      
      * xdisp.c (try_window_reusing_current_matrix): Don't mark scrolled row
      for fringe update unless it has periodic bitmap.
      e61124cd
  10. 21 May, 2011 1 commit
    • Eli Zaretskii's avatar
      Discovery of replacing display properties now uses the same code · fc6f18ce
      Eli Zaretskii authored
      as the display engine.  Tested OK with display properties whose
      value is a list.
      
       src/dispextern.h (struct bidi_it): New member frame_window_p.
       (bidi_init_it, compute_display_string_pos): Update prototypes.
       src/bidi.c (bidi_fetch_char): Accept additional argument
       FRAME_WINDOW_P and pass it to compute_display_string_pos.  All
       callers changed.
       (bidi_init_it): Accept additional argument FRAME_WINDOW_P and use
       it to initialize the frame_window_p member of struct bidi_it.
       src/xdisp.c (handle_display_spec): New function, refactored from the
       last portion of handle_display_prop.
       (compute_display_string_pos): Accept additional argument
       FRAME_WINDOW_P.  Call handle_display_spec to determine whether the
       value of a `display' property is a "replacing spec".
       (handle_single_display_spec): Accept 2 additional arguments BUFPOS
       and FRAME_WINDOW_P.  If IT is NULL, don't set up the iterator from
       the display property, but just return a value indicating whether
       the display property will replace the characters it covers.
       (Fcurrent_bidi_paragraph_direction): Initialize the nchars and
       frame_window_p members of struct bidi_it.
      fc6f18ce
  11. 14 May, 2011 1 commit
    • Eli Zaretskii's avatar
      Text covered by `display' overlays is correctly reordered. · 7b600102
      Eli Zaretskii authored
      Cursor positioning is not yet right near the overlay.
      
       src/xdisp.c (compute_display_string_pos): Non-trivial implementation.
       (compute_display_string_end): New function.
       src/dispextern.h (compute_display_string_end): Declare prototype.
       src/bidi.c (bidi_resolve_explicit_1): Use ZV for disp_pos.
       (bidi_fetch_char): Implement support for runs of characters
       covered by display strings.
      7b600102
  12. 13 May, 2011 1 commit
  13. 10 May, 2011 1 commit
    • Eli Zaretskii's avatar
      Started work on reordering display strings. Refactor FETCH_CHAR. · 182ce2d2
      Eli Zaretskii authored
      Only compiled, not tested.
      
       src/xdisp.c (compute_display_string_pos): New function.
       (reseat_1): Initialize bidi_it.disp_pos.
       src/bidi.c (bidi_copy_it): Use offsetof.
       (bidi_fetch_char, bidi_fetch_char_advance): New functions.
       (bidi_cache_search, bidi_cache_iterator_state)
       (bidi_paragraph_init, bidi_resolve_explicit, bidi_resolve_weak)
       (bidi_level_of_next_char, bidi_move_to_visually_next): Support
       character positions inside a run of characters covered by a
       display string.
       (bidi_paragraph_init, bidi_resolve_explicit_1)
       (bidi_level_of_next_char): Call bidi_fetch_char and
       bidi_fetch_char_advance instead of FETCH_CHAR and
       FETCH_CHAR_ADVANCE.
       (bidi_init_it): Initialize new members.
       (LRE_CHAR, RLE_CHAR, PDF_CHAR, LRO_CHAR, RLO_CHAR): Remove macro
       definitions.
       (bidi_explicit_dir_char): Lookup character type in bidi_type_table,
       instead of using explicit *_CHAR codes.
       (bidi_resolve_explicit, bidi_resolve_weak): Use
       FETCH_MULTIBYTE_CHAR instead of FETCH_CHAR, as reordering of
       bidirectional text is supported only in multibyte buffers.
       src/dispextern.h (struct bidi_it): New members nchars and disp_pos.
       ch_len is now EMACS_INT.
       (compute_display_string_pos): Declare prototype.
      182ce2d2
  14. 17 Apr, 2011 1 commit
    • Chong Yidong's avatar
      Minor redisplay cleanups. · 4581706e
      Chong Yidong authored
      * src/dispextern.h (FACE_SUITABLE_FOR_ASCII_CHAR_P): Add missing
      definition for no-X builds.
      
      * src/termhooks.h (FRAME_WINDOW_P): Remove duplicated definitions.
      
      * src/xdisp.c (get_next_display_element): Remove unnecessary ifdefs.
      4581706e
  15. 16 Apr, 2011 2 commits
  16. 14 Apr, 2011 3 commits
  17. 13 Apr, 2011 3 commits
    • Paul Eggert's avatar
      * image.c: Make symbols static if they're not exported. · cd44d2eb
      Paul Eggert authored
      * dispextern.h (x_create_bitmap_from_xpm_data): Do not declare
      if USE_GTK.
      * image.c (x_create_bitmap_from_xpm_data): Do not define if USE_GTK.
      (xpm_color_cache, ct_table, ct_colors_allocated): Now static.
      cd44d2eb
    • Paul Eggert's avatar
      * font.c, fontset.c: Make symbols static if they're not exported. · 239f9db9
      Paul Eggert authored
      * dispextern.h (FACE_SUITABLE_FOR_ASCII_CHAR_P): New macro.
      (FACE_SUITABLE_FOR_CHAR_P): Use it.
      * font.c (font_close_object): Now static.
      * font.h (font_close_object): Remove.
      * fontset.c (FONTSET_OBJLIST): Remove.
      (free_realized_fontset) #if-0 the body, which does nothing.
      (face_suitable_for_char_p): #if-0, as it's never called.
      * fontset.h (face_suitable_for_char_p): Remove decl.
      * xfaces.c (face_at_string_position): Use
      FACE_SUITABLE_FOR_ASCII_CHAR_P, not FACE_SUITABLE_FOR_CHAR_P,
      since 0 is always ASCII.
      239f9db9
    • Juanma Barranquero's avatar
      Fix typos. · 7ee6a1d3
      Juanma Barranquero authored
      7ee6a1d3
  18. 12 Apr, 2011 4 commits
    • Paul Eggert's avatar
      * xfns.c: Make symbols static if they're not exported. · e4cebfca
      Paul Eggert authored
      (x_last_font_name, x_display_info_for_name):
      (x_set_foreground_color, x_set_background_color, x_set_mouse_color):
      (x_set_cursor_color, x_set_border_pixel, x_set_border_color):
      (x_set_cursor_type, x_set_icon_type, x_set_icon_name):
      (x_set_scroll_bar_foreground, x_set_scroll_bar_background):
      (x_explicitly_set_name, x_set_title, xic_defaut_fontset, tip_timer):
      (last_show_tip_args): Now static.
      (xic_defaut_fontset, xic_create_fontsetname): Define only if
      defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT
      (x_screen_planes): Remove; unused.
      * dispextern.h (x_screen_planes): Remove decl.
      e4cebfca
    • Paul Eggert's avatar
      * dispnew.c: Make symbols static if they're not exported. · 5bf46f05
      Paul Eggert authored
      * dispextern.h (redraw_garbaged_frames, scrolling):
      (increment_row_positions): Remove.
      * dispnew.c (new_glyph_matrix, increment_row_positions, scrolling):
      (delayed_size_change, glyph_matrix_count, glyph_pool_count):
      Now static.
      (redraw_garbaged_frames): Remove; unused.
      5bf46f05
    • Paul Eggert's avatar
      * xfaces.c: Make symbols static if they're not exported. · 435f4c28
      Paul Eggert authored
      * dispextern.h (ascii_face_of_lisp_face, free_realized_face):
      Remove decls.
      * xterm.h (defined_color): Remove decls.
      (x_free_dpy_colors): Declare only if USE_X_TOOLKIT.
      * xfaces.c (tty_suppress_bold_inverse_default_colors_p):
      (menu_face_changed_default, defined_color, free_realized_face):
      (x_free_dpy_colors): Define only if USE_X_TOOLKIT.
      (ascii_face_of_lisp_face): Remove; unused.
      435f4c28
    • Paul Eggert's avatar
      * xdisp.c: Make symbols static if they're not exported. · 8524aef3
      Paul Eggert authored
      * dispextern.h (scratch_glyph_row, window_box_edges):
      (glyph_to_pixel_coords, set_cursor_from_row):
      (get_next_display_element, set_iterator_to_next):
      (highlight_trailing_whitespace, frame_to_window_pixel_xy):
      (show_mouse_face): Remove decls
      * frame.h (message_buf_print): Likewise.
      * lisp.h (pop_message, set_message, check_point_in_composition):
      Likewise.
      * xterm.h (set_vertical_scroll_bar): Likewise.
      * xdisp.c (list_of_error, Vmessage_stack, line_number_displayed):
      (message_buf_print, scratch_glyph_row, displayed_buffer):
      (set_iterator_to_next, pop_message, set_message, set_cursor_from_row):
      (get_next_display_element, show_mouse_face, window_box_edges):
      (frame_to_window_pixel_xy, check_point_in_composition):
      (set_vertical_scroll_bar, highlight_trailing_whitespace): Now static.
      (glyph_to_pixel_coords): Remove; unused.
      8524aef3
  19. 11 Apr, 2011 1 commit
  20. 31 Mar, 2011 1 commit
    • Juanma Barranquero's avatar
      src/xdisp.c: Remove unused parameters. · e4cc2dfc
      Juanma Barranquero authored
      * dispextern.h (move_it_by_lines):
      * xdisp.c (move_it_by_lines): Remove parameter `need_y_p', unused
        since 2000-12-29T14:24:09Z!gerd@gnu.org.  All callers changed.
        (message_log_check_duplicate): Remove parameters `prev_bol' and
        `this_bol', unused since 1998-01-01T02:27:27Z!rms@gnu.org.  All callers changed.
        (redisplay_internal): Remove parameter `preserve_echo_area',
        unused since 1999-07-21T21:43:52Z!gerd@gnu.org.  All callers changed.
      * indent.c (Fvertical_motion):
      * window.c (window_scroll_pixel_based, Frecenter):
        Don't pass `need_y_p' to `move_it_by_lines'.
      e4cc2dfc
  21. 28 Mar, 2011 1 commit
    • Juanma Barranquero's avatar
      src/*.c: Remove unused parameters and other warnings. · 1db5b1ad
      Juanma Barranquero authored
      * dispextern.h (string_buffer_position): Remove declaration.
      
      * print.c (strout): Remove parameter `multibyte', unused since
        1999-08-21T19:30:21Z!gerd@gnu.org.  All callers changed.
      
      * search.c (boyer_moore): Remove parameters `len', `pos' and `lim',
        never used since function introduction in 1998-02-08T21:33:56Z!rms@gnu.org.
        All callers changed.
      
      * w32.c (_wsa_errlist): Use braces for struct initializers.
      
      * xdisp.c (string_buffer_position_lim): Remove parameter `w',
        never used since function introduction in 2001-03-09T18:41:50Z!gerd@gnu.org.
        All callers changed.
        (string_buffer_position): Likewise.  Also, make static (it's never
        used outside xdisp.c).
        (cursor_row_p): Remove parameter `w', unused since
        2000-10-17T16:08:57Z!gerd@gnu.org.  All callers changed.
        (decode_mode_spec): Remove parameter `precision', introduced during
        Gerd Moellmann's rewrite at 1999-07-21T21:43:52Z!gerd@gnu.org, but never used.
        All callers changed.
      1db5b1ad
  22. 25 Mar, 2011 1 commit
    • Juanma Barranquero's avatar
      nt/*.c, src/*.c: Remove unused variables. · 0f4a96b5
      Juanma Barranquero authored
      * nt/addpm.c (main): Remove unused variable `retval'.
      * nt/preprep.c (main): Remove unused variable `ptr'.
      * src/dispextern.h (glyph_matric): Use #if GLYPH_DEBUG, not #ifdef.
      * src/fileio.c (check_executable) [DOS_NT]: Remove unused variables `len'
        and `suffix'.
        (Fset_file_selinux_context) [HAVE_LIBSELINUX]: Move here declaration
        of variables specific to SELinux and computation of `encoded_absname'.
      * src/image.c (XPutPixel): Remove unused variable `height'.
      * src/keyboard.c (make_lispy_event): Remove unused variable `hpos'.
      * src/unexw32.c (get_section_info): Remove unused variable `section'.
      * src/w32.c (stat): Remove unused variables `drive_root' and `devtype'.
        (system_process_attributes): Remove unused variable `sess'.
        (sys_read): Remove unused variable `err'.
      * src/w32fns.c (top): Wrap variables with #if GLYPH_DEBUG, not #ifdef.
        (w32_wnd_proc): Remove unused variable `isdead'.
        (unwind_create_frame): Use #if GLYPH_DEBUG, not #ifdef.
        (Fx_server_max_request_size): Remove unused variable `dpyinfo'.
        (x_create_tip_frame): Remove unused variable `tem'.
      * src/w32inevt.c (w32_console_read_socket): Remove unused variable `no_events'.
      * src/w32term.c (x_draw_composite_glyph_string_foreground):
        Remove unused variable `width'.
      0f4a96b5
  23. 09 Mar, 2011 1 commit
    • Paul Eggert's avatar
      * cm.c (calccost, cmgoto): Use const pointers where appropriate. · fbceeba2
      Paul Eggert authored
      * cm.h (struct cm): Likewise.
      * dispextern.h (do_line_insertion_deletion_costs): Likewise.
      * scroll.c (ins_del_costs, do_line_insertion_deletion_costs): Likewise.
      * term.c (tty_ins_del_lines, calculate_costs, struct fkey_table):
      (term_get_fkeys_1, append_glyphless_glyph, produce_glyphless_glyph):
      (turn_on_face, init_tty): Likewise.
      * termchar.h (struct tty_display_info): Likewise.
      * term.c (tgetflag, tgetnum, tgetstr): Redefine to use const pointers.
      fbceeba2
  24. 08 Mar, 2011 1 commit
  25. 27 Feb, 2011 1 commit
  26. 16 Feb, 2011 1 commit
    • Tom Tromey's avatar
      Change B_ to BVAR · 4b4deea2
      Tom Tromey authored
      	* 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.
      4b4deea2
  27. 14 Feb, 2011 1 commit
    • Tom Tromey's avatar
      Hide implementation of `struct buffer' · 5d8ea120
      Tom Tromey authored
      	* composite.c (fill_gstring_header)
      	(composition_compute_stop_pos, composition_adjust_point)
      	(Ffind_composition_internal): Use B_.
      	* intervals.c (set_point_both, get_local_map): Use B_.
      	* callproc.c (Fcall_process, Fcall_process_region): Use B_.
      	* 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): Use B_.
      	* bytecode.c (Fbyte_code): Use B_.
      	* syntax.c (update_syntax_table, dec_bytepos, Fsyntax_table)
      	(Fset_syntax_table, Fmodify_syntax_entry, skip_chars)
      	(skip_syntaxes, scan_lists): Use B_.
      	* lread.c (readchar, unreadchar, openp, readevalloop)
      	(Feval_buffer, Feval_region): Use B_.
      	* print.c (printchar, strout, print_string, PRINTDECLARE)
      	(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_.
      	* callint.c (check_mark, Fcall_interactively): Use B_.
      	* 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): Use B_.
      	* data.c (swap_in_symval_forwarding, set_internal)
      	(Fmake_local_variable, Fkill_local_variable, Flocal_variable_p):
      	Use B_.
      	* undo.c (record_point, record_insert, record_delete)
      	(record_marker_adjustment, record_first_change)
      	(record_property_change, Fundo_boundary, truncate_undo_list)
      	(Fprimitive_undo): Use B_.
      	* 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): 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_.
      	* 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_.
      	* 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): 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_.
      	* 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): Use B_.
      	* filelock.c (unlock_all_files, Flock_buffer, Funlock_buffer)
      	(unlock_buffer): Use B_.
      	* keymap.c (Flocal_key_binding, Fuse_local_map)
      	(Fcurrent_local_map, push_key_description)
      	(Fdescribe_buffer_bindings): Use B_.
      	* keyboard.c (command_loop_1, read_char_minibuf_menu_prompt)
      	(read_key_sequence): Use B_.
      	* fringe.c (get_logical_cursor_bitmap)
      	(get_logical_fringe_bitmap, update_window_fringes): Use B_.
      	* xfns.c (x_create_tip_frame, Fx_show_tip): Use B_.
      	* xfaces.c (compute_char_face): Use B_.
      	* character.c (chars_in_text, Fget_byte): Use B_.
      	* category.c (check_category_table, Fcategory_table)
      	(Fset_category_table, char_category_set): Use B_.
      	* 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): 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)
      	(select_window, Fforce_window_update, temp_output_buffer_show)
      	(Fset_window_configuration, save_window_save): Use B_.
      	* 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): Use B_.
      	* frame.c (make_frame_visible_1): Use B_.
      	* dispnew.c (Fframe_or_buffer_changed_p): Use B_.
      	* dispextern.h (WINDOW_WANTS_HEADER_LINE_P)
      	(WINDOW_WANTS_MODELINE_P): Use B_.
      	* syntax.h (Vstandard_syntax_table): Update.
      	(CURRENT_SYNTAX_TABLE, SETUP_BUFFER_SYNTAX_TABLE): Use B_.
      	* intervals.h (TEXT_PROP_MEANS_INVISIBLE): Update.
      	(TEXT_PROP_MEANS_INVISIBLE): Use B_.
      	* character.h (FETCH_CHAR_ADVANCE): Update.
      	(INC_BOTH, ASCII_CHAR_WIDTH, DEC_BOTH): Use B_.
      	* category.h (Vstandard_category_table): Update.
      	* lisp.h (DEFVAR_BUFFER_DEFAULTS): Update for change to field
      	names.
      	(DOWNCASE_TABLE, UPCASE_TABLE): Use B_.
      	* buffer.c (swapfield_): New macro.
      	(Fbuffer_swap_text): Use swapfield_ where appropriate.
      	(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, Fset_buffer_multibyte)
      	(swap_out_buffer_local_variables, record_overlay_string)
      	(overlay_strings, init_buffer_once, init_buffer, syms_of_buffer):
      	Use B_.
      	* buffer.h (struct buffer): Rename all Lisp_Object fields.
      	(BUFFER_INTERNAL_FIELD, B_): New macro.
      	(FETCH_CHAR, FETCH_CHAR_AS_MULTIBYTE): Use B_.
      5d8ea120
  28. 05 Feb, 2011 1 commit
  29. 26 Jan, 2011 1 commit
  30. 25 Jan, 2011 1 commit
  31. 18 Jan, 2011 1 commit
    • Tom Tromey's avatar
      Move all DEFVAR'd globals into a structure -- threading infrastructure · 29208e82
      Tom Tromey authored
      	* globals.h: New file.
      	* xterm.h (Vx_pixel_size_width_font_regexp): Remove declaration.
      	* window.h (Vinitial_window_system, Vminibuf_scroll_window)
      	(Vwindow_system_version): Remove declaration.
      	* w32term.h (Vw32_enable_palette)
      	(Vx_pixel_size_width_font_regexp): Remove declaration.
      	* w32menu.c (Voverriding_local_map)
      	(Voverriding_local_map_menu_flag): Remove declaration.
      	* w32inevt.c (Vw32_alt_is_meta, Vw32_apps_modifier)
      	(Vw32_capslock_is_shiftlock, Vw32_enable_caps_lock)
      	(Vw32_enable_num_lock, Vw32_lwindow_modifier)
      	(Vw32_pass_lwindow_to_system, Vw32_pass_rwindow_to_system)
      	(Vw32_phantom_key_code, Vw32_recognize_altgr)
      	(Vw32_rwindow_modifier, Vw32_scroll_lock_modifier)
      	(w32_use_full_screen_buffer): Remove declaration.
      	* w32.c (Vsystem_configuration, Vw32_downcase_file_names)
      	(Vw32_generate_fake_inodes, Vw32_get_true_file_attributes)
      	(w32_num_mouse_buttons, w32_pipe_read_delay): Remove declaration.
      	* termopts.h (Vtruncate_partial_width_windows, inverse_video)
      	(no_redraw_on_reenter, visible_bell): Remove declaration.
      	* sysdep.c (Vsystem_name): Remove declaration.
      	* syntax.h (parse_sexp_lookup_properties): Remove declaration.
      	* menu.h (Vmenu_updating_frame): Remove declaration.
      	* macros.h (Vexecuting_kbd_macro, executing_kbd_macro_index):
      	Remove declaration.
      	* lisp.h (Vafter_init_time, Vafter_load_alist)
      	(Vauto_save_list_file_name, Vbefore_init_time, Vcommand_history)
      	(Vcompletion_regexp_list, Vcurrent_load_list)
      	(Vcurrent_prefix_arg, Vdata_directory, Vdebug_on_error)
      	(Vdoc_directory, Vdoc_file_name, Vdynamic_library_alist)
      	(Vexec_directory, Vexec_path, Vexec_suffixes)
      	(Vface_font_rescale_alist, Vface_ignored_fonts, Vfeatures)
      	(Vhelp_form, Vhistory_length, Vinhibit_field_text_motion)
      	(Vinhibit_quit, Vinhibit_read_only, Vinhibit_redisplay)
      	(Vinstallation_directory, Vinvocation_directory)
      	(Vinvocation_name, Vload_file_rep_suffixes, Vload_history)
      	(Vload_suffixes, Vmark_even_if_inactive, Vmemory_full)
      	(Vmessage_log_max, Vobarray, Vprint_length, Vprint_level)
      	(Vpurify_flag, Vquit_flag, Vsaved_region_selection)
      	(Vscalable_fonts_allowed, Vselect_active_regions)
      	(Vshell_file_name, Vstandard_input, Vstandard_output)
      	(Vsystem_name, Vtemporary_file_directory, Vthrow_on_input)
      	(Vtop_level, Vtty_erase_char, Vundo_outer_limit)
      	(Vuser_login_name, Vwindow_scroll_functions)
      	(Vwindow_system_version, Vx_no_window_manager)
      	(Vx_resource_class, Vx_resource_name, baud_rate)
      	(completion_ignore_case, debug_on_next_call, gc_cons_threshold)
      	(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.
      	* keymap.h (Voverriding_local_map)
      	(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)
      	(do_mouse_tracking, extra_keyboard_modifiers)
      	(num_nonmacro_input_events): Remove declaration.
      	* intervals.h (Vchar_property_alias_alist)
      	(Vdefault_text_properties, Vinhibit_point_motion_hooks)
      	(Vtext_property_default_nonsticky): Remove declaration.
      	* gtkutil.h (x_gtk_file_dialog_help_text)
      	(x_gtk_show_hidden_files, x_gtk_use_old_file_dialog)
      	(x_gtk_whole_detached_tool_bar): Remove declaration.
      	* frame.h (Vdefault_frame_alist, Vframe_alpha_lower_limit)
      	(Vmenu_bar_mode, Vmouse_highlight, Vterminal_frame)
      	(Vtool_bar_mode, Vx_resource_class, Vx_resource_name)
      	(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.
      	* 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.
      	* dispextern.h (Vface_remapping_alist, Vglyphless_char_display)
      	(Vmouse_autoselect_window, Voverflow_newline_into_fringe)
      	(Vshow_trailing_whitespace, Vtool_bar_button_margin)
      	(Vtool_bar_style, cursor_in_echo_area, display_hourglass_p)
      	(inverse_video, mode_line_in_non_selected_windows)
      	(tool_bar_button_relief, tool_bar_max_label_size)
      	(underline_minimum_offset)
      	(unibyte_display_via_language_environment, x_stretch_cursor_p):
      	Remove declaration.
      	* composite.h (Vauto_composition_function)
      	(Vcomposition_function_table): Remove declaration.
      	* commands.h (Vexecuting_kbd_macro)
      	(Vminibuffer_local_completion_map)
      	(Vminibuffer_local_filename_completion_map)
      	(Vminibuffer_local_filename_must_match_map)
      	(Vminibuffer_local_map, Vminibuffer_local_must_match_map)
      	(Vminibuffer_local_ns_map, Vthis_command)
      	(Vunread_command_events, cursor_in_echo_area)
      	(last_command_event, last_nonmenu_event, unread_command_char):
      	Remove declaration.
      	* coding.h (Vcoding_system_for_read, Vcoding_system_for_write)
      	(Vdefault_file_name_coding_system)
      	(Vdefault_process_coding_system, Vfile_name_coding_system)
      	(Vlast_coding_system_used, Vlocale_coding_system)
      	(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.
      	* character.h (Vauto_fill_chars, Vchar_direction_table)
      	(Vchar_script_table, Vchar_width_table, Vprintable_chars)
      	(Vscript_representative_chars, Vtranslation_table_vector)
      	(Vunicode_category_table): Remove declaration.
      	* ccl.h (Vfont_ccl_encoder_alist): Remove declaration.
      	* buffer.h (Vafter_change_functions, Vbefore_change_functions)
      	(Vdeactivate_mark, Vfirst_change_hook, Vtransient_mark_mode)
      	(inhibit_modification_hooks): Remove declaration.
      	* xterm.c (syms_of_xterm): Update.
      	(Vx_alt_keysym, Vx_hyper_keysym, Vx_keysym_table)
      	(Vx_meta_keysym, Vx_super_keysym, Vx_toolkit_scroll_bars)
      	(x_mouse_click_focus_ignore_position)
      	(x_underline_at_descent_line)
      	(x_use_underline_position_properties): Remove.
      	* xsmfns.c (syms_of_xsmfns): Update.
      	(Vx_session_id, Vx_session_previous_id): Remove.
      	* xsettings.c (syms_of_xsettings): Update.
      	(Vxft_settings, use_system_font): Remove.
      	* xselect.c (syms_of_xselect): Update.
      	(Vselection_converter_alist, Vx_lost_selection_functions)
      	(Vx_sent_selection_functions, x_selection_timeout): Remove.
      	* xfns.c (syms_of_xfns): Update.
      	(Vgtk_version_string, Vmotif_version_string)
      	(Vx_cursor_fore_pixel, Vx_hourglass_pointer_shape)
      	(Vx_max_tooltip_size, Vx_mode_pointer_shape)
      	(Vx_no_window_manager, Vx_nontext_pointer_shape)
      	(Vx_pixel_size_width_font_regexp, Vx_pointer_shape)
      	(Vx_sensitive_text_pointer_shape)
      	(Vx_window_horizontal_drag_shape, x_gtk_file_dialog_help_text)
      	(x_gtk_show_hidden_files, x_gtk_use_old_file_dialog)
      	(x_gtk_use_system_tooltips, x_gtk_whole_detached_tool_bar):
      	Remove.
      	* xfaces.c (syms_of_xfaces): Update.
      	(Vface_default_stipple, Vface_font_rescale_alist)
      	(Vface_ignored_fonts, Vface_new_frame_defaults)
      	(Vface_remapping_alist, Vfont_list_limit)
      	(Vscalable_fonts_allowed, Vtty_defined_color_alist): Remove.
      	* xdisp.c (syms_of_xdisp): Update.
      	(Vauto_resize_tool_bars, Vblink_cursor_alist)
      	(Vdisplay_pixels_per_inch, Vfontification_functions)
      	(Vframe_title_format, Vglobal_mode_string)
      	(Vglyphless_char_display, Vhourglass_delay, Vhscroll_step)
      	(Vicon_title_format, Vinhibit_redisplay)
      	(Vline_number_display_limit, Vline_prefix)
      	(Vmax_mini_window_height, Vmenu_bar_update_hook)
      	(Vmenu_updating_frame, Vmessage_log_max)
      	(Vmouse_autoselect_window, Vnobreak_char_display)
      	(Voverlay_arrow_position, Voverlay_arrow_string)
      	(Voverlay_arrow_variable_list, Vredisplay_end_trigger_functions)
      	(Vresize_mini_windows, Vshow_trailing_whitespace)
      	(Vtool_bar_border, Vtool_bar_button_margin, Vtool_bar_style)
      	(Vtruncate_partial_width_windows, Vvoid_text_area_pointer)
      	(Vwindow_scroll_functions, Vwindow_size_change_functions)
      	(Vwindow_text_change_functions, Vwrap_prefix)
      	(auto_raise_tool_bar_buttons_p, automatic_hscrolling_p)
      	(debug_end_pos, display_hourglass_p, emacs_scroll_step)
      	(highlight_nonselected_windows, hscroll_margin)
      	(inhibit_eval_during_redisplay, inhibit_free_realized_faces)
      	(inhibit_menubar_update, inhibit_try_cursor_movement)
      	(inhibit_try_window_id, inhibit_try_window_reusing)
      	(line_number_display_limit_width)
      	(make_cursor_line_fully_visible_p, message_truncate_lines)
      	(mode_line_inverse_video, multiple_frames, overline_margin)
      	(scroll_conservatively, scroll_margin, tool_bar_button_relief)
      	(tool_bar_max_label_size, underline_minimum_offset)
      	(unibyte_display_via_language_environment, x_stretch_cursor_p):
      	Remove.
      	* window.c (syms_of_window): Update.
      	(Vminibuf_scroll_window, Vother_window_scroll_buffer)
      	(Vrecenter_redisplay, Vscroll_preserve_screen_position)
      	(Vtemp_buffer_show_function, Vwindow_configuration_change_hook)
      	(Vwindow_point_insertion_type, auto_window_vscroll_p)
      	(mode_line_in_non_selected_windows, next_screen_context_lines)
      	(window_min_height, window_min_width): Remove.
      	(scroll_margin): Remove declaration.
      	* w32term.c (syms_of_w32term): Update.
      	(Vw32_capslock_is_shiftlock, Vw32_grab_focus_on_raise)
      	(Vw32_recognize_altgr, Vw32_swap_mouse_buttons)
      	(Vx_toolkit_scroll_bars, w32_num_mouse_buttons)
      	(w32_use_visible_system_caret, x_underline_at_descent_line)
      	(x_use_underline_position_properties): Remove.
      	(Vcommand_line_args, Vsystem_name, extra_keyboard_modifiers):
      	Remove declaration.
      	* w32select.c (syms_of_w32select): Update.
      	(Vnext_selection_coding_system, Vselection_coding_system): Remove.
      	* w32proc.c (syms_of_ntproc): Update.
      	(Vw32_downcase_file_names, Vw32_generate_fake_inodes)
      	(Vw32_get_true_file_attributes, Vw32_quote_process_args)
      	(Vw32_start_process_inherit_error_mode)
      	(Vw32_start_process_share_console)
      	(Vw32_start_process_show_window, w32_pipe_read_delay): Remove.
      	(Vsystem_name): Remove declaration.
      	* w32font.c (syms_of_w32font): Update.
      	(Vw32_charset_info_alist): Remove.
      	* w32fns.c (globals_of_w32fns, syms_of_w32fns): Update.
      	(Vw32_alt_is_meta, Vw32_apps_modifier, Vw32_bdf_filename_alist)
      	(Vw32_color_map, Vw32_enable_caps_lock, Vw32_enable_num_lock)
      	(Vw32_enable_palette, Vw32_lwindow_modifier)
      	(Vw32_pass_alt_to_system, Vw32_pass_lwindow_to_system)
      	(Vw32_pass_rwindow_to_system, Vw32_phantom_key_code)
      	(Vw32_rwindow_modifier, Vw32_scroll_lock_modifier)
      	(Vx_cursor_fore_pixel, Vx_hourglass_pointer_shape)
      	(Vx_max_tooltip_size, Vx_mode_pointer_shape)
      	(Vx_no_window_manager, Vx_nontext_pointer_shape)
      	(Vx_pixel_size_width_font_regexp, Vx_pointer_shape)
      	(Vx_sensitive_text_pointer_shape)
      	(Vx_window_horizontal_drag_shape, w32_ansi_code_page)
      	(w32_enable_synthesized_fonts, w32_mouse_button_tolerance)
      	(w32_mouse_move_interval)
      	(w32_pass_extra_mouse_buttons_to_system)
      	(w32_pass_multimedia_buttons_to_system, w32_quit_key)
      	(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.
      	* w32console.c (syms_of_ntterm): Update.
      	(w32_use_full_screen_buffer): Remove.
      	(Vtty_defined_color_alist): Remove declaration.
      	* w16select.c (syms_of_win16select): Update.
      	(Vnext_selection_coding_system, Vselection_coding_system): Remove.
      	* undo.c (syms_of_undo): Update.
      	(Vundo_outer_limit, Vundo_outer_limit_function)
      	(undo_inhibit_record_point, undo_limit, undo_strong_limit):
      	Remove.
      	* textprop.c (syms_of_textprop): Update.
      	(Vchar_property_alias_alist, Vdefault_text_properties)
      	(Vinhibit_point_motion_hooks, Vtext_property_default_nonsticky):
      	Remove.
      	* terminal.c (syms_of_terminal): Update.
      	(Vdelete_terminal_functions, Vring_bell_function): Remove.
      	* term.c (syms_of_term): Update.
      	(Vresume_tty_functions, Vsuspend_tty_functions)
      	(no_redraw_on_reenter, system_uses_terminfo, visible_cursor):
      	Remove.
      	* syntax.c (syms_of_syntax): Update.
      	(Vfind_word_boundary_function_table, multibyte_syntax_as_symbol)
      	(open_paren_in_column_0_is_defun_start)
      	(parse_sexp_ignore_comments, parse_sexp_lookup_properties)
      	(words_include_escapes): Remove.
      	* search.c (syms_of_search): Update.
      	(Vinhibit_changing_match_data, Vsearch_spaces_regexp): Remove.
      	* process.c (syms_of_process): Update.
      	(Vprocess_adaptive_read_buffering, Vprocess_connection_type)
      	(delete_exited_processes): Remove.
      	* print.c (syms_of_print): Update.
      	(Vfloat_output_format, Vprint_charset_text_property)
      	(Vprint_circle, Vprint_continuous_numbering, Vprint_gensym)
      	(Vprint_length, Vprint_level, Vprint_number_table)
      	(Vstandard_output, print_escape_multibyte)
      	(print_escape_newlines, print_escape_nonascii, print_quoted):
      	Remove.
      	* msdos.c (syms_of_msdos): Update.
      	(Vdos_unsupported_char_glyph): Remove.
      	(unibyte_display_via_language_environment): Remove declaration.
      	* minibuf.c (syms_of_minibuf): Update.
      	(Vcompletion_regexp_list, Vhistory_add_new_input)
      	(Vhistory_length, Vminibuffer_completing_file_name)
      	(Vminibuffer_completion_confirm)
      	(Vminibuffer_completion_predicate, Vminibuffer_completion_table)
      	(Vminibuffer_exit_hook, Vminibuffer_help_form)
      	(Vminibuffer_history_position, Vminibuffer_history_variable)
      	(Vminibuffer_prompt_properties, Vminibuffer_setup_hook)
      	(Vread_buffer_function, Vread_expression_map)
      	(completion_ignore_case, enable_recursive_minibuffers)
      	(history_delete_duplicates, minibuffer_allow_text_properties)
      	(minibuffer_auto_raise, read_buffer_completion_ignore_case):
      	Remove.
      	* marker.c (syms_of_marker): Update.
      	(byte_debug_flag): Remove.
      	* macros.c (syms_of_macros): Update.
      	(Vexecuting_kbd_macro, executing_kbd_macro_index): Remove.
      	* lread.c (syms_of_lread): Update.
      	(Vafter_load_alist, Vbyte_boolean_vars)
      	(Vbytecomp_version_regexp, Vcurrent_load_list)
      	(Veval_buffer_list, Vload_file_name, Vload_file_rep_suffixes)
      	(Vload_history, Vload_path, Vload_read_function)
      	(Vload_source_file_function, Vload_suffixes, Vobarray)
      	(Vold_style_backquotes, Vpreloaded_file_list, Vread_circle)
      	(Vread_symbol_positions_list, Vread_with_symbol_positions)
      	(Vsource_directory, Vstandard_input, Vuser_init_file, Vvalues)
      	(force_load_messages, load_convert_to_unibyte)
      	(load_dangerous_libraries, load_force_doc_strings)
      	(load_in_progress): Remove.
      	* keymap.c (syms_of_keymap): Update.
      	(Vdefine_key_rebound_commands, Vemulation_mode_map_alists)
      	(Vminibuffer_local_completion_map)
      	(Vminibuffer_local_filename_completion_map)
      	(Vminibuffer_local_filename_must_match_map)
      	(Vminibuffer_local_map, Vminibuffer_local_must_match_map)
      	(Vminibuffer_local_ns_map, Vminor_mode_map_alist)
      	(Vminor_mode_overriding_map_alist, Vwhere_is_preferred_modifier):
      	Remove.
      	* keyboard.c (syms_of_keyboard): Update.
      	(Vauto_save_timeout, Vcommand_error_function)
      	(Vcommand_hook_internal, Vdeactivate_mark)
      	(Vdeferred_action_function, Vdeferred_action_list)
      	(Vdisable_point_adjustment, Vdouble_click_time)
      	(Vecho_keystrokes, Venable_disabled_menus_and_buttons)
      	(Vfunction_key_map, Vglobal_disable_point_adjustment)
      	(Vhelp_char, Vhelp_event_list, Vhelp_form)
      	(Vinput_method_function, Vinput_method_previous_message)
      	(Vkey_translation_map, Vlast_event_frame)
      	(Vlucid_menu_bar_dirty_flag, Vmenu_bar_final_items)
      	(Vminibuffer_message_timeout, Voverriding_local_map)
      	(Voverriding_local_map_menu_flag, Vpost_command_hook)
      	(Vpre_command_hook, Vprefix_help_command)
      	(Vsaved_region_selection, Vselect_active_regions)
      	(Vshow_help_function, Vspecial_event_map, Vsuggest_key_bindings)
      	(Vthis_command, Vthis_command_keys_shift_translated)
      	(Vthis_original_command, Vthrow_on_input, Vtimer_idle_list)
      	(Vtimer_list, Vtool_bar_separator_image_expression, Vtop_level)
      	(Vtty_erase_char, Vunread_command_events)
      	(Vunread_input_method_events, Vunread_post_input_method_events)
      	(auto_save_interval, cannot_suspend, do_mouse_tracking)
      	(double_click_fuzz, extra_keyboard_modifiers)
      	(inhibit_local_menu_bar_menus, last_command_event)
      	(last_input_event, last_nonmenu_event, menu_prompt_more_char)
      	(menu_prompting, meta_prefix_char, num_input_keys)
      	(num_nonmacro_input_events, polling_period, unread_command_char):
      	Remove.
      	* insdel.c (syms_of_insdel): Update.
      	(Vcombine_after_change_calls, check_markers_debug_flag): Remove.
      	* indent.c (syms_of_indent): Update.
      	(indent_tabs_mode): Remove.
      	* image.c (syms_of_image): Update.
      	(Vimage_cache_eviction_delay, Vimage_types)
      	(Vimagemagick_render_type, Vmax_image_size, Vx_bitmap_file_path)
      	(cross_disabled_images): Remove.
      	* fringe.c (syms_of_fringe): Update.
      	(Vfringe_bitmaps, Voverflow_newline_into_fringe): Remove.
      	* frame.c (syms_of_frame): Update.
      	(Vdefault_frame_alist, Vdefault_frame_scroll_bars)
      	(Vdelete_frame_functions, Vframe_alpha_lower_limit)
      	(Vmake_pointer_invisible, Vmenu_bar_mode, Vmouse_highlight)
      	(Vmouse_position_function, Vterminal_frame, Vtool_bar_mode)
      	(Vx_resource_class, Vx_resource_name, focus_follows_mouse):
      	Remove.
      	* fontset.c (syms_of_fontset): Update.
      	(Valternate_fontname_alist, Vfont_encoding_charset_alist)
      	(Vfontset_alias_alist, Vignore_relative_composition)
      	(Votf_script_alist, Vuse_default_ascent)
      	(Vvertical_centering_font_regexp): Remove.
      	* font.c (syms_of_font): Update.
      	(Vfont_encoding_alist, Vfont_log, Vfont_slant_table)
      	(Vfont_weight_table, Vfont_width_table): Remove.
      	* fns.c (syms_of_fns): Update.
      	(Vfeatures, use_dialog_box, use_file_dialog): Remove.
      	* filelock.c (syms_of_filelock): Update.
      	(Vtemporary_file_directory): Remove.
      	* fileio.c (syms_of_fileio): Update.
      	(Vafter_insert_file_functions, Vauto_save_include_big_deletions)
      	(Vauto_save_list_file_name, Vauto_save_visited_file_name)
      	(Vdefault_file_name_coding_system, Vfile_name_coding_system)
      	(Vfile_name_handler_alist, Vinhibit_file_name_handlers)
      	(Vinhibit_file_name_operation, Vset_auto_coding_function)
      	(Vwrite_region_annotate_functions)
      	(Vwrite_region_annotations_so_far)
      	(Vwrite_region_post_annotation_function)
      	(delete_by_moving_to_trash, write_region_inhibit_fsync): Remove.
      	(Vw32_get_true_file_attributes): Remove declaration.
      	* eval.c (syms_of_eval): Update.
      	(Vdebug_ignored_errors, Vdebug_on_error, Vdebug_on_signal)
      	(Vdebugger, Vinhibit_quit, Vmacro_declaration_function)
      	(Vquit_flag, Vsignal_hook_function, Vstack_trace_on_error)
      	(debug_on_next_call, debug_on_quit, debugger_may_continue)
      	(max_lisp_eval_depth, max_specpdl_size): Remove.
      	* emacs.c (syms_of_emacs): Update.
      	(Vafter_init_time, Vbefore_init_time, Vcommand_line_args)
      	(Vdynamic_library_alist, Vemacs_copyright, Vemacs_version)
      	(Vinstallation_directory, Vinvocation_directory)
      	(Vinvocation_name, Vkill_emacs_hook, Vpath_separator)
      	(Vprevious_system_messages_locale, Vprevious_system_time_locale)
      	(Vsystem_configuration, Vsystem_configuration_options)
      	(Vsystem_messages_locale, Vsystem_time_locale, Vsystem_type)
      	(inhibit_x_resources, noninteractive1): Remove.
      	* editfns.c (syms_of_editfns): Update.
      	(Vbuffer_access_fontified_property)
      	(Vbuffer_access_fontify_functions, Vinhibit_field_text_motion)
      	(Voperating_system_release, Vsystem_name, Vuser_full_name)
      	(Vuser_login_name, Vuser_real_login_name): Remove.
      	* dosfns.c (syms_of_dosfns): Update.
      	(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.
      	* doc.c (syms_of_doc): Update.
      	(Vbuild_files, Vdoc_file_name): Remove.
      	* dispnew.c (syms_of_display): Update.
      	(Vglyph_table, Vinitial_window_system)
      	(Vredisplay_preemption_period, Vstandard_display_table)
      	(Vwindow_system_version, baud_rate, cursor_in_echo_area)
      	(inverse_video, redisplay_dont_pause, visible_bell): Remove.
      	* dired.c (syms_of_dired): Update.
      	(Vcompletion_ignored_extensions): Remove.
      	(Vw32_get_true_file_attributes): Remove declaration.
      	* dbusbind.c (syms_of_dbusbind): Update.
      	(Vdbus_debug, Vdbus_registered_buses)
      	(Vdbus_registered_objects_table): Remove.
      	* data.c (syms_of_data): Update.
      	(Vmost_negative_fixnum, Vmost_positive_fixnum): Remove.
      	* composite.c (syms_of_composite): Update.
      	(Vauto_composition_function, Vauto_composition_mode)
      	(Vcompose_chars_after_function, Vcomposition_function_table):
      	Remove.
      	* coding.c (syms_of_coding): Update.
      	(Vcharset_revision_table, Vcoding_category_list)
      	(Vcoding_system_alist, Vcoding_system_for_read)
      	(Vcoding_system_for_write, Vcoding_system_list)
      	(Vdefault_process_coding_system, Venable_character_translation)
      	(Vfile_coding_system_alist, Vlast_code_conversion_error)
      	(Vlast_coding_system_used, Vlatin_extra_code_table)
      	(Vlocale_coding_system, Vnetwork_coding_system_alist)
      	(Vprocess_coding_system_alist)
      	(Vselect_safe_coding_system_function)
      	(Vstandard_translation_table_for_decode)
      	(Vstandard_translation_table_for_encode)
      	(Vtranslation_table_for_input, coding_system_require_warning)
      	(eol_mnemonic_dos, eol_mnemonic_mac, eol_mnemonic_undecided)
      	(eol_mnemonic_unix, inherit_process_coding_system)
      	(inhibit_eol_conversion, inhibit_iso_escape_detection)
      	(inhibit_null_byte_detection): Remove.
      	* cmds.c (syms_of_cmds): Update.
      	(Vpost_self_insert_hook): Remove.
      	* charset.c (syms_of_charset): Update.
      	(Vcharset_list, Vcharset_map_path, Vcurrent_iso639_language)
      	(inhibit_load_charset_map): Remove.
      	* character.c (syms_of_character): Update.
      	(Vauto_fill_chars, Vchar_direction_table, Vchar_script_table)
      	(Vchar_width_table, Vprintable_chars)
      	(Vscript_representative_chars, Vtranslation_table_vector)
      	(Vunicode_category_table): Remove.
      	* ccl.c (syms_of_ccl): Update.
      	(Vcode_conversion_map_vector, Vfont_ccl_encoder_alist)
      	(Vtranslation_hash_table_vector): Remove.
      	* category.c (syms_of_category): Update.
      	(Vword_combining_categories, Vword_separating_categories): Remove.
      	* callproc.c (syms_of_callproc): Update.
      	(Vconfigure_info_directory, Vdata_directory, Vdoc_directory)
      	(Vexec_directory, Vexec_path, Vexec_suffixes)
      	(Vinitial_environment, Vprocess_environment)
      	(Vshared_game_score_directory, Vshell_file_name): Remove.
      	* callint.c (syms_of_callint): Update.
      	(Vcommand_debug_status, Vcommand_history, Vcurrent_prefix_arg)
      	(Vmark_even_if_inactive, Vmouse_leave_buffer_hook): Remove.
      	* bytecode.c (syms_of_bytecode): Update.
      	(Vbyte_code_meter, byte_metering_on): Remove.
      	* buffer.c (syms_of_buffer): Update.
      	(Vafter_change_functions, Vbefore_change_functions)
      	(Vchange_major_mode_hook, Vfirst_change_hook)
      	(Vinhibit_read_only, Vkill_buffer_query_functions)
      	(Vtransient_mark_mode, inhibit_modification_hooks): Remove.
      	* alloc.c (syms_of_alloc): Update.
      	(Vgc_cons_percentage, Vgc_elapsed, Vmemory_full)
      	(Vmemory_signal_data, Vpost_gc_hook, Vpurify_flag)
      	(cons_cells_consed, floats_consed, garbage_collection_messages)
      	(gc_cons_threshold, gcs_done, intervals_consed)
      	(misc_objects_consed, pure_bytes_used, string_chars_consed)
      	(strings_consed, symbols_consed, vector_cells_consed): Remove.
      
      	* lisp.h (DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL)
      	(DEFVAR_INT): Assume global is in `globals'.
      	* alloc.c (globals): Define.
      29208e82