Merge remote-tracking branch 'origin/maint'

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

Conflicts:
	src/symtab.c

src/symtab.c

@@ -569,6 +569,7 @@ user_token_number_redeclaration (int num, symbol *first, symbol *second)
   complain_at_indent (second->location, complaint, &i,
                       _("user token number %d redeclaration for %s"),
                       num, second->tag);
+  i += SUB_INDENT;
   complain_at_indent (first->location, complaint, &i,
                       _("previous declaration for %s"),
                       first->tag);