From eb35682e38e8a13f776f61c1c5f53cac425495cc Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 24 Apr 2011 19:59:37 +0300 Subject: [PATCH] Minor cleanup in src/xdisp.c. src/xdisp.c (handle_single_display_spec): Rename the display_replaced_before_p argument into display_replaced_p, to make it consistent with the commentary. Fix typos in the commentary. --- src/ChangeLog | 5 +++++ src/xdisp.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f4dd349200..f1d195c454 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-04-24 Eli Zaretskii + * xdisp.c (handle_single_display_spec): Rename the + display_replaced_before_p argument into display_replaced_p, to + make it consistent with the commentary. Fix typos in the + commentary. + * textprop.c (syms_of_textprop): Remove dead code. (copy_text_properties): Delete obsolete commentary about an interface that was deleted long ago. Fix typos in the description diff --git a/src/xdisp.c b/src/xdisp.c index 91d1b6ea2e..219f414c9e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -3855,7 +3855,7 @@ display_prop_end (struct it *it, Lisp_Object object, struct text_pos start_pos) } -/* Set up IT from a single `display' specification PROP. OBJECT +/* Set up IT from a single `display' property specification SPEC. OBJECT is the object in which the `display' property was found. *POSITION is the position at which it was found. DISPLAY_REPLACED_P non-zero means that we previously saw a display specification which already @@ -3865,7 +3865,7 @@ display_prop_end (struct it *it, Lisp_Object object, struct text_pos start_pos) OVERLAY is the overlay this `display' property came from, or nil if it was a text property. - If PROP is a `space' or `image' specification, and in some other + If SPEC is a `space' or `image' specification, and in some other cases too, set *POSITION to the position where the `display' property ends. @@ -3875,7 +3875,7 @@ display_prop_end (struct it *it, Lisp_Object object, struct text_pos start_pos) static int handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, Lisp_Object overlay, struct text_pos *position, - int display_replaced_before_p) + int display_replaced_p) { Lisp_Object form; Lisp_Object location, value; @@ -4171,7 +4171,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, #endif /* not HAVE_WINDOW_SYSTEM */ || (CONSP (value) && EQ (XCAR (value), Qspace))); - if (valid_p && !display_replaced_before_p) + if (valid_p && !display_replaced_p) { /* Save current settings of IT so that we can restore them when we are finished with the glyph property value. */ -- 2.20.1