From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 8 Oct 2002 09:24:01 +0000 (+0000)
Subject: fix behaviour when a viewer has not been found
X-Git-Tag: 1.6.10~18210
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=997b73a21ab51f92d36b76383f41012d518f4085;p=features.git

fix behaviour when a viewer has not been found


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5367 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/ChangeLog b/src/ChangeLog
index de10e188f1..f4582bfebc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2002-10-07  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+	* lyxrc.C (read): treat a viewer or converter command of "none" as
+	if it were empty.
+
+	* MenuBackend.C (expandFormats): for an update, also allow the
+	formats that are not viewable
+
 	* lyx_main.C (queryUserLyXDir): re-run automatically the configure
 	script if it is newer than the lyxrc.defaults in user directory
 
diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 2af19defcb..2148e9bd4b 100644
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -352,7 +352,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
 		action = LFUN_PREVIEW;
 		break;
 	case MenuItem::UpdateFormats:
-		formats = Exporter::GetExportableFormats(buf, true);
+		formats = Exporter::GetExportableFormats(buf, false);
 		action = LFUN_UPDATE;
 		break;
 	default:
diff --git a/src/lyxrc.C b/src/lyxrc.C
index e7d25273a6..cc25842280 100644
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -977,7 +977,8 @@ int LyXRC::read(string const & filename)
 			if (lexrc.next()) {
 				flags = lexrc.getString();
 			}
-			if (command.empty() || command == "none") {
+			if (command.empty()
+			    || token(command, ' ', 0) == "none") {
 				converters.erase(from, to);
 			} else {
 				converters.add(from, to, command, flags);
@@ -991,6 +992,8 @@ int LyXRC::read(string const & filename)
 			}
 			if (lexrc.next()) {
 				command = lexrc.getString();
+				if (token(command, ' ', 0) == "none")
+					command.erase();
 			}
 			formats.setViewer(format, command);
 			break;