Add commented-out code that might prove useful one day

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 1c9a3505c14646d856f5f06d47dedac80a26e7ee..148b1d4f8bb53ded73420b51af2ecc37e19ebcde 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -58,6 +58,7 @@
 #include "insets/InsetGraphics.h"
 #include "insets/InsetGraphicsParams.h"
 #include "insets/InsetInfo.h"
+#include "insets/InsetIndexMacro.h"
 #include "insets/InsetIPAMacro.h"
 #include "insets/InsetNewline.h"
 #include "insets/InsetQuotes.h"
@@ -749,7 +750,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                if (cur.selection())
                        cutSelection(cur, false);
                else
-                       deleteWordForward(cur, cmd.getArg(0) == "force");
+                       deleteWordForward(cur, cmd.getArg(0) != "confirm");
                finishChange(cur, false);
                break;
 
@@ -757,7 +758,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                if (cur.selection())
                        cutSelection(cur, false);
                else
-                       deleteWordBackward(cur, cmd.getArg(0) == "force");
+                       deleteWordBackward(cur, cmd.getArg(0) != "confirm");
                finishChange(cur, false);
                break;
 
@@ -1224,7 +1225,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        if (cur.pos() == cur.paragraph().size())
                                // Par boundary, force full-screen update
                                singleParUpdate = false;
-                       else if (cmd.getArg(0) != "force" && cur.confirmDeletion()) {
+                       else if (cmd.getArg(0) == "confirm" && cur.confirmDeletion()) {
                                cur.resetAnchor();
                                cur.selection(true);
                                cur.posForward();
@@ -1249,7 +1250,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                // Par boundary, full-screen update
                                if (par_boundary)
                                        singleParUpdate = false;
-                               else if (cmd.getArg(0) != "force" && cur.confirmDeletion(true)) {
+                               else if (cmd.getArg(0) == "confirm" && cur.confirmDeletion(true)) {
                                        cur.resetAnchor();
                                        cur.selection(true);
                                        cur.posBackward();
@@ -2090,6 +2091,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_BRANCH_INSERT:
        case LFUN_PHANTOM_INSERT:
        case LFUN_ERT_INSERT:
+       case LFUN_INDEXMACRO_INSERT:
        case LFUN_LISTING_INSERT:
        case LFUN_MARGINALNOTE_INSERT:
        case LFUN_ARGUMENT_INSERT:
@@ -2509,7 +2511,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                string const lang_arg = cmd.getArg(0);
                bool const reset = (lang_arg.empty() || lang_arg == "reset");
                Language const * lang =
-                       reset ? reset_language
+                       reset ? cur.bv().buffer().params().language
                              : languages.getLanguage(lang_arg);
                // we allow reset_language, which is 0, but only if it
                // was requested via empty or "reset" arg.
@@ -3275,6 +3277,14 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                }
                code = HYPERLINK_CODE;
                break;
+       case LFUN_INDEXMACRO_INSERT: {
+               string const arg = cmd.getArg(0);
+               if (arg == "sortkey")
+                       code = INDEXMACRO_SORTKEY_CODE;
+               else
+                       code = INDEXMACRO_CODE;
+               break;
+       }
        case LFUN_IPAMACRO_INSERT: {
                string const arg = cmd.getArg(0);
                if (arg == "deco")