anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-06 01:15:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

"delete" fixes from michael

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@5116 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-08-27 11:27:47 +00:00
parent 54b29f09d2
commit 8fb2506ab6
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/insets/ChangeLog
View File

@ -1,3 +1,11 @@
2002-08-07 Juergen Vigna <jug@lyx.org>
* insettabular.C (localDispatch): make delete not put the stuff
in the clipboard only do this on a cut operation.
* insettext.C (localDispatch): make delete and backspace not put
selected stuff to the clipboard.
2002-08-21 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 2002-08-21 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* insetcite.C (latex): fix obvious warning * insetcite.C (latex): fix obvious warning

3
src/insets/insettabular.C
View File

@ -1113,7 +1113,6 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action,
case LFUN_UP_PARAGRAPH: case LFUN_UP_PARAGRAPH:
case LFUN_UP_PARAGRAPHSEL: case LFUN_UP_PARAGRAPHSEL:
case LFUN_BACKSPACE: case LFUN_BACKSPACE:
case LFUN_DELETE:
case LFUN_HOME: case LFUN_HOME:
case LFUN_HOMESEL: case LFUN_HOMESEL:
case LFUN_END: case LFUN_END:
@ -1147,6 +1146,8 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action,
case LFUN_CUT: case LFUN_CUT:
if (!copySelection(bv)) if (!copySelection(bv))
break; break;
// no break here!
case LFUN_DELETE:
setUndo(bv, Undo::DELETE, setUndo(bv, Undo::DELETE,
bv->text->cursor.par(), bv->text->cursor.par(),
bv->text->cursor.par()->next()); bv->text->cursor.par()->next());

6
src/insets/insettext.C
View File

@ -1272,7 +1272,7 @@ InsetText::localDispatch(BufferView * bv,
bv->setState(); bv->setState();
if (lyxrc.auto_region_delete) { if (lyxrc.auto_region_delete) {
if (lt->selection.set()) { if (lt->selection.set()) {
lt->cutSelection(bv, false); lt->cutSelection(bv, false, false);
} }
} }
lt->clearSelection(); lt->clearSelection();
@ -1343,7 +1343,7 @@ InsetText::localDispatch(BufferView * bv,
setUndo(bv, Undo::DELETE, setUndo(bv, Undo::DELETE,
lt->cursor.par(), lt->cursor.par()->next()); lt->cursor.par(), lt->cursor.par()->next());
if (lt->selection.set()) if (lt->selection.set())
lt->cutSelection(bv); lt->cutSelection(bv, true, false);
else else
lt->backspace(bv); lt->backspace(bv);
updwhat = CURSOR_PAR; updwhat = CURSOR_PAR;
@ -1355,7 +1355,7 @@ InsetText::localDispatch(BufferView * bv,
setUndo(bv, Undo::DELETE, setUndo(bv, Undo::DELETE,
lt->cursor.par(), lt->cursor.par()->next()); lt->cursor.par(), lt->cursor.par()->next());
if (lt->selection.set()) { if (lt->selection.set()) {
lt->cutSelection(bv); lt->cutSelection(bv, true, false);
} else { } else {
lt->Delete(bv); lt->Delete(bv);
} }

2
status.12x
View File

@ -42,3 +42,5 @@ What's new
- when loading a font fails, show the name of the said font - when loading a font fails, show the name of the said font
- harmonize the behavior of delete and backspace in main text,
insettext, and tabulars, i.e. don't put stuff into the clipboard