From bbdb45c237d940b5324981c8b4e838f82696f968 Mon Sep 17 00:00:00 2001
From: "Ignacio R. Morelle" <shadowm@wesnoth.org>
Date: Sat, 22 Feb 2014 08:43:21 -0300
Subject: [PATCH] parser: Print location and preprocessor substitution trail
 when skipping BOMs

Example:

> 20140222 08:42:34 error config: Skipping over a utf8 BOM at campaigns/Heir_To_The_Throne/_main.cfg:1
>     included from _main.cfg:24
---
 src/serialization/parser.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/serialization/parser.cpp b/src/serialization/parser.cpp
index 82efed02469..fce9fce7342 100644
--- a/src/serialization/parser.cpp
+++ b/src/serialization/parser.cpp
@@ -124,7 +124,13 @@ void parser::operator()()
 			    static_cast<unsigned char>(tok_->next_token().value[0])    == 0xBB &&
 			    static_cast<unsigned char>(tok_->next_token().value[0])    == 0xBF)
 			{
-				ERR_CF << "Skipping over a utf8 BOM\n";
+				utils::string_map i18n_symbols;
+				std::stringstream ss;
+				ss << tok_->get_start_line() << " " << tok_->get_file();
+				ERR_CF << lineno_string(i18n_symbols,
+										ss.str(),
+										"Skipping over a utf8 BOM at $pos")
+					   << '\n';
 			} else {
 				error(_("Unexpected characters at line start"));
 			}