mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Consider deleted text when inserting quote inset.
This bug was reported against the ubuntu build: https://bugs.launchpad.net/bugs/1100046 Additionally, some extra code for avoiding double undo entries has been removed, since this is handled by grouped undo now.
This commit is contained in:
parent
421053c60c
commit
0bcef7f874
@ -909,15 +909,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
|
||||
case LFUN_NEWLINE_INSERT: {
|
||||
InsetNewlineParams inp;
|
||||
docstring arg = cmd.argument();
|
||||
// this avoids a double undo
|
||||
// FIXME: should not be needed, ideally
|
||||
if (!cur.selection())
|
||||
cur.recordUndo();
|
||||
cap::replaceSelection(cur);
|
||||
if (arg == "linebreak")
|
||||
inp.kind = InsetNewlineParams::LINEBREAK;
|
||||
else
|
||||
inp.kind = InsetNewlineParams::NEWLINE;
|
||||
cap::replaceSelection(cur);
|
||||
cur.recordUndo();
|
||||
cur.insert(new InsetNewline(inp));
|
||||
cur.posForward();
|
||||
moveCursor(cur, false);
|
||||
@ -1356,14 +1353,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
|
||||
}
|
||||
|
||||
case LFUN_QUOTE_INSERT: {
|
||||
// this avoids a double undo
|
||||
// FIXME: should not be needed, ideally
|
||||
if (!cur.selection())
|
||||
cur.recordUndo();
|
||||
cap::replaceSelection(cur);
|
||||
cur.recordUndo();
|
||||
|
||||
Paragraph const & par = cur.paragraph();
|
||||
pos_type pos = cur.pos();
|
||||
// Ignore deleted text before cursor
|
||||
while (pos > 0 && par.isDeleted(pos - 1))
|
||||
--pos;
|
||||
|
||||
BufferParams const & bufparams = bv->buffer().params();
|
||||
bool const hebrew =
|
||||
|
@ -115,6 +115,8 @@ What's new
|
||||
|
||||
- Allow arguments in PassThru environments (bug 7646).
|
||||
|
||||
- Consider deleted text when inserting quote inset.
|
||||
|
||||
- Fix a few selection bugs in tabular (bugs 4981, 7988).
|
||||
|
||||
- Show the output of configure.py while the LaTeX packages are being checked
|
||||
|
Loading…
Reference in New Issue
Block a user