From: Richard Heck <rgheck@lyx.org>
Date: Sat, 24 Feb 2018 06:06:36 +0000 (-0500)
Subject: Fix bug #10918.
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~3777
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ab6b4679e69b50ad84b0d801b8221037c3f741b0;hp=77a7df10037c64040c5910d7e997af3026bd5c39;p=features.git

Fix bug #10918.
---

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 9e42857a7d..f0f82622f7 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -430,7 +430,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 		return ReadError;
 
 	// format prior to 2.0 and introduction of format tag
-	unsigned int format = 0;
+	unsigned int rc_format = 0;
 
 	while (lexrc.isOK()) {
 		// By using two switches we take advantage of the compiler
@@ -453,7 +453,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 		switch (static_cast<LyXRCTags>(le)) {
 		case RC_LYXRCFORMAT:
 			if (lexrc.next())
-				format = lexrc.getInteger();
+				rc_format = lexrc.getInteger();
 			break;
 		case RC_INPUT: // Include file
 			if (lexrc.next()) {
@@ -1232,7 +1232,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 
 		// This is triggered the first time through the loop unless
 		// we hit a format tag.
-		if (check_format && format != LYXRC_FILEFORMAT)
+		if (check_format && rc_format != LYXRC_FILEFORMAT)
 			return FormatMismatch;
 	}