Commit graph

77 commits

Author SHA1 Message Date
Glenn Morris
b9b1cc1463 Switch to recommended form of GPLv3 permissions notice. 2008-05-15 03:28:14 +00:00
Stefan Monnier
6ba7f443e9 * intervals.c (temp_set_point, temp_set_point_both): Use EMACS_INT.
(set_point, set_point_both): Use EMACS_INT.  Remove `buffer' arg,
work on current_buffer only instead (that was already the case
for some of the code anyway).
* buffer.h (set_point, set_point_both): Remove buffer arg, use long int.
(temp_set_point, temp_set_point_both): Use EMACS_INT.
(SET_PT, SET_PT_BOTH): Adjust.
* intervals.h (set_point, temp_set_point, set_point_both)
(temp_set_point_both): Remove redundant declarations.
2008-03-20 18:38:34 +00:00
Miles Bader
b03f96dc5a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1074
2008-02-24 10:09:07 +00:00
Stefan Monnier
837584c702 (INT_LISPLIKE): Remove. It may misfire.
(NULL_INTERVAL_P, SET_INTERVAL_PARENT): Don't use it.
2008-02-19 21:58:09 +00:00
Miles Bader
430d2ee291 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
2008-01-09 01:21:15 +00:00
Glenn Morris
8cabe764e9 Add 2008 to copyright years. 2008-01-08 04:37:27 +00:00
Miles Bader
e468b87f91 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 824-831)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 70-74)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
2007-07-27 10:52:18 +00:00
Glenn Morris
684d6f5bcc Switch license to GPLv3 or later. 2007-07-25 05:19:07 +00:00
Miles Bader
c0466914ba Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
2007-01-26 06:16:11 +00:00
Glenn Morris
429ab54e01 Update copyright for years from Emacs 21 to present (mainly adding
2001).
2007-01-14 03:38:22 +00:00
Miles Bader
380874900c Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

   - Update from CVS
   - Merge from emacs--devo--0
2006-02-08 04:26:44 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Miles Bader
d4cccb1406 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 514-518)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 104-105)

   - Update from CVS
2005-08-26 09:51:52 +00:00
Thien-Thi Nguyen
0b5538bd85 Update years in copyright notice; nfc. 2005-08-07 12:33:19 +00:00
Miles Bader
d3e4babdd1 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 459-473)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 86-87)

   - Update from CVS
2005-07-07 12:43:14 +00:00
Lute Kamstra
4fc5845fe8 Update FSF's address. 2005-07-04 16:49:24 +00:00
Miles Bader
8b7e837d9c Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-70
Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
   Update from CVS
2004-11-12 02:53:04 +00:00
Kim F. Storm
825e0e0b53 (NULL_INTERVAL_P): Add separate version when
ENABLE_CHECKING is not defined to silence compiler.
(compare_string_intervals): Add prototype.
2004-11-09 13:23:42 +00:00
Kenichi Handa
6b61353c0a Sync to HEAD 2004-04-16 12:51:06 +00:00
Luc Teirlinck
47b54808f1 Add EXFUN for Fget_char_property_and_overlay. 2003-11-30 17:12:40 +00:00
Dave Love
ca5a9b6c7b (get_property_and_range): Make start and end EMACS_INT. 2003-09-17 13:53:56 +00:00
Kenichi Handa
463f5630a5 New directory 2003-09-08 11:56:09 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Stefan Monnier
4a6a76d9e8 (struct interval): Move from lisp.h. 2003-07-09 20:25:59 +00:00
Stefan Monnier
6d9b60995f (get_pos_property): Declare. 2003-05-17 18:54:56 +00:00
Stefan Monnier
6f71664498 (text_property_stickiness): New arg `buffer'. 2003-05-17 18:46:36 +00:00
Richard M. Stallman
e5a9c92a9f (CHECK_TOTAL_LENGTH): New macro. 2003-04-06 20:29:13 +00:00
Dave Love
a2a78a17fa (text_property_stickiness): Fix prototype. 2002-07-17 19:54:19 +00:00
Colin Walters
14112a3fb0 (lookup_char_property): Declare.
(Vchar_property_alias_alist): Declare.
2002-06-08 20:24:55 +00:00
Miles Bader
b210a64a6a (text_property_stickiness): New declaration. 2002-03-14 08:09:59 +00:00
Pavel Janík
0277b535be Include "dispextern.h" unconditionally. 2002-02-24 20:37:24 +00:00
Richard M. Stallman
0542e206fe Declare set_text_properties and set_text_properties_1. 2001-11-11 20:05:05 +00:00
Stefan Monnier
99776d43e2 (TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS)
(TEXT_PROP_MEANS_INVISIBLE_NOELLIPSIS): Remove.
2001-10-14 20:23:38 +00:00
Stefan Monnier
67139f6cfc (TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS)
(TEXT_PROP_MEANS_INVISIBLE_NOELLIPSIS): Use invisible_p's new return vals.
(invisible_ellipsis_p, invisible_noellipsis_p): Removed.
2001-10-14 19:19:03 +00:00
Stefan Monnier
df1958c4fe (TEXT_PROP_MEANS_INVISIBLE_NOELLIPSIS): New macro.
(traverse_intervals_noorder, invisible_noellipsis_p): New funs.
2001-10-12 22:04:42 +00:00
Gerd Moellmann
95a7097d65 (enum map_property): Removed.
(get_local_map): Change prototype.
2001-01-12 11:18:41 +00:00
Miles Bader
beed66fe18 (get_char_property_and_overlay): Add declaration. 2000-10-25 05:13:17 +00:00
Ken Raeburn
212b4f2c99 (Fprevious_single_char_property_change): Declare. 2000-08-08 14:39:46 +00:00
Dave Love
b4030d7b9d (map_property): New enum.
(get_local_map): Extra arg using it.
(Qkeymap): Declare.
2000-05-29 11:42:51 +00:00
Ken Raeburn
c0333abccb * intervals.h (SET_INTERVAL_PARENT): Use INT_LISPLIKE to test for a pointer
that looks like a lisp object.
(SET_INTERVAL_OBJECT): Don't explicitly compare the object with zero, instead
see whether it's an integer object, since they can't have intervals.
(GET_INTERVAL_OBJECT): Simply assign to the destination.
2000-04-05 18:53:39 +00:00
Ken Raeburn
e0b8c689e2 Stop assuming interval pointers and lisp objects can be distinguished by
inspection.  Beginnings of support for expensive internal consistency checks.

* config.in (ENABLE_CHECKING): Undef.

* lisp.h (struct interval): Replace "parent" field with a union of interval
pointer and Lisp_Object; add new bitfield to use as discriminant.  Change other
flag fields to bitfields.
(CHECK): New macro for consistency checking.  If ENABLE_CHECKING is defined and
the supplied test fails, print a message and abort.
(eassert): New macro.  Use CHECK to provide an assert-like facility.

* intervals.h (NULL_INTERVAL_P): Now applies only to real interval pointers;
abort if the value looks like a lisp object.
(NULL_INTERVAL_P, NULL_PARENT, HAS_PARENT, HAS_OBJECT, SET_PARENT, SET_OBJECT,
INTERVAL_PARENT, GET_INTERVAL_OBJECT, COPY_PARENT): Modify for new interval
parent definition.

* alloc.c (mark_interval_tree, MARK_INTERVAL_TREE, UNMARK_BALANCE_INTERVALS):
Update references that need an addressable lisp object in the interval
structure.
(die): New function.
(suppress_checking): New variable.

* intervals.c (interval_start_pos): Just return 0 if there's no parent object.
2000-03-29 22:14:34 +00:00
Ken Raeburn
439d5cb4f7 Changes towards better type safety regarding intervals, primarily
regarding the "parent" handle.  These just separate out the different
usages based on the type of parent (interval vs lisp object); later
changes will do type checking and enforcement.

	* intervals.h (NULL_INTERVAL): Cast to INTERVAL type.
	(INT_LISPLIKE): New macro.
	(NULL_INTERVAL_P): Use it.
	(INTERVAL_HAS_PARENT, INTERVAL_HAS_OBJECT, SET_INTERVAL_PARENT,
	SET_INTERVAL_OBJECT, INTERVAL_PARENT, COPY_INTERVAL_PARENT,
	GET_INTERVAL_OBJECT, INTERVAL_PARENT_OR_NULL): New macros.

	* alloc.c (make_interval, gc_sweep): Use new macros; eliminate all
	explicit references to "parent" field of struct interval and
	associated unclean type conversions.
	* intervals.c (create_root_interval, root_interval, rotate_right,
	rotate_left, balance_possible_root_interval, split_interval_right,
	split_interval_left, interval_start_pos, find_interval,
	next_interval, previous_interval, update_interval,
	adjust_intervals_for_insertion, delete_node, delete_interval,
	adjust_intervals_for_deletion, merge_interval_right,
	merge_interval_left, reproduce_tree, graft_intervals_into_buffer,
	copy_intervals_to_string): Likewise.
	* intervals.h (AM_LEFT_CHILD, AM_RIGHT_CHILD, RESET_INTERVAL):
	Likewise.
	* syntax.c (update_syntax_table): Likewise.

	* intervals.c (reproduce_tree_obj): New function, like
	reproduce_tree but takes a Lisp_Object for the parent.  Declare
	with prototype.
	(graft_intervals_into_buffer): Use it when appropriate.
	(reproduce_tree): Declare with prototype.
	(balance_possible_root_interval): Check that the parent is a lisp
	object before trying to examine its type.
2000-03-22 21:44:05 +00:00
Kenichi Handa
a5ecc8a315 Include composite.h.
(get_property_and_range): Extern it.
(Vtext_property_default_nonsticky): Extern it.
1999-12-15 00:14:19 +00:00
Gerd Moellmann
339ee9797d Remove USE_TEXT_PROPERTIES. 1999-11-11 11:45:06 +00:00
Gerd Moellmann
ecfd95532d Add function prototypes. 1999-07-21 21:43:52 +00:00
Andreas Schwab
ec5d8db72d Add more prototypes. 1998-04-14 12:33:47 +00:00
Richard M. Stallman
fdccf4469e (set_point, temp_set_point): Swap args in decl.
(set_point_both, temp_set_point_both): New decls.
1998-01-01 06:41:39 +00:00
Andreas Schwab
d748a3dbdc Add prototypes and more function declarations. 1997-11-21 15:12:34 +00:00
Richard M. Stallman
2e34157cd9 Fix bugs with inappropriate mixing of Lisp_Object with int. 1997-07-04 20:44:52 +00:00
Richard M. Stallman
add1fffcee (update_interval): New function declaration. 1997-04-15 04:46:14 +00:00