GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
- TOTAL_LENGTH ((i)->right) \
- TOTAL_LENGTH ((i)->left)))
-/* The absolute index of the last character belonging to I. Note that
+/* The position of the character just past the end of I. Note that
the position cache i->position must be valid for this to work. */
-#define INTERVAL_LAST_POS(i) ((i)->position + LENGTH ((i)) - 1)
+#define INTERVAL_LAST_POS(i) ((i)->position + LENGTH ((i)))
/* The total size of the left subtree of this interval. */
#define LEFT_TOTAL_LENGTH(i) ((i)->left ? (i)->left->total_length : 0)
(! NULL_INTERVAL_P (i) && ! NILP (textget ((i)->plist, Qrear_nonsticky)))
+/* If PROP is the `invisible' property of a character,
+ this is 1 if the character should be treated as invisible. */
+
+#define TEXT_PROP_MEANS_INVISIBLE(prop) \
+ (EQ (current_buffer->invisibility_spec, Qt) \
+ ? ! NILP (prop) \
+ : invisible_p (prop, current_buffer->invisibility_spec))
+
+/* If PROP is the `invisible' property of a character,
+ this is 1 if the character should be treated as invisible
+ and should have an ellipsis. */
+
+#define TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS(prop) \
+ (EQ (current_buffer->invisibility_spec, Qt) \
+ ? 0 \
+ : invisible_ellipsis_p (prop, current_buffer->invisibility_spec))
+
/* Declared in alloc.c */
extern INTERVAL make_interval ();
extern INLINE void copy_intervals_to_string ();
extern INTERVAL copy_intervals ();
extern Lisp_Object textget ();
-extern Lisp_Object textget_direct ();
extern Lisp_Object get_local_map ();
/* Declared in textprop.c */
extern Lisp_Object Qinvisible, Qintangible, Qread_only;
extern Lisp_Object Vinhibit_point_motion_hooks;
+extern Lisp_Object Vdefault_text_properties;
/* Sticky properties */
extern Lisp_Object Qfront_sticky, Qrear_nonsticky;