From 7e121117bb320368a9164d3a39432a4b54789538 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 13 Aug 2017 11:53:41 +0200
Subject: [PATCH] Vietnamese no longer requires any special handling.

It is a normal babel support package.
---
 lib/chkconfig.ltx    | 1 -
 lib/languages        | 1 -
 src/BufferParams.cpp | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index bccd179f7d..8161d9ce73 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -379,7 +379,6 @@
 \TestPackage{url}
 \TestPackage{varioref}
 \TestPackage{varwidth}
-\TestPackage[vietnamese.ldf]{vietnamese}
 \TestPackage{wallpaper}
 \TestPackage{wrapfig}
 \TestPackage{xargs}
diff --git a/lib/languages b/lib/languages
index 28281303bf..282d902c78 100644
--- a/lib/languages
+++ b/lib/languages
@@ -1198,7 +1198,6 @@ Language vietnamese
 	QuoteStyle       english
 	Encoding         utf8
 	LangCode         vi_VN
-	Requires         vietnamese
 End
 
 Language welsh
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index c16c308c21..a92c4c5961 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2050,13 +2050,12 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 	// http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg144349.html
 	os << from_ascii(features.getColorOptions());
 
-	// If we use hyperref, jurabib, japanese, varioref or vietnamese,
+	// If we use hyperref, jurabib, japanese or varioref,
 	// we have to call babel before
 	if (use_babel
 	    && (features.isRequired("jurabib")
 		|| features.isRequired("hyperref")
 		|| features.isRequired("varioref")
-		|| features.isRequired("vietnamese")
 		|| features.isRequired("japanese"))) {
 			os << features.getBabelPresettings();
 			// FIXME UNICODE