info-insert without arg is valid

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 7d1142c13929f9f7b70f2c70183d7340decea7bb..de795838aa21eba71dfe04a98030cf51d0248bd3 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1663,8 +1663,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        DocIterator scur = cur;
                        depth_type const max_depth = cur.paragraph().params().depth() + 1;
                        cur.forwardPar();
-                       while (cur.paragraph().params().depth() < min(nextpar_depth, max_depth))
+                       while (cur.paragraph().params().depth() < min(nextpar_depth, max_depth)) {
+                               depth_type const olddepth = cur.paragraph().params().depth();
                                lyx::dispatch(FuncRequest(LFUN_DEPTH_INCREMENT));
+                               if (olddepth == cur.paragraph().params().depth())
+                                       // leave loop if no incrementation happens
+                                       break;
+                       }
                        cur.setCursor(scur);
                }
 
@@ -1750,14 +1755,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_DATE_INSERT: {
-               string const format = cmd.argument().empty()
-                       ? lyxrc.date_insert_format : to_utf8(cmd.argument());
-               string const time = formatted_time(current_time(), format);
-               lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, time));
-               break;
-       }
-
        case LFUN_MOUSE_TRIPLE:
                if (cmd.button() == mouse_button::button1) {
                        tm->cursorHome(cur);
@@ -2950,7 +2947,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                break;
        case LFUN_INFO_INSERT:
                code = INFO_CODE;
-               enable = infoparams.validateArgument(cur.buffer(), cmd.argument(), true);
+               enable = cmd.argument().empty()
+                       || infoparams.validateArgument(cur.buffer(), cmd.argument(), true);
                break;
        case LFUN_ARGUMENT_INSERT: {
                code = ARG_CODE;
@@ -3271,13 +3269,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                enable = !inDescriptionItem(cur);
                break;
 
-       case LFUN_DATE_INSERT: {
-               string const format = cmd.argument().empty()
-                       ? lyxrc.date_insert_format : to_utf8(cmd.argument());
-               enable = support::os::is_valid_strftime(format);
-               break;
-       }
-
        case LFUN_LANGUAGE:
                enable = !cur.paragraph().isPassThru();
                flag.setOnOff(cmd.getArg(0) == cur.real_current_font.language()->lang());