Commit Graph

12932 Commits

Author SHA1 Message Date
Andrew Borodin 2c7dfe7341 (mc_search_prepare_replace_str2): make replace_str const.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:12:08 +03:00
Andrew Borodin 589d0bea0b (mc_search__regex_str_append_if_special): refactoring of loop and conditions.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:12:08 +03:00
Andrew Borodin 8ce85a419b Ticket #3265: code cleanup before 4.8.14 release.
(mc_search_regex__process_append_str): fix condition.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:12:07 +03:00
Slava Zanko 3ce901021d Merge branch '358_ftp_to_ftp'
* 358_ftp_to_ftp:
  Ticket #358: MC freezes when copying from one FTP location to another
2015-02-25 15:25:35 +03:00
Boris Savelev f45784eabb Ticket #358: MC freezes when copying from one FTP location to another
The copy operation will still be impossible, but you'll get error message instead of hang.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2015-02-25 15:04:17 +03:00
Slava Zanko 57d9455e26 Merge branch '3235_copy_with_special_symbols'
* 3235_copy_with_special_symbols:
  Add '?' sign as a possible mark of wildcard.
  Fix for issue:
  Ticket #3235: copy files dosn't work as expected, when copying to a directory with the special symbol in its name
2015-02-25 13:26:05 +03:00
Slava Zanko 4d2cefa81e Add '?' sign as a possible mark of wildcard.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2015-02-25 13:25:46 +03:00
Boris Savelev ec0dd74248 Fix for issue:
When copying to directory with a name containing special symbol "*" the copy command didn't do it in a right way.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2015-02-25 13:25:46 +03:00
Slava Zanko dbbd8a7cdc Ticket #3235: copy files dosn't work as expected, when copying to a directory with the special symbol in its name
Add new test which covers current functionality of 'is_wildcarded' function.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2015-02-25 13:25:46 +03:00
Slava Zanko 482e96e720 Merge branch '2743_search_unicode'
* 2743_search_unicode:
  Ticket #2743: File selection by patterns uses bytes instead of (unicode) characters.
2015-02-25 13:00:16 +03:00
Boris Savelev 933fd255d0 Ticket #2743: File selection by patterns uses bytes instead of (unicode) characters.
Using the "?" pattern in the file selection dialog brought up with '+',
mc uses the file name length in bytes instead of characters.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2015-02-25 12:59:57 +03:00
Slava Zanko e5ec837b98 Merge branch '2309_shell_patterns'
* 2309_shell_patterns:
  The patch does not intend to fix all Bash patterns (I believe mc never claimed to support all kinds of them), but it fixes some issues. Namely, backslash-escaped metacharacter like {}*? will remain in the pattern (with the current code it is just stripped). Second, comma will be transformed to | only inside a group.
  Ticket #2309: "Shell patterns" broken beyond repair.
2015-02-24 14:59:09 +03:00
Boris Savelev 6ca737d230 The patch does not intend to fix all Bash patterns (I believe mc never claimed to support all kinds of them), but it fixes some issues.
Namely, backslash-escaped metacharacter like {}*? will remain in the pattern (with the current code it is just stripped). Second, comma will be transformed to | only inside a group.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2015-02-24 14:58:51 +03:00
Slava Zanko 0eca32a852 Ticket #2309: "Shell patterns" broken beyond repair.
Fix tests execution. Add new test which covers current functionality of glob2regexp.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2015-02-23 16:31:37 +03:00
Andrew Borodin f4faf601b3 Merge branch '3162_directory_scanning_narrow'
* 3162_directory_scanning_narrow:
  Ticket #3162: "Directory scanning" window is too narrow.
2015-02-20 09:18:52 +03:00
Andrew Borodin 3d61dcd782 Ticket #3162: "Directory scanning" window is too narrow.
(dirsize_status_update_cb): redraw "Directory scanning" window after
enlargement.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-20 09:17:45 +03:00
Andrew Borodin 463833ac8d Merge branch '3390_input_backward_word'
* 3390_input_backward_word:
  Ticket #3390: fix backward word delete in input fields.
2015-02-20 09:14:06 +03:00
Andrew Borodin 96699b7eba Ticket #3390: fix backward word delete in input fields.
How to reproduce:
Either on the command line, or in any other text entry field (e.g. copy
file to) enter a string where the last word consists of one single
letter only. E.g. "abc de f".
Press Alt+Backspace.

Expected behavior: Remove the last word, that is, the letter "f" only,
leaving "abc de ".

Actual behavior: Yet another word is removed, leaving "abc ".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-20 09:13:08 +03:00
Andrew Borodin b3b4b4df1d Merge branch '3389_spacing_mark'
* 3389_spacing_mark:
  Ticket #3389: mcviewer: clarify usage of G_UNICODE_SPACING_MARK.
2015-02-20 09:08:07 +03:00
Andrew Borodin 34a25459d2 Ticket #3389: mcviewer: clarify usage of G_UNICODE_SPACING_MARK.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-20 09:06:55 +03:00
Andrew Borodin 1c7c344ca4 Merge branch '3263_hexview_highlight_found'
* 3263_hexview_highlight_found:
  Ticket #3263: mcview hex: fix incorrect highlight when search string not found.
2015-02-18 13:42:33 +03:00
Andreas Mohr 15cf75d63e Ticket #3263: mcview hex: fix incorrect highlight when search string not found.
Restore previous string selection if search failed.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-18 13:40:40 +03:00
Andrew Borodin ef551ceaf2 Update Russian translation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-18 11:40:48 +03:00
Andrew Borodin d8e7d98aac Merge branch '3404_old_colors_sort'
* 3404_old_colors_sort:
  Ticket #3404: fix order of old_colors table items.
2015-02-18 09:40:35 +03:00
Andreas Mohr 29d4afc657 Ticket #3404: fix order of old_colors table items.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-18 09:40:18 +03:00
Andrew Borodin e7e3aed174 Merge branch '3065_italic'
* 3065_italic:
  Update po/*.po files.
  Ticket #3065: support of italic text.
2015-02-17 15:27:52 +03:00
Andrew Borodin 2d58c40444 Update po/*.po files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-17 15:25:57 +03:00
Egmont Koblinger 89d2db5ca3 Ticket #3065: support of italic text.
Italic text is supported by S-Lang since pre2.3.0-107 and NCurses since 5.9.20130831.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-17 15:22:53 +03:00
Andrew Borodin 45d135d768 Merge branch '3261_hexedit_cjk_overflow'
* 3261_hexedit_cjk_overflow:
  Ticket #3261: mcview hex edit: CJK overflow.
2015-02-17 14:33:14 +03:00
Egmont Koblinger 10c938451d Ticket #3261: mcview hex edit: CJK overflow.
At certain terminal widths (including the default 80), if the last byte
of a line begins a CJK character then the corresponding glyps is drawn
in the last column, so it's replaced by a replacement symbol.

The default layout should, at all possible terminal widths, have an
extra last character column that is empty normally, but allows room for
a CJK to overflow here.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-17 14:30:37 +03:00
Andrew Borodin bdb3d06f94 Merge branch '3260_hexedit_utf8_input'
* 3260_hexedit_utf8_input:
  Ticket #3260: mcview hex edit: can't enter certain UTF-8 characters.
2015-02-17 13:59:17 +03:00
Egmont Koblinger f0ab29b820 Ticket #3260: mcview hex edit: can't enter certain UTF-8 characters.
(mcview_handle_editkey): an is_printable() check was performed for every
byte of the UTF-8 which obviously doesn't make sense. This check
shouldn't be performed for 8-bit charsets either. If the given byte can
arrive as input, the file should be modified accordingly.
The TAB key shouldn't be accepted as literal, to allow moving back to
the hexview area.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-17 13:57:26 +03:00
Andrew Borodin c00c298b53 Merge branch '3259_hexedit_utf8'
* 3259_hexedit_utf8:
  Ticket #3259: mcview hex edit: UTF-8 chars are not updated.
2015-02-16 10:38:27 +03:00
Egmont Koblinger a7d326d30b Ticket #3259: mcview hex edit: UTF-8 chars are not updated.
UTF-8 characters show up nicely in the right column (followed by a space
to align with the number of bytes).

However, as soon as you edit the file (either by the hex codes, or by
moving to the right column and entering an UTF-8 character), that
character doesn't show up there.

Expected: during editing the file, the right hand side should
continuously be updated to look exactly as if that was the original
contents of the file.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-16 10:29:03 +03:00
Andrew Borodin 65b7867c2d Merge branch '3253_quickview_commandline'
* 3253_quickview_commandline:
  (midnight_callback): don't execute command line from 'Quick view' panel.
  Ticket #3253: unexpected command line execution from Quick View panel.
2015-02-16 09:20:02 +03:00
Andrew Borodin 2680f60772 (midnight_callback): don't execute command line from 'Quick view' panel.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-16 09:17:20 +03:00
Andrew Borodin 8469c13f38 Ticket #3253: unexpected command line execution from Quick View panel.
When panel is set to 'Quick view' mode, some keys are handled by
mvciewer, and unhandled keys are passed to the command line. This is
very dangerous since user can easily type and execute a harmful command.

1st step:
  * (mcview_callback): don't pass any keys from mcviewer in QuickView
mode to the command line.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-16 09:17:20 +03:00
Andrew Borodin f5295f790b Merge branch '2027_bash_prompt'
* 2027_bash_prompt:
  Ticket #2027: don't overwrite the PROMPT_COMMAND bash variable.
2015-02-16 09:14:20 +03:00
Andrew Borodin 4361e49a36 Ticket #2027: don't overwrite the PROMPT_COMMAND bash variable.
Prepend value of system-wide PROMPT_COMMAND variable to the mc's one.

Thanks wjaguar for the idea and Serhiy Storchaka and Oswald Buddenhagen
for the patch itself.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-16 09:13:49 +03:00
Marco Ciampa d1e60b6feb Updated Italian translation. 2015-02-14 21:21:50 +01:00
Marco Ciampa 4c8c961c3d Merge pull request #51 from piotrdrag/master
Fix a minor typo
2015-02-14 19:51:25 +01:00
Piotr Drąg 62c08c6bf3 Fix missing verb in mc.1
Reported by helix84 on Transifex.
2015-02-14 16:35:49 +01:00
Piotr Drąg 1d20eeb4f7 Fix a minor typo
Reported by helix84 on Transifex.
2015-02-12 16:38:53 +01:00
Andrew Borodin 7695f0acf7 Merge branch '3391_mobi'
* 3391_mobi:
  Ticket #3391: support mobi e-books.
2015-01-22 09:24:18 +03:00
Nerijus Baliunas 56e72b4b50 Ticket #3391: support mobi e-books.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-01-22 09:22:46 +03:00
Andrew Borodin 176183a402 Merge branch '3287_poedit'
* 3287_poedit:
  Ticket #3287: bind poedit to Edit action for .po files.
2015-01-14 10:01:25 +03:00
Andrew Borodin 564deafe72 Ticket #3287: bind poedit to Edit action for .po files.
Thanks Marcel Pol <marcel at timelord dot nl> for original patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-01-14 10:00:38 +03:00
Andrew Borodin 3fae7c227d Merge branch '2952_zero_length_substitution'
* 2952_zero_length_substitution:
  Add test for mc_search_glob_prepare_replace_str().
  Ticket #2952: search: fix zero-length substitution.
2015-01-14 09:51:22 +03:00
Andrew Borodin 47b02f4c23 Add test for mc_search_glob_prepare_replace_str(). 2015-01-14 09:50:50 +03:00
Andrew Borodin 5ecf12483a Ticket #2952: search: fix zero-length substitution.
Problem:
Suppose you want to replace a substring in some file names with another,
so you do a File Rename operation with source pattern:

*OLDSTRING*

and target pattern:

\1NEWSTRING\2

If OLDSTRING occurs inside a filename, it is replaced correctly, but if
at the beginning or end of the filename, the corresponding zero-length
wildcard match is replaced by literal \1 or \2, respectively.

Expected
Wildcards that match a zero-length substring should be substituted with
an empty string.

Thanks boris<> for the original patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-01-14 09:50:50 +03:00