Commit Graph

12952 Commits

Author SHA1 Message Date
Andrew Borodin
a03fe94170 Merge branch '3265_cleanup'
* 3265_cleanup: (22 commits)
  Update po/*.po files.
  tests/lib/search/Makefile.am: fix name of variable.
  Remove code required for GLib < 2.14.0.
  Minimal version of GLib is 2.14.0
  Ticket #3405: mcview: use VIEW_SELECTED_COLOR in plain mode.
  Hints: capitalize Lynx since it is the proper noun.
  (dirsize_status_update_cb): use local variables instead of type casting.
  doc/NEWS: cosmetics.
  (input_execute_cmd): refactoring.
  * background.c (background_attention): Fix memory leak.
  g_utf8_next_char() never returns NULL. Remove redundant checks.
  diffviewer: clarify support of UTF-8 codeset.
  Ticket #3246: misc/mcedit.menu.in: better grammar.
  Ticket #3262: rename variables.
  Add IS_PATH_SEP macro and use it.
  (edit_get_match_keyword_cmd): use PATH_SEP_STR instead of G_DIR_SEPARATOR_S.
  Update copyright years.
  (mc_search_regex_prepare_replace_str): refactoring.
  lib/search/regex.c: use [] to get char in string.
  (mc_search_prepare_replace_str2): make replace_str const.
  ...
2015-02-26 09:57:46 +03:00
Andrew Borodin
96fcc449c8 Update po/*.po files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:47:12 +03:00
Andrew Borodin
573136ac64 tests/lib/search/Makefile.am: fix name of variable.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:41:09 +03:00
Andrew Borodin
8c88aa01ad Remove code required for GLib < 2.14.0.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:20:54 +03:00
Andrew Borodin
1fa8bd3d62 Minimal version of GLib is 2.14.0
...because of g_unichar_ismark().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:20:54 +03:00
Andrew Borodin
ea2e5bf0b2 Ticket #3405: mcview: use VIEW_SELECTED_COLOR in plain mode.
Thanks Andreas Mohr <and@gmx.li> for the original patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:20:54 +03:00
Andrew Borodin
aa2175c596 Hints: capitalize Lynx since it is the proper noun.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:20:54 +03:00
Andrew Borodin
448935fa5b (dirsize_status_update_cb): use local variables instead of type casting. 2015-02-26 09:20:54 +03:00
Andrew Borodin
6a6e4f8c81 doc/NEWS: cosmetics.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:20:53 +03:00
Andrew Borodin
c08c90cd1b (input_execute_cmd): refactoring.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:20:53 +03:00
Andrew V. Samoilov
964056fb65 * background.c (background_attention): Fix memory leak. 2015-02-26 09:17:10 +03:00
Andrew Borodin
5cbfc77d2c g_utf8_next_char() never returns NULL. Remove redundant checks.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:17:10 +03:00
Andrew Borodin
67f465209b diffviewer: clarify support of UTF-8 codeset.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:17:10 +03:00
Egmont Koblinger
da149a0ae6 Ticket #3246: misc/mcedit.menu.in: better grammar.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:17:10 +03:00
Andrew Borodin
6441fa0bfa Ticket #3262: rename variables.
Use 'char_length' name for variables that store the length of multi-byte
character.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:17:01 +03:00
Andrew Borodin
42e7e39bd8 Add IS_PATH_SEP macro and use it.
Also massive use of PATH_SEP and PATH_SEP_STR macros.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:13:02 +03:00
Andrew Borodin
990e3053b3 (edit_get_match_keyword_cmd): use PATH_SEP_STR instead of G_DIR_SEPARATOR_S.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:12:08 +03:00
Andrew Borodin
454479549c Update copyright years. 2015-02-26 09:12:08 +03:00
Andrew Borodin
6ed1eba88f (mc_search_regex_prepare_replace_str): refactoring.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2015-02-26 09:12:08 +03:00
Andrew Borodin
fa7d2ea110 lib/search/regex.c: use [] to get char in string. 2015-02-26 09:12:08 +03:00
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