Commit Graph

12986 Commits

Author SHA1 Message Date
Andrew Borodin
866663f455 Merge branch '3123_file_operation_prompt'
* 3123_file_operation_prompt:
  Refresh po/*.po files.
  Ticket #3123: clarify file operation prompt.
2014-02-07 09:39:33 +04:00
Andrew Borodin
a45030b512 Refresh po/*.po files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-02-07 09:38:47 +04:00
Andrew Borodin
26f0930919 Ticket #3123: clarify file operation prompt.
In the delete confirmation dialog, the question mark is on its own line.
This is gramatically incorrect in English.

(panel_operate_generate_prompt): totally rewrite.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-02-07 09:36:14 +04:00
Andrew Borodin
96d90e5b51 Merge branch '3156_toggle_hidden_fix'
* 3156_toggle_hidden_fix:
  Ticket #3156: fix of panels redraw after toggling hidden files.
2014-02-07 09:27:28 +04:00
Andrew Borodin
651bb2e86e Ticket #3156: fix of panels redraw after toggling hidden files.
(toggle_show_hidden): redraw both panels forced after toggling
hidden files. The bug is appeared when toggling is performed
by mouse clicking on icon in the panel title: current panel
is updated, other one isn't.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-02-07 09:26:47 +04:00
Andrew Borodin
38629e21de Merge branch '3150_achown_list_esc'
* 3150_achown_list_esc:
  Ticket #3150: achown: escape on user list should not accept value.
2014-02-07 09:23:04 +04:00
Andrew Borodin
13199786ed Ticket #3150: achown: escape on user list should not accept value.
Open the Advanced chown dialog. Navigate to owner or group, and press
Enter. A dialog enlisting the available usernames or groups appears.

Move up or down in this dialog, then press double Esc or F10.

Actual behavior: The selected value gets accepted, just as if Enter was
pressed.

Expected behavior: The user or group is not changed, as if this dialog
was not opened at all.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-02-07 09:22:25 +04:00
Andrew Borodin
cb3aefebd0 Merge branch '1666_paragraph_format_1st_line'
* 1666_paragraph_format_1st_line:
  Rename src/editor/{wordproc.c => format.c}.
  Ticket #1666: fix paragraph formatting.
2014-02-05 12:42:52 +04:00
Andrew Borodin
2794826ec7 Rename src/editor/{wordproc.c => format.c}. 2014-02-05 12:42:24 +04:00
Andrew Borodin
ccb7ab341e Ticket #1666: fix paragraph formatting.
1st line was shifted after paragraph format.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-02-05 12:42:24 +04:00
Andrew Borodin
b7209c0c76 Merge branch '3131_copy_move_tilde_expand'
* 3131_copy_move_tilde_expand:
  Ticket #3131: incorrect tilde expandion in copy/rename/move dialog.
2014-02-05 12:38:09 +04:00
Andrew Borodin
13bfb0898d Ticket #3131: incorrect tilde expandion in copy/rename/move dialog.
Revert "(file_mask_dialog): don't call tilde_expand() because
vfs_path_from_str() returns an absolute path."

This reverts commit 1b774ac1fe.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-02-05 12:37:48 +04:00
Andrew Borodin
8b67958674 Merge branch '3157_panel_sort_sign'
* 3157_panel_sort_sign:
  Ticket #3157: unify panel sort arrow's direction.
2014-01-26 14:50:00 +04:00
Egmont Koblinger
3f7baba96c Ticket #3157: unify panel sort arrow's direction.
Fix inconsistency of the arrow's direction in the panel header line
across skins.
Change default value of "sort-sign-down" from "," (comma) to "." (dot).

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-26 14:48:42 +04:00
Andrew Borodin
a71f320e2f Merge branch '2274_perms_fix'
* 2274_perms_fix:
  Ticket #2274: adjust script permissions to installed ones.
2014-01-26 13:40:11 +04:00
Oswald Buddenhagen
ec33401a2e Ticket #2274: adjust script permissions to installed ones. 2014-01-26 13:38:48 +04:00
Andrew Borodin
c4188ee235 Merge branch '3142_edit_save_check_out_of_date'
* 3142_edit_save_check_out_of_date:
  Ticket #3142: fix file out-of-date-ness check on saving.
2014-01-26 13:26:17 +04:00
Oswald Buddenhagen
58bba43490 Ticket #3142: fix file out-of-date-ness check on saving.
The code depended on the execution and outcome of the hardlink check.
This was bogus - the two checks have nothing in common except the stat()
call they both depend on.
2014-01-26 13:22:58 +04:00
Andrew Borodin
62e1606106 Fix segfault in directory hotlist.
(listbox_get_current): check parameter value before use it's member.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-22 13:59:54 +04:00
Andrew Borodin
d26b7dd6ee Merge branch '2857_zip'
* 2857_zip:
  Ticket #2857: add handling .zip extension.
2014-01-14 15:51:52 +04:00
Andrew Borodin
031ab1711c Ticket #2857: add handling .zip extension.
Add 'shell/i/.zoo' to detect zip archive using .zip extension
in addition to 'type/i/^zip\ archive'.

Thanks ctmp1 <gvlatyshev@gmail.com> for the original patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 15:50:11 +04:00
Andrew Borodin
bc2f24b0e5 Merge branch '3119_format_paragraph'
* 3119_format_paragraph:
  Add editor_stop_format_chars ini option.
  (format_paragraph): fix wrong refactoring.
  Ticket #3119: fix format paragrap formatting.
2014-01-14 14:39:45 +04:00
Andrew Borodin
943320c434 Add editor_stop_format_chars ini option.
This option contains a set of characters to stop paragraph formatting.
If one of those characters is found in the begin of line, that line and
all following lines of paragraph will be untouched. Default value is
"-+*\,.;:&>".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:38:16 +04:00
Andrew Borodin
06a9feef32 (format_paragraph): fix wrong refactoring.
Partially revert of 253d27b1a3.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:38:16 +04:00
Andrew Borodin
736279aa8a Ticket #3119: fix format paragrap formatting.
(word_start): remove extra decrement.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:38:16 +04:00
Andrew Borodin
7c7ed5ef0c Merge branch '3117_external_editor_line_number'
* 3117_external_editor_line_number:
  Update EN and RU manual pages.
  Launching external editor/viewer with F4/F3 w/o passing line number.
  Allow launch external editor/viewer w/o line number.
  Ticket #3117: Launching editor with CK_Edit shouldn't pass line number.
2014-01-14 14:25:34 +04:00
Andrew Borodin
a7e516220c Update EN and RU manual pages.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:23:02 +04:00
Andrew Borodin
9757d53cf4 Launching external editor/viewer with F4/F3 w/o passing line number.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:23:02 +04:00
Andrew Borodin
cef5286fce Allow launch external editor/viewer w/o line number.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:23:02 +04:00
Andrew Borodin
9d83d55d84 Ticket #3117: Launching editor with CK_Edit shouldn't pass line number.
When pressing F4 to start the editor, a "+1" argument is passed to open
the file at the first line.

For some editor this is absolutely unnecessary since they open the file
there anyways. For some others (at least "joe", but probably others too)
this is harmful: joe has a convenience feature that by default it opens
the file where it was last open, unless of course overridden from
command line. Currently mc forces joe to open the file at the first
line, although opening it where it was last open would be much more
desired.

The right solution would be to consult mc.lib only when opening the
viewer/editor through the "word search in files (M-?)" feature, and
not when F3/F4 is pressed on a file, in the latter case $VIEWER or
$EDITOR should simply be launched with the filename but no additional
parameters.

Initial step: minor refactoring:
(do_edit_at_line): rename to edit_file_at_line.
(edit_file_at_line): changed type of arguments from int to gboolean.
(view_file_at_line): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:23:02 +04:00
Andrew Borodin
f949a29422 Merge branch '2290_find_file_speedup'
* 2290_find_file_speedup:
  Refactoring of WListbox widget.
  Optimize updates of status bar during search.
  Ticket #2290: make file find faster.
2014-01-14 14:15:54 +04:00
Andrew Borodin
7df67031a2 Refactoring of WListbox widget.
Use GQueue instead of GList to store listbox entries.

g_list_append() function is slow because it uses g_list_last()
internally to traverse from the beginning to the end of a list, so
forming a list of results has O(n*n) complexity instead of O(n).
GQueue contains pointers to head and tail of list and list length.
So in this case we don't need seach end of list every time when we
want append listbox entry to the listbox.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:13:38 +04:00
Sergey Naumov
8aa3c77ecf Optimize updates of status bar during search.
Optimization is based on examining file size and time of the last status
update. This is synchronous and is based on assumption that relatively
small files are quickly processed even on slow hardware so if refresh
timeout expires during their processing, the delay couldn't be noticed
by human. Therefore only rather big files have to be reported
unconditionally, and others - only if there is a match in this file or
if timeout expires.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:13:38 +04:00
Sergey Naumov
8ae1de5b02 Ticket #2290: make file find faster.
Gets rid of get_line_at() function that was called only at one place and
was tightly coupled with caller function. It allows to perform some
minor optimizations, and as a result improve search time by 8%.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:13:38 +04:00
Andrew Borodin
7abd8a1297 src/subshell.c: indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-09 13:42:54 +04:00
Andrew Borodin
e65954d5b0 Merge branch '3093_keep_symlink_cwd_startup_fix'
* 3093_keep_symlink_cwd_startup_fix:
  Ticket #3093: fix sefault in case of run "mcedit relative/path/to/file".
2014-01-09 13:39:42 +04:00
Egmont Koblinger
ad5246c6ef Ticket #3093: fix sefault in case of run "mcedit relative/path/to/file".
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-09 13:39:12 +04:00
Andrew Borodin
87e97f5083 Merge branch '3125_zsh_precmd'
* 3125_zsh_precmd:
  Ticket #3125: don't override precmd on Zsh
2014-01-09 13:34:31 +04:00
Igor Urazov
75073307b9 Ticket #3125: don't override precmd on Zsh
Do not override global precmd() funcation on Zsh. Define new _mc_precmd()
function and add it to precmd_functions array instead. This also effectively
fixes race condition with pwd call on Zsh, which may lead to empty prompt in mc.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-09 13:33:49 +04:00
Andrew Borodin
11108180ba Merge branch '3124_zsh_escape_history'
* 3124_zsh_escape_history:
  Ticket #3124: really escape Zsh history
2014-01-04 16:23:27 +04:00
Igor Urazov
72544cec5f Ticket #3124: really escape Zsh history
Per Zsh documentation last command prefixed with space lingers in the
internal history until the next command is entered before it vanishes.
To make it vanish right away, type a space and press return.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-04 16:22:38 +04:00
Andrew Borodin
dcedeaba1a (load_setup): clarify usage of internal variable.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-12-28 08:50:30 +04:00
Andrew Borodin
18dcddf16b Merge branch '3093_keep_symlink_cwd_startup'
* 3093_keep_symlink_cwd_startup:
  Add tests for check that symlinks in cwd are handled correctly.
  Ticket #3093: keep symlinks in cwd at startup.
2013-12-27 19:08:20 +04:00
Slava Zanko
4449cfb3c5 Add tests for check that symlinks in cwd are handled correctly.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-12-27 19:07:58 +04:00
Egmont Koblinger
7866bf7342 Ticket #3093: keep symlinks in cwd at startup.
If you navigate in your shell to a directory containing symlinks and
then start mc, mc will show the canonical path instead. It would be nice
to make it show the directory with the symlinks.

Example: in your shell execute these:

user:~$ mkdir -p /tmp/a/b /tmp/x ; ln -s /tmp/a/b /tmp/x/y
user:~$ cd /tmp/x/y
user:/tmp/x/y$ mc

In mc you'll find yourself in /tmp/a/b, though it'd be nicer to see
/tmp/x/y at the top, and correspondingly navigating to the parent would
take you to /tmp/x.

If you start bash or zsh from /tmp/x/y, the new instance will start
displaying the working directory as such. They do this via the PWD env
variable. On one hand, they set and maintain PWD to point to the current
directory, using the path as specified by the user (possibly containing
symbolic links). On the other hand, they check its value at startup. If
$PWD points to the same physical directory as the actual working
directory then they use this value. If $PWD points somewhere else then
it's simply ignored (so it's a hint only as to which symlinks to use to
get to the working directory, but never alters the actual cwd).

Now mc also does the same at startup (with respect of "Cd follows
links" option). Relative directories specified in the command line  are
applied after possibly replacing the canonical cwd with $PWD. This way
for example

user:/tmp/x/y$ mc . ..

opens two panels in /tmp/x/y and /tmp/x instead of /tmp/a/b and /tmp/a
(whereas /tmp/x is actually a different directory than /tmp/a).

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-12-27 19:07:58 +04:00
Andrew Borodin
56b76cecdf Merge branch '3111_mcedit_reset_selection'
* 3111_mcedit_reset_selection:
  Ticket #3111: configurable selection reset on CK_Store.
2013-12-20 09:33:58 +04:00
Sergey Naumov
fb9b12c3d2 Ticket #3111: configurable selection reset on CK_Store.
In mc-4.7.x.x selection was reset on CK_Store (copy to buffer).
In mc-4.8.x (4.8.11 and older) it is not.

Now this behavior is configurable using editor_drop_selection_on_copy
key in the ini file.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-12-20 09:33:31 +04:00
Andrew Borodin
4ad5b134dc Merge branch '3114_ncurses_build'
* 3114_ncurses_build:
  Ticket #3114: fix broken build with NCurses.
2013-12-04 15:14:49 +04:00
Andrew Borodin
d870aedad1 Ticket #3114: fix broken build with NCurses.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-12-04 15:14:07 +04:00
Slava Zanko
a8ffc26817 Updated doc/NEWS file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-29 21:42:56 +03:00