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=46bdb8ec593ea0cfd1604b7d1253a3af1c571e6d

Merge remote-tracking branch 'origin/maint'

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

Conflicts:
	src/symtab.c
---

diff --git a/gnulib b/gnulib
index cb38ce7d..dcf27bef 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit cb38ce7db84edb421fbaeea5abe16ebeb8ad8a5c
+Subproject commit dcf27bef48c9800d5a2be8349226f73f1b8ff2e5
diff --git a/src/symtab.c b/src/symtab.c
index 916536ae..66e20c05 100644
--- a/src/symtab.c
+++ b/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);
diff --git a/tests/input.at b/tests/input.at
index 188ed166..ac9be79d 100644
--- a/tests/input.at
+++ b/tests/input.at
@@ -805,9 +805,9 @@ start: DECIMAL_1 HEXADECIMAL_2;
 
 AT_BISON_CHECK([redecl.y], [1], [],
 [[redecl.y:10.10-22: error: user token number 11259375 redeclaration for HEXADECIMAL_1
-redecl.y:9.8-16:   previous declaration for DECIMAL_1
+redecl.y:9.8-16:       previous declaration for DECIMAL_1
 redecl.y:12.10-18: error: user token number 16702650 redeclaration for DECIMAL_2
-redecl.y:11.10-22: previous declaration for HEXADECIMAL_2
+redecl.y:11.10-22:     previous declaration for HEXADECIMAL_2
 ]])
 
 AT_DATA_GRAMMAR([too-large.y],