Merge remote-tracking branch 'origin/maint'

* origin/maint:
  gnulib: update
  errors: indent "user token number redeclaration" context

Conflicts:
	src/symtab.c

diff --cc src/symtab.c
index 916536a,56cfe51..66e20c0
--- 1/src/symtab.c
--- 2/src/symtab.c
+++ b/src/symtab.c
@@@ -566,10 -531,11 +566,11 @@@ user_token_number_redeclaration (int nu
        first = second;
        second = tmp;
      }
 -  complain_at_indent (second->location, &i,
 +  complain_at_indent (second->location, complaint, &i,
                        _("user token number %d redeclaration for %s"),
                        num, second->tag);
 -  complain_at_indent (first->location, &i,
+   i += SUB_INDENT;
 +  complain_at_indent (first->location, complaint, &i,
                        _("previous declaration for %s"),
                        first->tag);
  }

diff --cc tests/input.at
Simple merge