X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6ddd819467d1d9d0e78f13e5a15c1af9125ae67b..e2ae1c5a40e2802fcd9f5ee26b4906be97c8b878:/src/intervals.h diff --git a/src/intervals.h b/src/intervals.h index bd1f49dc38..30fb4b10b0 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -1,5 +1,5 @@ /* Definitions and global variables for intervals. - Copyright (C) 1993-1994, 2000-2014 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 2000-2015 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -223,7 +223,7 @@ set_interval_plist (INTERVAL i, Lisp_Object plist) #define TEXT_PROP_MEANS_INVISIBLE(prop) \ (EQ (BVAR (current_buffer, invisibility_spec), Qt) \ ? !NILP (prop) \ - : invisible_p (prop, BVAR (current_buffer, invisibility_spec))) + : invisible_prop (prop, BVAR (current_buffer, invisibility_spec))) /* Declared in alloc.c. */ @@ -269,23 +269,9 @@ extern INTERVAL validate_interval_range (Lisp_Object, Lisp_Object *, extern INTERVAL interval_of (ptrdiff_t, Lisp_Object); /* Defined in xdisp.c. */ -extern int invisible_p (Lisp_Object, Lisp_Object); - -/* Declared in textprop.c. */ - -/* Types of hooks. */ -extern Lisp_Object Qpoint_left; -extern Lisp_Object Qpoint_entered; -extern Lisp_Object Qmodification_hooks; -extern Lisp_Object Qcategory; -extern Lisp_Object Qlocal_map; - -/* Visual properties text (including strings) may have. */ -extern Lisp_Object Qinvisible, Qintangible; - -/* Sticky properties. */ -extern Lisp_Object Qfront_sticky, Qrear_nonsticky; +extern int invisible_prop (Lisp_Object, Lisp_Object); +/* Defined in textprop.c. */ extern Lisp_Object copy_text_properties (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);