[PATCH 11/25] syntax-check: fix violations and re-enable sc_prohibit_doubled_word.

[Gary V. Vaughan]

* cfg.mk (local-checks-to-fix): Remove sc_prohibit_doubled_word
from list of disabled checks.
* libltdl/config/general.m4sh (func_quote_for_eval): Remove one
of a pair of "and"s in a comment.
* tests/lt_dladvise.at (hint_global): Remove one of a pair of
consecutive "to"s split across lines in a comment.

Signed-off-by: Gary V. Vaughan <address@hidden>
---
 build-aux/general.m4sh |    4 ++--
 cfg.mk                 |    1 -
 tests/lt_dladvise.at   |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build-aux/general.m4sh b/build-aux/general.m4sh
index b6e3d41..34940f7 100644
--- a/build-aux/general.m4sh
+++ b/build-aux/general.m4sh
@@ -513,8 +513,8 @@ func_quote_for_eval ()
 
     case $func_quote_for_eval_unquoted_result in
       # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
+      # word splitting, command substitution and variable expansion
+      # for a subsequent eval.
       # Many Bourne shells cannot handle close brackets correctly
       # in scan sets, so we specify it separately.
       *[\@<:@\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*@:>@*|"")
diff --git a/cfg.mk b/cfg.mk
index 8713cd7..8f14402 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -40,7 +40,6 @@ VC_LIST_ALWAYS_EXCLUDE_REGEX = ^mail/
 local-checks-to-fix =                          \
        sc_prohibit_always-defined_macros       \
        sc_prohibit_always_true_header_tests    \
-       sc_prohibit_doubled_word                \
        sc_prohibit_empty_lines_at_EOF          \
        sc_prohibit_have_config_h               \
        sc_prohibit_magic_number_exit           \
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index 18c2104..5ae9fbd 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -174,7 +174,7 @@ hint_global (void)
 
       /* Don't attempt to load moddepend unless modglobal was successfully
          loaded and the symglobal hint was taken, and the system allows to
-        to have undefined symbols.  */
+        have undefined symbols.  */
       if (info && info->is_symglobal && HAVE_UNDEFINED_SYMBOLS)
         {
           hint_ext ();
-- 
1.7.7.3

Cheers,
-- 
Gary V. Vaughan (gary AT gnu DOT org)