Mercurial > hg > xemacs-beta
comparison src/extents.c @ 371:cc15677e0335 r21-2b1
Import from CVS: tag r21-2b1
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:03:08 +0200 |
parents | 182f72e8cd0d |
children | 6240c7796c7a |
comparison
equal
deleted
inserted
replaced
370:bd866891f083 | 371:cc15677e0335 |
---|---|
3171 { | 3171 { |
3172 /* #### Is this correct, anyway? */ | 3172 /* #### Is this correct, anyway? */ |
3173 return -1; | 3173 return -1; |
3174 } | 3174 } |
3175 | 3175 |
3176 return external_remprop (extent_plist_addr (ext), prop, 0, ERROR_ME); | 3176 return external_remprop (&ext->plist, prop, 0, ERROR_ME); |
3177 } | 3177 } |
3178 | 3178 |
3179 static Lisp_Object | 3179 static Lisp_Object |
3180 extent_plist (Lisp_Object obj) | 3180 extent_plist (Lisp_Object obj) |
3181 { | 3181 { |
4904 Lisp_Object layout_obj) | 4904 Lisp_Object layout_obj) |
4905 { | 4905 { |
4906 EXTENT extent = decode_extent (extent_obj, DE_MUST_HAVE_BUFFER); | 4906 EXTENT extent = decode_extent (extent_obj, DE_MUST_HAVE_BUFFER); |
4907 glyph_layout layout = symbol_to_glyph_layout (layout_obj); | 4907 glyph_layout layout = symbol_to_glyph_layout (layout_obj); |
4908 | 4908 |
4909 /* Make sure we've actually been given a valid glyph or it's nil | 4909 /* Make sure we've actually been given a glyph or it's nil (meaning |
4910 (meaning we're deleting a glyph from an extent). */ | 4910 we're deleting a glyph from an extent). */ |
4911 if (!NILP (glyph)) | 4911 if (!NILP (glyph)) |
4912 CHECK_BUFFER_GLYPH (glyph); | 4912 CHECK_GLYPH (glyph); |
4913 | 4913 |
4914 set_extent_glyph (extent, glyph, endp, layout); | 4914 set_extent_glyph (extent, glyph, endp, layout); |
4915 return glyph; | 4915 return glyph; |
4916 } | 4916 } |
4917 | 4917 |
5712 | 5712 |
5713 if (new_start < base_start) | 5713 if (new_start < base_start) |
5714 new_start = base_start; | 5714 new_start = base_start; |
5715 if (new_end > base_end) | 5715 if (new_end > base_end) |
5716 new_end = base_end; | 5716 new_end = base_end; |
5717 if (new_end <= new_start) | |
5718 return 0; | |
5717 | 5719 |
5718 if (!extent_duplicable_p (extent)) | 5720 if (!extent_duplicable_p (extent)) |
5719 return 0; | 5721 return 0; |
5720 | 5722 |
5721 if (!inside_undo && | 5723 if (!inside_undo && |