]> git.lyx.org Git - lyx.git/blobdiff - src/Text3.cpp
Remove special code for CJK that is no longer required (amends e665715fc4).
[lyx.git] / src / Text3.cpp
index b06b0f7611b073808b728701a3ecd585eac4b102..6db9c2b8d5d7337c044d16b366a6bc0b39dc67b3 100644 (file)
@@ -1255,6 +1255,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                pit_type prev = pit > 0 ? depthHook(pit, par.getDepth()) : pit;
                if (prev < pit && cur.pos() == par.beginOfBody()
                    && !par.size() && !par.isEnvSeparator(cur.pos())
+                   && !par.layout().keepempty
                    && !par.layout().isCommand()
                    && pars_[prev].layout() != par.layout()
                    && pars_[prev].layout().isEnvironment()
@@ -2390,7 +2391,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        // Set the freefont using the contents of \param data dispatched from
        // the frontends and apply it at the current cursor location.
        case LFUN_TEXTSTYLE_UPDATE: {
-               Font font;
+               Font font(ignore_font, ignore_language);
                bool toggle;
                if (font.fromString(to_utf8(cmd.argument()), toggle)) {
                        docstring const props = font.stateText(&bv->buffer().params(), true);
@@ -3233,7 +3234,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        for (DocIterator it = cur.selectionBegin(); ; it.forwardPar()) {
                                pos_type const beg = it.pos();
                                pos_type end;
-                               bool const in_last_par = (it.pit() == cur.selectionEnd().pit());
+                               bool const in_last_par = (it.pit() == cur.selectionEnd().pit() &&
+                                                         it.idx() == cur.selectionEnd().idx());
                                if (in_last_par)
                                        end = cur.selectionEnd().pos();
                                else