Le 21/01/2013 15:16, Jean-Marc Lasgouttes a écrit :
Le 21/01/13 14:54, Jean-Marc Lasgouttes a écrit :
The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit db025be5ae48a946a433e8f863477cc51a341d5d
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Mon Jan 21 14:49:45 2013 +0100
Consider deleted text when inserting quote inset.
This is candidate for branch.
Richard, for branch?
JMarc
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.
diff --git a/src/Text3.cpp b/src/Text3.cpp
index bfb392c..2893e08 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -940,15 +940,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);
@@ -1447,14 +1444,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 =
-----------------------------------------------------------------------
Summary of changes:
src/Text3.cpp | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
hooks/post-receive
