Macro in mcedit deletes text because return value of edit_block_delete_cmd is misinterpreted

[Sprite_tm]

This issue is in 4.8.31 as well as Git master. I'm having issues that macros defined in .local/share/mc/mcedit/macros.d and used as text editing macros using ExecuteScript? in the editor section of mc.macros simply delete any text selected rather than replace the selected text with the output of the macro script.

Seems like commit f29c5a35f7938ab1e7e83a9c9faadc5129e6bb08 reworked the return value of edit_block_delete_cmd from an int with 1 if cancelled by user and 0 otherwise, to a gboolean which is false when cancelled by user and true otherwise. (Note the inverting of logic values in this change.)

Unfortunaty, something in that commit went wrong on ​https://github.com/MidnightCommander/mc/blob/master/src/editor/edit.c#L1824-L1832 : it looks like this code assumes old 1 is new true and vice versa; this breaks things.

Changing it to 'gboolean rc = TRUE;' and 'if (rc)' fixed this issue for me.

[Sprite_tm]

Whoops, that links the wrong commit and I don't think I can edit it. Proper one is e2e34d82abbc4d674fb965ba087c1a5a6105ea51

[zaytsev]

Thank you for the report! I think that the declaration is correct, but the check should indeed be inverted as if (rc) :-( yay, tests...

[Sprite_tm]

Looking at the code, I think I agree, looks like edit_insert_file should not be called at all when there's no mark set. Guess that's a bug in the original code then (it had 'int rc=0' which would translate to a rc=TRUE in the new code.)

[andrew_b]

Branch: 4540_mcedit_macro_deletes_text
changeset:fdacad8bbb64dc1d6d189dd232008307b77b3642

[zaytsev]

As I said, I think the default should stay FALSE, that is "it has been canceled by the user" - maybe this is what caused the original confusion. Are you sure that the default has to be changed, maybe I don't understand something about the code? I guess it's not very important though, because the value should in theory be always overwritten if the code is correct, but still...

[andrew_b]

Replying to zaytsev:

As I said, I think the default should stay FALSE, that is "it has been canceled by the user"

If user canceled his action (closed the user menu), this block of code isn't executed.
If the default value is FALSE and there is no marked block, the text isn't inserted.

How to reproduce:

• gboolean rc = FALSE;
• compile
• run mc -e to open an empty file
• press Shift-F1, select some menu entry (for example, 2 while ()), press Enter.
• result: nothing done
• expected result: inserted the following code:

  while() {
  }
  

[zaytsev]

Oh man, of course, you are right. We do not always have a marked block :( Thank you and sorry.

[andrew_b]

Merged to master: [57cf824a51d98192215f86f4caae3d848da57100].