From: Akim Demaille <akim@lrde.epita.fr>
Date: Fri, 28 Sep 2012 13:28:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/maint'
X-Git-Tag: v2.7.90~319
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/595284e9d0277517bac8f3fc7bcdd529d97aa6f9?hp=--cc

Merge remote-tracking branch 'origin/maint'

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

Conflicts:
	src/symtab.c
---

595284e9d0277517bac8f3fc7bcdd529d97aa6f9
diff --cc src/symtab.c
index 916536ae,56cfe511..66e20c05
--- a/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);
+   i += SUB_INDENT;
 -  complain_at_indent (first->location, &i,
 +  complain_at_indent (first->location, complaint, &i,
                        _("previous declaration for %s"),
                        first->tag);
  }