[PATCH 1/2] maint: exclude diff files from long lines check

[Pádraig Brady]

* cfg.mk: Add .diff files to the exclusion expression
for sc_long_lines, since the gnulib code might be >0= 80 chars.
Note 80 char lines trigger due to the added +/- diff marks.
Also normalize the $$ used in the other sc_long_lines exclusion
expressions.
---
 cfg.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 770527a..0995cda 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -680,7 +680,6 @@ exclude_file_name_regexp--sc_prohibit_atoi_atof = 
^lib/euidaccess-stat\.c$$
 # longlong.h is maintained elsewhere.
 _ll = ^src/longlong\.h$$
 exclude_file_name_regexp--sc_useless_cpp_parens = $(_ll)
-exclude_file_name_regexp--sc_long_lines = $(_ll)
 exclude_file_name_regexp--sc_space_before_open_paren = $(_ll)
 
 tbi_1 = ^tests/pr/|(^gl/lib/reg.*\.c\.diff|\.mk|^man/help2man)$$
@@ -710,9 +709,10 @@ exclude_file_name_regexp--sc_prohibit_atoi_atof = 
^src/make-prime-list\.c$$
 # Exception here as we don't want __attribute elided on non GCC
 exclude_file_name_regexp--sc_prohibit-gl-attributes = ^src/libstdbuf\.c$$
 
-exclude_file_name_regexp--sc_prohibit_uppercase_id_est = \.diff$
+exclude_file_name_regexp--sc_prohibit_uppercase_id_est = \.diff$$
 exclude_file_name_regexp--sc_ensure_dblspace_after_dot_before_id_est = \.diff$$
-exclude_file_name_regexp--sc_ensure_comma_after_id_est = \.diff$
+exclude_file_name_regexp--sc_ensure_comma_after_id_est = \.diff$$
+exclude_file_name_regexp--sc_long_lines = \.diff$$|$(_ll)
 
 # Augment AM_CFLAGS to include our per-directory options:
 AM_CFLAGS += $($(@D)_CFLAGS)
-- 
2.1.0