>>>>> "Andre" == Andre Poenitz <[EMAIL PROTECTED]> writes:

Andre> On Fri, Oct 25, 2002 at 02:47:35PM +0200, Jean-Marc Lasgouttes
Andre> wrote:
>> This problem should be fixed now.

Andre> It is still crashing. Insert an ExternalInset in a new doc,
Andre> change type to Xfig, do not enter a name. Save, reload. Press
Andre> Shift-End to mark "everything", Press <Del>. Boom.

OK, so the ReplaceEnvironmentPath thingie should be moved as last in
the function. However, it strikes me that the command is called through
system() and thus the environment variables will be interpreted
correctly there (yes, I did check the fact). Therefore I propose the
following patch.

Lars?

JMarc

Index: src/insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.532
diff -u -p -r1.532 ChangeLog
--- src/insets/ChangeLog	25 Oct 2002 12:46:01 -0000	1.532
+++ src/insets/ChangeLog	25 Oct 2002 13:34:17 -0000
@@ -1,3 +1,8 @@
+2002-10-25  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
+
+	* insetexternal.C (doSubstitution): do not try to replace
+	environment variables, this is done when executing the command
+
 2002-10-24  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
 
 	* insetexternal.C (doSubstitution): change order of substitution
Index: src/insets/insetexternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetexternal.C,v
retrieving revision 1.51
diff -u -p -r1.51 insetexternal.C
--- src/insets/insetexternal.C	25 Oct 2002 12:46:01 -0000	1.51
+++ src/insets/insetexternal.C	25 Oct 2002 13:34:17 -0000
@@ -245,7 +245,6 @@ string const InsetExternal::doSubstituti
 	result = subst(result, "$$FPath", filepath);
 	result = subst(result, "$$Tempname", tempname_);
 	result = subst(result, "$$Sysdir", system_lyxdir);
-	result = ReplaceEnvironmentPath(result);
 
 	// Handle the $$Contents(filename) syntax
 	if (contains(result, "$$Contents(\"")) {

Reply via email to