mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2155_remove_selection_before_insert'

Browse Source 
* 2155_remove_selection_before_insert:
  Ticket #2155 (remove selected text before input)
This commit is contained in:
Ilia Maslakov 2010-04-28 19:21:18 +00:00
commit 237b2245be
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/editor/edit.c
View File

@ -2944,6 +2944,12 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
/* An ordinary key press */
if (char_for_insertion >= 0)
{
/* if non persistent selection and text selected */
if (!option_persistent_selections)
{
if (edit->mark1 != edit->mark2)
edit_block_delete_cmd (edit);
}
if (edit->overwrite)
{
/* remove char only one time, after input first byte, multibyte chars */
@ -3410,6 +3416,12 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
edit_cut_to_X_buf_cmd (edit);
break;
case CK_XPaste:
/* if non persistent selection and text selected */
if (!option_persistent_selections)
{
if (edit->mark1 != edit->mark2)
edit_block_delete_cmd (edit);
}
if (option_cursor_beyond_eol && edit->over_col > 0)
edit_insert_over (edit);
edit_paste_from_X_buf_cmd (edit);