From 3dec5826dae76e89a80ea9a0404467f8200fa783 Mon Sep 17 00:00:00 2001
From: Guillaume Munch <gm@lyx.org>
Date: Thu, 9 Mar 2017 23:35:27 +0100
Subject: [PATCH] buffer-export default

---
 src/Buffer.cpp                | 6 +++---
 src/LyX.cpp                   | 2 +-
 src/LyXAction.cpp             | 2 +-
 src/frontends/qt4/GuiView.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index d01336ee9b..6b41213fad 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2534,7 +2534,7 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 			enable = true;
 			break;
 		}
-		string format = (arg.empty() || arg == "*") ?
+		string format = (arg.empty() || arg == "default") ?
 			params().getDefaultOutputFormat() : to_utf8(arg);
 		size_t pos = format.find(' ');
 		if (pos != string::npos)
@@ -2643,7 +2643,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		break;
 
 	case LFUN_BUFFER_EXPORT: {
-		string const format = (argument.empty() || argument == "*") ?
+		string const format = (argument.empty() || argument == "default") ?
 			params().getDefaultOutputFormat() : argument;
 		ExportStatus const status = doExport(format, false);
 		dr.setError(status != ExportSuccess);
@@ -4231,7 +4231,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	if (pos != string::npos) {
 		dest_filename = target.substr(pos + 1, target.length() - pos - 1);
 		format = target.substr(0, pos);
-		if (format == "*")
+		if (format == "default")
 			format = params().getDefaultOutputFormat();
 		runparams.export_folder = FileName(dest_filename).onlyPath().realPath();
 		FileName(dest_filename).onlyPath().createPath();
diff --git a/src/LyX.cpp b/src/LyX.cpp
index d7f324356c..c88e205919 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -1182,7 +1182,7 @@ int parse_help(string const &, string const &, string &)
 		  "                  Tools->Preferences->File Handling->File Formats->Short Name\n"
 		  "                  to see which parameter (which differs from the format name\n"
 		  "                  in the File->Export menu) should be passed. To export to\n"
-		  "                  the document's default output format, use '*'.\n"
+		  "                  the document's default output format, use 'default'.\n"
 		  "                  Note that the order of -e and -x switches matters.\n"
 		  "\t-E [--export-to] fmt filename\n"
 		  "                  where fmt is the export format of choice (see --export),\n"
diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 1ac74db6ca..673cf3b24c 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -583,7 +583,7 @@ void LyXAction::init()
                         want to start from and for the command that you want to
                         apply to this format. Internally the control is then passed
                         to #LFUN_BUFFER_EXPORT_CUSTOM.\n
-                        If absent or *, then the default output format of the
+                        If absent or "default", then the default output format of the
                         document is used.
 		<DEST>	If present, this argument provides the export destination
 			filename. Its containing folder will also be the destination
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 63bd4c67d9..b4d081062a 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -3548,7 +3548,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 			else
 				target_dir = doc_buffer->fileName().onlyPath();
 
-			string const format = (argument.empty() || argument == "*") ?
+			string const format = (argument.empty() || argument == "default") ?
 				doc_buffer->params().getDefaultOutputFormat() : argument;
 
 			if ((dest.empty() && doc_buffer->isUnnamed())
-- 
2.39.2