fix the <...> delimiters

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 4db472332b0b0b9d956724635be985963bf67a4d..13ec8c88e7fe3a5d293309d9373cf5a13a4fbe31 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -34,7 +34,7 @@
 #include "trans_mgr.h"
 #include "layout.h"
 #include "bufferview_funcs.h"
-#include "minibuffer.h"
+#include "frontends/MiniBuffer.h"
 #include "vspace.h"
 #include "frontends/LyXView.h"
 #include "FloatList.h"
@@ -521,6 +521,12 @@ FuncStatus LyXFunc::getStatus(kb_action action,
                                flag.setOnOff(type == LM_OT_EQNARRAY);
                        } else if (argument == "align") {
                                flag.setOnOff(type == LM_OT_ALIGN);
+                       } else if (argument == "alignat") {
+                               flag.setOnOff(type == LM_OT_ALIGNAT);
+                       } else if (argument == "xalignat") {
+                               flag.setOnOff(type == LM_OT_XALIGNAT);
+                       } else if (argument == "xxalignat") {
+                               flag.setOnOff(type == LM_OT_XXALIGNAT);
                        } else if (argument == "none") {
                                flag.setOnOff(type == LM_OT_NONE);
                        } else {
@@ -1047,8 +1053,7 @@ string const LyXFunc::dispatch(kb_action action, string argument)
                transform(lyxaction.func_begin(), lyxaction.func_end(),
                          back_inserter(allCmds), lyx::firster());
                static vector<string> hist;
-               owner->getMiniBuffer()->getString(MiniBuffer::spaces,
-                                                 allCmds, hist);
+               owner->getMiniBuffer()->prepareForInput(allCmds, hist);
        }
        break;
 
@@ -1900,7 +1905,7 @@ void LyXFunc::doImport(string const & argument)
 
        lyxerr[Debug::INFO] << "LyXFunc::doImport: " << format
                            << " file: " << filename << endl;
- 
+
        // need user interaction
        if (filename.empty()) {
                string initpath = lyxrc.document_path;
@@ -1968,7 +1973,7 @@ void LyXFunc::doImport(string const & argument)
                        }
        }
 
-       // if the file exists already, and we didn't do 
+       // if the file exists already, and we didn't do
        // -i lyx thefile.lyx, warn
        if (FileInfo(lyxfile, true).exist() && filename != lyxfile) {
                if (!Alert::askQuestion(_("A document by the name"),