Document new :extend face attribute in manuals.

Some stylistic corrections in src/xdisp.c and src/xfaces.c.

2 files changed, 6 insertions, 7 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 2c69a1f04f1..45462c5ac59 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21400,7 +21400,7 @@ append_space_for_newline (struct it *it, bool default_face_p)
           const int local_default_face_id =
             lookup_basic_face (it->w, it->f, DEFAULT_FACE_ID);
           struct face* default_face =
-            FACE_FROM_ID (it->f, local_default_face_id);
+            FACE_FROM_ID_OR_NULL (it->f, local_default_face_id);
 
 #ifdef HAVE_WINDOW_SYSTEM
           if (FRAME_WINDOW_P (it->f))
@@ -21534,7 +21534,7 @@ append_space_for_newline (struct it *it, bool default_face_p)
           g->ascent = it->max_ascent;
           g->descent = it->max_descent;
         }
-#endif // HAVE_WINDOW_SYSTEM
+#endif /* HAVE_WINDOW_SYSTEM  */
       it->override_ascent = -1;
       it->constrain_row_ascent_descent_p = false;
       it->current_x = saved_x;
@@ -21722,8 +21722,6 @@ extend_face_to_end_of_line (struct it *it)
                 }
             }
 
-          /* Restore the face after the indicator was generated.  */
-
           /* If there is space after the indicator generate an
              extra empty glyph to restore the face.  Issue was
              observed in X systems.  */
diff --git a/src/xfaces.c b/src/xfaces.c
index 5577640325d..cc65527fe61 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2282,7 +2282,7 @@ filter_face_ref (Lisp_Object face_ref,
    of ERR_MSGS).  Use NAMED_MERGE_POINTS to detect loops in face
    inheritance or list structure; it may be 0 for most callers.
 
-   attr_filter is the index of a parameter that conditions the merging
+   ATTR_FILTER is the index of a parameter that conditions the merging
    for named faces (case 1) to only the face_ref where
    lface[merge_face_ref] is non-nil. To merge unconditionally set this
    value to 0.
@@ -6043,7 +6043,7 @@ compute_char_face (struct frame *f, int ch, Lisp_Object prop)
    which a different face is needed, as far as text properties and
    overlays are concerned.  W is a window displaying current_buffer.
 
-   attr_filter is passed merge_face_ref.
+   ATTR_FILTER is passed merge_face_ref.
 
    REGION_BEG, REGION_END delimit the region, so it can be
    highlighted.
@@ -6126,7 +6126,8 @@ face_at_buffer_position (struct window *w, ptrdiff_t pos,
   }
 
   /* Optimize common cases where we can use the default face.  */
-  if (noverlays == 0 && NILP (prop))
+  if (noverlays == 0
+      && NILP (prop))
     {
       SAFE_FREE ();
       return default_face->id;