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,
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
#ifdef USE_TEXT_PROPERTIES
#ifndef NORMAL_FACE
(! 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;