mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4562_mcedit_macros_paste' 

* 4562_mcedit_macros_paste:
  Ticket #4562: mcedit: don't apply macros to the pasted text.
This commit is contained in:
Andrew Borodin 2024-07-22 21:37:12 +03:00
parent 9f4e88fd70 e9258fcc6c
commit 45c28d9d11
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/editor/editwidget.c
View File

@ -6,7 +6,7 @@
Written by: Written by:
Paul Sheer, 1996, 1997 Paul Sheer, 1996, 1997
Andrew Borodin <aborodin@vmail.ru> 2012-2022 Andrew Borodin <aborodin@vmail.ru> 2012-2024
This file is part of the Midnight Commander. This file is part of the Midnight Commander.
@ -42,7 +42,7 @@
#include "lib/global.h" #include "lib/global.h"
#include "lib/tty/tty.h" /* LINES, COLS */ #include "lib/tty/tty.h" /* LINES, COLS */
#include "lib/tty/key.h" /* is_idle() */ #include "lib/tty/key.h" /* is_idle(), bracketed_pasting_in_progress */
#include "lib/tty/color.h" /* tty_setcolor() */ #include "lib/tty/color.h" /* tty_setcolor() */
#include "lib/skin.h" #include "lib/skin.h"
#include "lib/fileloc.h" /* EDIT_HOME_DIR */ #include "lib/fileloc.h" /* EDIT_HOME_DIR */
@ -959,7 +959,7 @@ edit_callback (Widget *w, Widget *sender, widget_msg_t msg, int parm, void *data
cb_ret_t ret = MSG_NOT_HANDLED; cb_ret_t ret = MSG_NOT_HANDLED;
/* The user may override the access-keys for the menu bar. */ /* The user may override the access-keys for the menu bar. */
if (macro_index == -1 && edit_execute_macro (e, parm)) if (macro_index == -1 && !bracketed_pasting_in_progress && edit_execute_macro (e, parm))
{ {
edit_update_screen (e); edit_update_screen (e);
ret = MSG_HANDLED; ret = MSG_HANDLED;