xemacs-beta: src/extents.c comparison

comparison src/extents.c @ 280:7df0dd720c89 r21-0b38

Import from CVS: tag r21-0b38

author	cvs
date	Mon, 13 Aug 2007 10:32:22 +0200
parents	6330739388db
children	558f606b08ae

comparison

equal deleted inserted replaced

-:c20b2fb5bb0a
+:7df0dd720c89
 	     (memoize_extent_face_internal (value)));
 return value;
 }
 /* Do we need a lisp-level function ? */
-DEFUN ("set-extent-initial-redisplay-function",
+DEFUN ("set-extent-initial-redisplay-function", Fset_extent_initial_redisplay_function,
-Fset_extent_initial_redisplay_function, 2,2,0,/*
+2,2,0,/*
 Note: This feature is experimental!
 Set initial-redisplay-function of EXTENT to the function
 FUNCTION.
 Set this using the `set-extent-begin-glyph-layout' function.
 */
 (extent))
 {
 EXTENT e = decode_extent (extent, 0);
-return glyph_layout_to_symbol (extent_begin_glyph_layout (e));
+return glyph_layout_to_symbol ((glyph_layout) extent_begin_glyph_layout (e));
 }
 DEFUN ("extent-end-glyph-layout", Fextent_end_glyph_layout, 1, 1, 0, /*
 Return the layout policy associated with the given extent's end glyph.
 Set this using the `set-extent-end-glyph-layout' function.
 */
 (extent))
 {
 EXTENT e = decode_extent (extent, 0);
-return glyph_layout_to_symbol (extent_end_glyph_layout (e));
+return glyph_layout_to_symbol ((glyph_layout) extent_end_glyph_layout (e));
 }
 DEFUN ("set-extent-priority", Fset_extent_priority, 2, 2, 0, /*
 Set the display priority of EXTENT to PRIORITY (an integer).
 When the extent attributes are being merged for display, the priority
 */
 (extent))
 {
 EXTENT e, anc;
 Lisp_Object result, face, anc_obj;
-enum glyph_layout layout;
+glyph_layout layout;
 CHECK_EXTENT (extent);
 e = XEXTENT (extent);
 if (!EXTENT_LIVE_P (e))
 return cons3 (Qdestroyed, Qt, Qnil);
 result = cons3 (Qface, face, result);
 if (!NILP (face = Fextent_mouse_face (anc_obj)))
 result = cons3 (Qmouse_face, face, result);
-if ((layout = extent_begin_glyph_layout (anc)) != GL_TEXT)
+if ((layout = (glyph_layout) extent_begin_glyph_layout (anc)) != GL_TEXT)
 {
 Lisp_Object sym = glyph_layout_to_symbol (layout);
 result = cons3 (Qglyph_layout,       sym, result); /* compatibility */
 result = cons3 (Qbegin_glyph_layout, sym, result);
 }
-if ((layout = extent_end_glyph_layout (anc)) != GL_TEXT)
+if ((layout = (glyph_layout) extent_end_glyph_layout (anc)) != GL_TEXT)
 result = cons3 (Qend_glyph_layout, glyph_layout_to_symbol (layout), result);
 if (!NILP (extent_end_glyph (anc)))
 result = cons3 (Qend_glyph, extent_end_glyph (anc), result);
 get_buffer_or_string_range_byte (object, start, end, &s, &e, 0);
 put_text_prop (s, e, object, prop, value, 1);
 return prop;
 }
-DEFUN ("put-nonduplicable-text-property",
+DEFUN ("put-nonduplicable-text-property", Fput_nonduplicable_text_property,
-Fput_nonduplicable_text_property, 4, 5, 0, /*
+4, 5, 0, /*
 Adds the given property/value to all characters in the specified region.
 The property is conceptually attached to the characters rather than the
 region, however the properties will not be copied when the characters
 are copied.
 Fifth argument OBJECT is the buffer or string containing the text, and
 }
 return changed ? Qt : Qnil;
 }
-DEFUN ("add-nonduplicable-text-properties",
+DEFUN ("add-nonduplicable-text-properties", Fadd_nonduplicable_text_properties,
-Fadd_nonduplicable_text_properties, 3, 4, 0, /*
+3, 4, 0, /*
 Add nonduplicable properties to the characters from START to END.
 \(The properties will not be copied when the characters are copied.)
 The third argument PROPS is a property list specifying the property values
 to add.  The optional fourth argument, OBJECT, is the buffer or string
 containing the text and defaults to the current buffer.  Returns t if
 The lisp implementation of this was probably fast enough, but since I moved
 the rest of the put-text-prop code here, I moved this as well for
 completeness.
 */
-DEFUN ("text-prop-extent-paste-function",
+DEFUN ("text-prop-extent-paste-function", Ftext_prop_extent_paste_function,
-Ftext_prop_extent_paste_function, 3, 3, 0, /*
+3, 3, 0, /*
 Used as the `paste-function' property of `text-prop' extents.
 */
 (extent, from, to))
 {
 /* This function can GC */
 /* This function could easily be written in Lisp but the C code wants
 to use it in connection with invisible extents (at least currently).
 If this changes, consider moving this back into Lisp. */
-DEFUN ("next-single-property-change", Fnext_single_property_change, 2, 4, 0, /*
+DEFUN ("next-single-property-change", Fnext_single_property_change,
+2, 4, 0, /*
 Return the position of next property change for a specific property.
 Scans characters forward from POS till it finds a change in the PROP
 property, then returns the position of the change.  The optional third
 argument OBJECT is the buffer or string to scan (defaults to the current
 buffer).
 return make_int (blim);
 }
 /* See comment on previous function about why this is written in C. */
-DEFUN ("previous-single-property-change",
+DEFUN ("previous-single-property-change", Fprevious_single_property_change,
-Fprevious_single_property_change, 2, 4, 0, /*
+2, 4, 0, /*
 Return the position of next property change for a specific property.
 Scans characters backward from POS till it finds a change in the PROP
 property, then returns the position of the change.  The optional third
 argument OBJECT is the buffer or string to scan (defaults to the current
 buffer).

Mercurial > hg > xemacs-beta

comparison src/extents.c @ 280:7df0dd720c89 r21-0b38