projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Vcharacter_name_table): New variable.
[chise/xemacs-chise.git-]
/
src
/
extents.h
diff --git
a/src/extents.h
b/src/extents.h
index
2a2ab9d
..
d8afb56
100644
(file)
--- a/
src/extents.h
+++ b/
src/extents.h
@@
-20,8
+20,8
@@
Boston, MA 02111-1307, USA. */
/* Synched up with: Not in FSF. */
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_EXTENTS_H_
-#define _XEMACS_EXTENTS_H_
+#ifndef INCLUDED_extents_h_
+#define INCLUDED_extents_h_
DECLARE_LRECORD (extent, struct extent);
#define XEXTENT(x) XRECORD (x, extent, struct extent)
DECLARE_LRECORD (extent, struct extent);
#define XEXTENT(x) XRECORD (x, extent, struct extent)
@@
-177,8
+177,8
@@
void flush_cached_extent_info (Lisp_Object extent_info);
#define extent_no_chase_normal_field(e, field) ((e)->flags.field)
#define extent_no_chase_normal_field(e, field) ((e)->flags.field)
-INLINE struct extent_auxiliary *extent_aux_or_default (EXTENT e);
-INLINE struct extent_auxiliary *
+INLINE_HEADER struct extent_auxiliary *extent_aux_or_default (EXTENT e);
+INLINE_HEADER struct extent_auxiliary *
extent_aux_or_default (EXTENT e)
{
return e->flags.has_aux ?
extent_aux_or_default (EXTENT e)
{
return e->flags.has_aux ?
@@
-259,8
+259,8
@@
extent_aux_or_default (EXTENT e)
#define extent_internal_p(e) extent_normal_field (e, internal)
#define extent_in_red_event_p(e) extent_normal_field (e, in_red_event)
#define extent_internal_p(e) extent_normal_field (e, internal)
#define extent_in_red_event_p(e) extent_normal_field (e, in_red_event)
-INLINE Lisp_Object * extent_no_chase_plist_addr (EXTENT e);
-INLINE Lisp_Object *
+INLINE_HEADER Lisp_Object * extent_no_chase_plist_addr (EXTENT e);
+INLINE_HEADER Lisp_Object *
extent_no_chase_plist_addr (EXTENT e)
{
return e->flags.has_aux ? &XCDR (e->plist) : &e->plist;
extent_no_chase_plist_addr (EXTENT e)
{
return e->flags.has_aux ? &XCDR (e->plist) : &e->plist;
@@
-318,6
+318,7
@@
EXFUN (Fset_extent_endpoints, 4);
EXFUN (Fset_extent_parent, 2);
extern int inside_undo;
EXFUN (Fset_extent_parent, 2);
extern int inside_undo;
+extern int in_modeline_generation;
struct extent_fragment *extent_fragment_new (Lisp_Object buffer_or_string,
struct frame *frm);
struct extent_fragment *extent_fragment_new (Lisp_Object buffer_or_string,
struct frame *frm);
@@
-339,8
+340,8
@@
EXTENT extent_ancestor_1 (EXTENT e);
/* extent_ancestor() chases all the parent links until there aren't any
more. extent_ancestor_1() does the same thing but it a function;
the following optimizes the most common case. */
/* extent_ancestor() chases all the parent links until there aren't any
more. extent_ancestor_1() does the same thing but it a function;
the following optimizes the most common case. */
-INLINE EXTENT extent_ancestor (EXTENT e);
-INLINE EXTENT
+INLINE_HEADER EXTENT extent_ancestor (EXTENT e);
+INLINE_HEADER EXTENT
extent_ancestor (EXTENT e)
{
return e->flags.has_parent ? extent_ancestor_1 (e) : e;
extent_ancestor (EXTENT e)
{
return e->flags.has_parent ? extent_ancestor_1 (e) : e;
@@
-397,4
+398,4
@@
int compute_buffer_extent_usage (struct buffer *b,
#endif /* emacs */
#endif /* emacs */
-#endif /* _XEMACS_EXTENTS_H_ */
+#endif /* INCLUDED_extents_h_ */