diff options
author | Richard M. Stallman <rms@gnu.org> | 1997-07-04 20:44:52 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 1997-07-04 20:44:52 +0000 |
commit | 52e8dfd960f9fa9c53f9ee06c33338d241cca2a3 (patch) | |
tree | e73c9450d93e194e2a566b8cc96f5afc02e54857 /src/intervals.c | |
parent | 35934fcb35d1aeedd805d1b027ce5b59f5a0c79d (diff) | |
download | emacs-52e8dfd960f9fa9c53f9ee06c33338d241cca2a3.tar.gz |
Fix bugs with inappropriate mixing of Lisp_Object with int.
Diffstat (limited to 'src/intervals.c')
-rw-r--r-- | src/intervals.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/intervals.c b/src/intervals.c index fa23272160b..995b1cfb2eb 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -85,7 +85,7 @@ create_root_interval (parent) XSTRING (parent)->intervals = new; } - new->parent = (INTERVAL) parent; + new->parent = (INTERVAL) XFASTINT (parent); new->position = 1; return new; @@ -411,7 +411,7 @@ balance_possible_root_interval (interval) if (interval->parent == NULL_INTERVAL) return interval; - parent = (Lisp_Object) (interval->parent); + XSETFASTINT (parent, (EMACS_INT) interval->parent); interval = balance_an_interval (interval); if (BUFFERP (parent)) @@ -1130,10 +1130,10 @@ delete_interval (i) if (ROOT_INTERVAL_P (i)) { Lisp_Object owner; - owner = (Lisp_Object) i->parent; + XSETFASTINT (owner, (EMACS_INT) i->parent); parent = delete_node (i); if (! NULL_INTERVAL_P (parent)) - parent->parent = (INTERVAL) owner; + parent->parent = (INTERVAL) XFASTINT (owner); if (BUFFERP (owner)) BUF_INTERVALS (XBUFFER (owner)) = parent; @@ -1868,7 +1868,7 @@ move_if_not_intangible (position) if (! NILP (Vinhibit_point_motion_hooks)) /* If intangible is inhibited, always move point to POSITION. */ ; - else if (PT < position && pos < ZV) + else if (PT < position && XINT (pos) < ZV) { /* We want to move forward, so check the text before POSITION. */ @@ -1884,7 +1884,7 @@ move_if_not_intangible (position) intangible_propval)) pos = Fprevious_char_property_change (pos, Qnil); } - else if (pos > BEGV) + else if (XINT (pos) > BEGV) { /* We want to move backward, so check the text after POSITION. */ @@ -2010,7 +2010,7 @@ copy_intervals_to_string (string, buffer, position, length) if (NULL_INTERVAL_P (interval_copy)) return; - interval_copy->parent = (INTERVAL) string; + interval_copy->parent = (INTERVAL) XFASTINT (string); XSTRING (string)->intervals = interval_copy; } |