comparison src/extents.c @ 647:b39c14581166

[xemacs-hg @ 2001-08-13 04:45:47 by ben] removal of unsigned, size_t, etc.
author ben
date Mon, 13 Aug 2001 04:46:48 +0000
parents 183866b06e0b
children fdefd0186b75
comparison
equal deleted inserted replaced
646:00c54252fe4f 647:b39c14581166
734 734
735 while (left != right) 735 while (left != right)
736 { 736 {
737 /* RIGHT might not point to a valid extent (i.e. it's at the end 737 /* RIGHT might not point to a valid extent (i.e. it's at the end
738 of the list), so NEWPOS must round down. */ 738 of the list), so NEWPOS must round down. */
739 unsigned int newpos = (left + right) >> 1; 739 int newpos = (left + right) >> 1;
740 EXTENT e = EXTENT_GAP_ARRAY_AT (ga, (int) newpos); 740 EXTENT e = EXTENT_GAP_ARRAY_AT (ga, (int) newpos);
741 741
742 if (endp ? EXTENT_E_LESS (e, extent) : EXTENT_LESS (e, extent)) 742 if (endp ? EXTENT_E_LESS (e, extent) : EXTENT_LESS (e, extent))
743 left = newpos+1; 743 left = newpos + 1;
744 else 744 else
745 right = newpos; 745 right = newpos;
746 } 746 }
747 747
748 /* Now we're at the beginning of all equal extents. */ 748 /* Now we're at the beginning of all equal extents. */
3102 internal_equal (extent_object (e1), extent_object (e2), depth + 1) && 3102 internal_equal (extent_object (e1), extent_object (e2), depth + 1) &&
3103 properties_equal (extent_ancestor (e1), extent_ancestor (e2), 3103 properties_equal (extent_ancestor (e1), extent_ancestor (e2),
3104 depth)); 3104 depth));
3105 } 3105 }
3106 3106
3107 static unsigned long 3107 static Hash_Code
3108 extent_hash (Lisp_Object obj, int depth) 3108 extent_hash (Lisp_Object obj, int depth)
3109 { 3109 {
3110 struct extent *e = XEXTENT (obj); 3110 struct extent *e = XEXTENT (obj);
3111 /* No need to hash all of the elements; that would take too long. 3111 /* No need to hash all of the elements; that would take too long.
3112 Just hash the most common ones. */ 3112 Just hash the most common ones. */
5032 extent = extent_ancestor (extent); 5032 extent = extent_ancestor (extent);
5033 5033
5034 if (!endp) 5034 if (!endp)
5035 { 5035 {
5036 set_extent_begin_glyph (extent, glyph); 5036 set_extent_begin_glyph (extent, glyph);
5037 extent_begin_glyph_layout (extent) = layout; 5037 set_extent_begin_glyph_layout (extent, layout);
5038 } 5038 }
5039 else 5039 else
5040 { 5040 {
5041 set_extent_end_glyph (extent, glyph); 5041 set_extent_end_glyph (extent, glyph);
5042 extent_end_glyph_layout (extent) = layout; 5042 set_extent_end_glyph_layout (extent, layout);
5043 } 5043 }
5044 5044
5045 extent_changed_for_redisplay (extent, 1, 0); 5045 extent_changed_for_redisplay (extent, 1, 0);
5046 } 5046 }
5047 5047
5134 */ 5134 */
5135 (extent, layout)) 5135 (extent, layout))
5136 { 5136 {
5137 EXTENT e = decode_extent (extent, 0); 5137 EXTENT e = decode_extent (extent, 0);
5138 e = extent_ancestor (e); 5138 e = extent_ancestor (e);
5139 extent_begin_glyph_layout (e) = symbol_to_glyph_layout (layout); 5139 set_extent_begin_glyph_layout (e, symbol_to_glyph_layout (layout));
5140 extent_maybe_changed_for_redisplay (e, 1, 0); 5140 extent_maybe_changed_for_redisplay (e, 1, 0);
5141 return layout; 5141 return layout;
5142 } 5142 }
5143 5143
5144 DEFUN ("set-extent-end-glyph-layout", Fset_extent_end_glyph_layout, 2, 2, 0, /* 5144 DEFUN ("set-extent-end-glyph-layout", Fset_extent_end_glyph_layout, 2, 2, 0, /*
5147 */ 5147 */
5148 (extent, layout)) 5148 (extent, layout))
5149 { 5149 {
5150 EXTENT e = decode_extent (extent, 0); 5150 EXTENT e = decode_extent (extent, 0);
5151 e = extent_ancestor (e); 5151 e = extent_ancestor (e);
5152 extent_end_glyph_layout (e) = symbol_to_glyph_layout (layout); 5152 set_extent_end_glyph_layout (e, symbol_to_glyph_layout (layout));
5153 extent_maybe_changed_for_redisplay (e, 1, 0); 5153 extent_maybe_changed_for_redisplay (e, 1, 0);
5154 return layout; 5154 return layout;
5155 } 5155 }
5156 5156
5157 DEFUN ("extent-begin-glyph-layout", Fextent_begin_glyph_layout, 1, 1, 0, /* 5157 DEFUN ("extent-begin-glyph-layout", Fextent_begin_glyph_layout, 1, 1, 0, /*