1. 14 Aug, 2011 1 commit
  2. 05 Aug, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix bug #9221 with resource allocation under word-wrap. · 35928349
      Eli Zaretskii authored
      Add diagnostic facility for monitoring memory allocated for cache shelving.
      
       src/xdisp.c (display_line): Release buffer allocated for shelved bidi
       cache.  (Bug#9221)
       src/bidi.c (bidi_shelve_cache, bidi_unshelve_cache): Track total
       amount allocated this far in `bidi_cache_total_alloc'.
       (bidi_unshelve_cache): Accept an additional argument JUST_FREE; if
       non-zero, only free the data buffer without restoring the cache
       contents.  All callers changed.
       src/dispextern.h (bidi_unshelve_cache): Update prototype.
       src/xdisp.c (SAVE_IT, pos_visible_p, move_it_in_display_line_to)
       (move_it_in_display_line, move_it_to)
       (move_it_vertically_backward, move_it_by_lines): Replace the call
       to xfree to an equivalent call to bidi_unshelve_cache.
       (move_it_in_display_line_to): Fix logic of returning
       MOVE_POS_MATCH_OR_ZV in the bidi case.
      35928349
  3. 03 Aug, 2011 1 commit
  4. 02 Aug, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix bug #9218 with slow cursor motion and scrolling Org Mode buffers. · 55439c61
      Eli Zaretskii authored
       src/dispextern.h (struct bidi_it): New member disp_prop_p.
       src/xdisp.c: Remove one-slot cache of display string positions.
       (compute_display_string_pos): Accept an additional argument
       DISP_PROP_P; callers changed. Scan at most 5K characters forward
       for a display string or property.  If found, set DISP_PROP_P
       non-zero.
       src/bidi.c (bidi_fetch_char): Accept an additional argument
       DISP_PROP_P, and pass it to compute_display_string_pos.  Only
       handle text covered by a display string if DISP_PROP_P is returned
       non-zero.  All callers of bidi_fetch_char changed.
      55439c61
  5. 06 Jul, 2011 1 commit
  6. 03 Jul, 2011 1 commit
    • Eli Zaretskii's avatar
      Save and restore bidi cache when saving and restoring the iterator. · ed94e6d7
      Eli Zaretskii authored
      Not tested, just compiled.
      
       src/bidi.c (bidi_shelve_cache, bidi_unshelve_cache): New functions.
       src/dispextern.h (bidi_shelve_cache, bidi_unshelve_cache): Declare
       prototypes.
       src/xdisp.c (SAVE_IT, RESTORE_IT): New macros.
       (pos_visible_p, face_before_or_after_it_pos)
       (back_to_previous_visible_line_start)
       (move_it_in_display_line_to, move_it_in_display_line)
       (move_it_to, move_it_vertically_backward, move_it_by_lines)
       (try_scrolling, redisplay_window, display_line): Use them when
       saving a temporary copy of the iterator and restoring it back.
      ed94e6d7
  7. 02 Jul, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix the use case of popping from display property. · a2eaa31d
      Eli Zaretskii authored
       src/dispextern.h (struct iterator_stack_entry, struct it): New
       member from_disp_prop_p.
       src/xdisp.c (push_it, pop_it): Save and restore from_disp_prop_p.
       (handle_single_display_spec, push_display_prop): Set the
       from_disp_prop_p flag.
       (get_overlay_strings_1): Reset the from_disp_prop_p flag.
       (pop_it): Call iterate_out_of_display_property only if we are
       popping after iteration over a string that came from a display
       property.  Fix a typo in popping stretch info.  Add an assertion
       for verifying that the iterator position is in sync with the bidi
       iterator.
       (handle_single_display_spec, get_overlay_strings_1)
       (push_display_prop): Fix initialization of paragraph direction for
       string when that of the parent object is not yet determined.
      a2eaa31d
  8. 01 Jul, 2011 1 commit
    • Eli Zaretskii's avatar
      Support bidi reordering of unibyte strings. Fix crash displaying "All" in... · f3014ef5
      Eli Zaretskii authored
      Support bidi reordering of unibyte strings.  Fix crash displaying "All" in mode line of an empty buffer.
      
       src/dispextern.h (struct bidi_string_data): New member `unibyte'.
       src/xdisp.c (handle_single_display_spec, next_overlay_string)
       (get_overlay_strings_1, reseat_1, reseat_to_string)
       (push_display_prop): Set up the `unibyte' member of bidi_it.string
       correctly.  Don't assume unibyte strings are not bidi-reordered.
       (compute_display_string_pos)
       (compute_display_string_end): Fix handling the case of C string.
       src/bidi.c (bidi_count_bytes, bidi_char_at_pos): Accept an
       additional argument UNIBYTE, and support unibyte strings.  All
       callers changed.
       (bidi_fetch_char): Support unibyte strings.
      f3014ef5
  9. 25 Jun, 2011 2 commits
    • Eli Zaretskii's avatar
      Initial version of display/overlay strings is working. · a1344e7d
      Eli Zaretskii authored
       src/xdisp.c (set_iterator_to_next, get_visually_first_element): Use
       it->bidi_it.string.schars rather than it->string_nchars when
       testing whether we're beyond string end, because string_nchars is
       zero for strings that come from overlays and display properties.
       src/bidi.c (bidi_cache_iterator_state): Fix a bug with testing
       character positions against the cached range, when we use a
       stacked cache.
       src/dispextern.h (struct iterator_stack_entry): New member
       paragraph_embedding.
       src/xdisp.c (push_it, pop_it): Save and restore it.
      a1344e7d
    • Eli Zaretskii's avatar
      Set up the bidi iterator for iterating display strings and overlay strings. · 0c22566f
      Eli Zaretskii authored
      Not tested yet, just compiled.
      
       src/xdisp.c (handle_single_display_spec, next_overlay_string)
       (get_overlay_strings_1, push_display_prop): Set up the bidi
       iterator for displaying display or overlay strings.
       (forward_to_next_line_start): Don't use the shortcut if
       bidi-iterating.
       (back_to_previous_visible_line_start): If handle_display_prop
       pushed the iterator stack, restore the internal state of the bidi
       iterator by calling bidi_pop_it same number of times.
       (reseat_at_next_visible_line_start): If ON_NEWLINE_P is non-zero,
       and we are bidi-iterating, don't decrement the iterator position;
       instead, set the first_elt flag in the bidi iterator, to produce
       the same effect.
       (reseat_1): Remove redundant setting of string_from_display_prop_p.
       (push_display_prop): xassert that we are iterating a buffer.
       (push_it, pop_it): Save and restore the state of the
       bidi iterator.  Save and restore the bidi_p flag.
       (pop_it): Iterate out of display property for string iteration as
       well.
       (iterate_out_of_display_property): Support iteration over strings.
       (handle_single_display_spec): Set up it->bidi_it for iteration
       over a display string, and call bidi_init_it.
       src/bidi.c (bidi_cache_start_stack, bidi_push_it): Use IT_STACK_SIZE.
       src/dispextern.h (struct iterator_stack_entry): New member bidi_p.
       (struct it): Member bidi_p is now a bit field 1 bit wide.
      0c22566f
  10. 23 Jun, 2011 1 commit
    • Eli Zaretskii's avatar
      Added to bidi.c support functions for reordering display strings. · 58b9f433
      Eli Zaretskii authored
       src/bidi.c (bidi_push_it, bidi_pop_it): New functions.
       (bidi_initialize): Initialize the bidi cache start stack pointer.
       (bidi_cache_ensure_space): New function, refactored from part of
       bidi_cache_iterator_state.
       src/dispextern.h (bidi_push_it, bidi_pop_it): Add prototypes.
      58b9f433
  11. 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
  12. 18 Jun, 2011 1 commit
  13. 17 Jun, 2011 1 commit
  14. 13 Jun, 2011 1 commit
  15. 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
  16. 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
  17. 09 Jun, 2011 2 commits
    • Eli Zaretskii's avatar
      Adapt compute_display_string_pos to iteration over strings. · 6db161be
      Eli Zaretskii authored
      Just compiled, not yet tested.
      
       src/xdisp.c (compute_display_string_pos): First arg is now struct
       `text_pos *'; all callers changed.  Support display properties on
       Lisp strings.
       (compute_display_string_end): Support display properties on Lisp
       strings.
       (init_iterator, reseat_1, reseat_to_string): Initialize the
       string.bufpos member to 0 (zero, for compatibility with IT_CHARPOS
       when iterating on a string not from display properties).
       src/bidi.c (bidi_fetch_char): Support strings with display
       properties.
       src/dispextern.h (struct bidi_string_data): New member bufpos.
       (compute_display_string_pos): Update prototype.
      6db161be
    • Eli Zaretskii's avatar
      Add code to initialize bidi iterator for displaying strings. · bb269206
      Eli Zaretskii authored
      For now, ifdef'ed away.  Some more testing.
      
       src/bidi.c (bidi_level_of_next_char): Allow the sentinel "position"
       to pass the test for valid cached positions.
       src/xdisp.c (init_iterator): Call bidi_init_it only of a valid
       buffer position was specified.  Initialize paragraph_embedding to L2R.
       (reseat_to_string): Initialize the bidi iterator (for now ifdef'ed out).
       (display_string): If we need to ignore text properties of
       LISP_STRING, set IT->stop_charpos to IT->end_charpos.  (The
       original value of -1 will not work with bidi.)
       src/dispextern.h (struct bidi_string_data): New member lstring.
      bb269206
  18. 08 Jun, 2011 1 commit
    • Eli Zaretskii's avatar
      Started work on string reordering. Just compiled, not yet tested. · 87e67904
      Eli Zaretskii authored
       src/bidi.c (bidi_paragraph_info): Delete unused struct.
       (bidi_cache_idx, bidi_cache_last_idx): Declare EMACS_INT.
       (bidi_cache_start): New variable.
       (bidi_cache_reset): Reset bidi_cache_idx to bidi_cache_start, not
       to zero.
       (bidi_cache_fetch_state, bidi_cache_search)
       (bidi_cache_find_level_change, bidi_cache_iterator_state)
       (bidi_cache_find, bidi_peek_at_next_level)
       (bidi_level_of_next_char, bidi_find_other_level_edge)
       (bidi_move_to_visually_next): Compare cache index with
       bidi_cache_start rather than with zero.
       (bidi_fetch_char): Accept new argument STRING; all callers
       changed.  Support iteration over a string.
       (bidi_paragraph_init, bidi_resolve_explicit_1)
       (bidi_resolve_explicit, bidi_resolve_weak)
       (bidi_level_of_next_char, bidi_move_to_visually_next): Support
       iteration over a string.
       (bidi_set_sor_type, bidi_resolve_explicit_1)
       (bidi_resolve_explicit, bidi_type_of_next_char): ignore_bn_limit
       can now be zero (for strings); special values 0 and -1 were
       changed to -1 and -2, respectively.
       (bidi_char_at_pos): New function.
       (bidi_paragraph_init, bidi_resolve_explicit, bidi_resolve_weak):
       Call it instead of FETCH_MULTIBYTE_CHAR.
       (bidi_move_to_visually_next): Abort if charpos or bytepos were not
       initialized to valid values.
       (bidi_init_it): Don't initialize charpos and bytepos with invalid
       values.
       src/xdisp.c (compute_display_string_pos)
       (compute_display_string_end): Accept additional argument STRING.
       (init_iterator, reseat_1): Initialize bidi_it->string.s to NULL.
       (reseat_to_string): Initialize bidi_it->string.s and
       bidi_it->string.schars.
       src/dispextern.h (struct bidi_string_data): New structure.
       (struct bidi_it): New member `string'.  Make flag members be 1-bit
       fields, and put them last in the struct.
       (compute_display_string_pos, compute_display_string_end): Update
       prototypes.
      87e67904
  19. 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
  20. 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
  21. 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
  22. 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
  23. 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
  24. 13 May, 2011 1 commit
  25. 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
  26. 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
  27. 16 Apr, 2011 2 commits
  28. 14 Apr, 2011 3 commits
  29. 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
  30. 12 Apr, 2011 3 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