From 67946b0cde83a66591934a5e1e1c4e8a58c36b4c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 16 Jun 2018 13:27:24 +0300 Subject: [PATCH] Formatting and doc fixes in recent changes * src/xfaces.c (evaluate_face_filter): Explain the inner braces. (merge_face_ref): Fix whitespace. (syms_of_xfaces) : Doc fix. * src/xdisp.c (extend_face_to_end_of_line): Fix whitespace. --- src/xdisp.c | 5 ++--- src/xfaces.c | 12 +++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index a2b6513e571..dcb002055b4 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -20231,9 +20231,8 @@ extend_face_to_end_of_line (struct it *it) return; /* The default face, possibly remapped. */ - default_face = FACE_FROM_ID_OR_NULL ( - f, - lookup_basic_face (it->w, f, DEFAULT_FACE_ID)); + default_face = + FACE_FROM_ID_OR_NULL (f, lookup_basic_face (it->w, f, DEFAULT_FACE_ID)); /* Face extension extends the background and box of IT->face_id to the end of the line. If the background equals the background diff --git a/src/xfaces.c b/src/xfaces.c index 31aa14b7102..eea06724185 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -2203,6 +2203,8 @@ evaluate_face_filter (Lisp_Object filter, struct window *w, { Lisp_Object orig_filter = filter; + /* Inner braces keep compiler happy about the goto skipping variable + initialization. */ { if (NILP (filter)) return true; @@ -2356,7 +2358,7 @@ merge_face_ref (struct window *w, Lisp_Object first = XCAR (face_ref); if (EQ (first, Qforeground_color) - || EQ (first, Qbackground_color)) + || EQ (first, Qbackground_color)) { /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR . COLOR). COLOR must be a string. */ @@ -6650,10 +6652,10 @@ syms_of_xfaces (void) #endif DEFVAR_BOOL ("face-filters-always-match", face_filters_always_match, - doc: /* Non-nil means that face filters are always -deemed to match. This variable is intended for use only by code that -evaluates the "specifity" of a face specification and should be -let-bound only for this purpose. */); + doc: /* Non-nil means that face filters are always deemed to match. +This variable is intended for use only by code that evaluates +the "specifity" of a face specification and should be let-bound +only for this purpose. */); DEFVAR_LISP ("face-new-frame-defaults", Vface_new_frame_defaults, doc: /* List of global face definitions (for internal use only.) */); -- 2.39.2