fix error message (bug 1963)

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

diff --git a/src/ChangeLog b/src/ChangeLog
index d8fa7f67628b3632b22557260b13a1d1d9dfbea5..b17f349d5069435efb1c9a0ec3adcf0f93aebf58 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-02  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * lyxfunc.C (dispatch): use InsetIncludeMailer for the include
+       inset. (bug 1963)
+
 2005-08-02  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * BufferView_pimpl.C (updateScrollbar): scrollbar fixes

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 4d77c36db5c2c91514300c3778870cf1c827271f..96de62db50872b413a12f2c29f625229305c5616 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-02  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * insetinclude.C (string2params): fix typo in error message (bug 1963).
+
 2005-07-28  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * insettabular.C (getStatus): disable line and paragraph breaks

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 74f7b4f28406dd35322632949be7aed6081ee7a8..5afd3f382273c667b96711b17879f2b54c472540 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -761,7 +761,7 @@ void InsetIncludeMailer::string2params(string const & in,
        string id;
        lex >> id;
        if (!lex || id != "Include")
-               return print_mailer_error("InsetBoxMailer", in, 2, "Include");
+               return print_mailer_error("InsetIncludeMailer", in, 2, "Include");
 
        InsetInclude inset(params);
        inset.read(lex);

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index a679f52b4bb2ebd19bd10c2a03ca3f65b46f3ad4..ff4133515488eec3bd9815817670cf758baf0fe1 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -64,6 +64,7 @@
 #include "insets/insetexternal.h"
 #include "insets/insetfloat.h"
 #include "insets/insetgraphics.h"
+#include "insets/insetinclude.h"
 #include "insets/insetnote.h"
 #include "insets/insettabular.h"
 #include "insets/insetvspace.h"
@@ -1138,7 +1139,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        string data = trim(cmd.argument.substr(name.size()));
                        if (name == "bibitem" ||
                            name == "bibtex" ||
-                           name == "include" ||
                            name == "index" ||
                            name == "label" ||
                            name == "ref" ||
@@ -1146,6 +1146,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                            name == "url") {
                                InsetCommandParams p(name);
                                data = InsetCommandMailer::params2string(name, p);
+                       } else if (name == "include") {
+                               InsetCommandParams p(data);
+                               data = InsetIncludeMailer::params2string(p);
                        } else if (name == "box") {
                                // \c data == "Boxed" || "Frameless" etc
                                InsetBoxParams p(data);