-
Notifications
You must be signed in to change notification settings - Fork 524
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '4562_mcedit_macros_paste'
* 4562_mcedit_macros_paste: Ticket #4562: mcedit: don't apply macros to the pasted text.
- Loading branch information
Showing
1 changed file
with
3 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
Written by: | ||
Paul Sheer, 1996, 1997 | ||
Andrew Borodin <[email protected]> 2012-2022 | ||
Andrew Borodin <[email protected]> 2012-2024 | ||
This file is part of the Midnight Commander. | ||
|
@@ -42,7 +42,7 @@ | |
#include "lib/global.h" | ||
|
||
#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/skin.h" | ||
#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; | ||
|
||
/* 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); | ||
ret = MSG_HANDLED; | ||
|