Mercurial > hg > xemacs-beta

comparison src/extents.c @ 3025:facf3239ba30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-10-25 11:16:19 by ben] rename new->new_, convert 'foo to `foo' EmacsFrame.c, ExternalClient.c, ExternalShell.c, chartab.c, cmdloop.c, compiler.h, console.c, database.c, device-msw.c, device-x.c, device.c, doc.c, dragdrop.c, eval.c, event-msw.c, event-stream.c, events.c, extents.c, file-coding.c, fns.c, frame-tty.c, frame.c, gpmevent.c, gutter.c, hash.c, imgproc.c, indent.c, keymap.c, lisp-union.h, macros.c, malloc.c, marker.c, menubar-x.c, menubar.c, mule-charset.c, number.c, process.c, profile.h, ralloc.c, redisplay.c, select-common.h, select.c, syntax.c, sysfile.h, sysproc.h, systime.h, syswindows.h, toolbar.c, tooltalk.c, tparam.c, unexaix.c, unexalpha.c, unexconvex.c, unexec.c, unexhp9k800.c, unexmips.c, unicode.c, window.c: new -> new_. 'foo -> `foo'. lwlib-internal.h: redo assert macros to follow lisp.h and not trigger warnings. lwlib.c, xlwtabs.c: new -> new_.
author ben
date Tue, 25 Oct 2005 11:16:49 +0000
parents 1e7cc382eb16
children 141c2920ea48 3742ea8250b5
comparison
equal deleted inserted replaced
3024:b7f26b2f78bd 3025:facf3239ba30
3731 { 3731 {
3732 if (!bsearch (Dynarr_atp (oldprops, i), Dynarr_atp (newprops, 0), 3732 if (!bsearch (Dynarr_atp (oldprops, i), Dynarr_atp (newprops, 0),
3733 Dynarr_length (newprops), sizeof (Lisp_Object_pair), 3733 Dynarr_length (newprops), sizeof (Lisp_Object_pair),
3734 compare_key_value_pairs)) 3734 compare_key_value_pairs))
3735 { 3735 {
3736 Lisp_Object_pair new; 3736 Lisp_Object_pair new_;
3737 new.key = Dynarr_at (oldprops, i).key; 3737 new_.key = Dynarr_at (oldprops, i).key;
3738 new.value = Qunbound; 3738 new_.value = Qunbound;
3739 Dynarr_add (newprops, new); 3739 Dynarr_add (newprops, new_);
3740 } 3740 }
3741 } 3741 }
3742 for (i = 0; i < orignewlength; i++) 3742 for (i = 0; i < orignewlength; i++)
3743 { 3743 {
3744 if (!Dynarr_length (oldprops) || !bsearch (Dynarr_atp (newprops, i), 3744 if (!Dynarr_length (oldprops) || !bsearch (Dynarr_atp (newprops, i),
3745 Dynarr_atp (oldprops, 0), 3745 Dynarr_atp (oldprops, 0),
3746 Dynarr_length (oldprops), 3746 Dynarr_length (oldprops),
3747 sizeof (Lisp_Object_pair), 3747 sizeof (Lisp_Object_pair),
3748 compare_key_value_pairs)) 3748 compare_key_value_pairs))
3749 { 3749 {
3750 Lisp_Object_pair new; 3750 Lisp_Object_pair new_;
3751 new.key = Dynarr_at (newprops, i).key; 3751 new_.key = Dynarr_at (newprops, i).key;
3752 new.value = Qunbound; 3752 new_.value = Qunbound;
3753 Dynarr_add (oldprops, new); 3753 Dynarr_add (oldprops, new_);
3754 } 3754 }
3755 } 3755 }
3756 qsort (Dynarr_atp (oldprops, 0), Dynarr_length (oldprops), 3756 qsort (Dynarr_atp (oldprops, 0), Dynarr_length (oldprops),
3757 sizeof (Lisp_Object_pair), compare_key_value_pairs); 3757 sizeof (Lisp_Object_pair), compare_key_value_pairs);
3758 qsort (Dynarr_atp (newprops, 0), Dynarr_length (newprops), 3758 qsort (Dynarr_atp (newprops, 0), Dynarr_length (newprops),
6523 int text_props_only) 6523 int text_props_only)
6524 { 6524 {
6525 Lisp_Object extent; 6525 Lisp_Object extent;
6526 6526
6527 /* text_props_only specifies whether we only consider text-property 6527 /* text_props_only specifies whether we only consider text-property
6528 extents (those with the 'text-prop property set) or all extents. */ 6528 extents (those with the `text-prop' property set) or all extents. */
6529 if (!text_props_only) 6529 if (!text_props_only)
6530 extent = extent_at (position, object, prop, 0, fl, 0); 6530 extent = extent_at (position, object, prop, 0, fl, 0);
6531 else 6531 else
6532 { 6532 {
6533 EXTENT prior = 0; 6533 EXTENT prior = 0;
6663 Lisp_Object extent, e_val; 6663 Lisp_Object extent, e_val;
6664 int is_eq; 6664 int is_eq;
6665 6665
6666 extent = wrap_extent (e); 6666 extent = wrap_extent (e);
6667 6667
6668 /* Note: in some cases when the property itself is 'start-open 6668 /* Note: in some cases when the property itself is `start-open'
6669 or 'end-closed, the checks to set the openness may do a bit 6669 or `end-closed', the checks to set the openness may do a bit
6670 of extra work; but it won't hurt because we then fix up the 6670 of extra work; but it won't hurt because we then fix up the
6671 openness later on in put_text_prop_openness_mapper(). */ 6671 openness later on in put_text_prop_openness_mapper(). */
6672 if (!EQ (Fextent_property (extent, Qtext_prop, Qnil), closure->prop)) 6672 if (!EQ (Fextent_property (extent, Qtext_prop, Qnil), closure->prop))
6673 /* It's not for this property; do nothing. */ 6673 /* It's not for this property; do nothing. */
6674 return 0; 6674 return 0;