Commit Graph

11713 Commits

Author SHA1 Message Date
Andrew Borodin
65569af255 Merge branch '2924_preserve_dir_attributes' into 4.8.1-stable
* 2924_preserve_dir_attributes:
  (copy_dir_dir): get rid of extra string duplication.
  (copy_dir_dir): refactoring: get rid of goto dont_mkdir.
  Ticket #2924: attributes of existing directories are never preserved.
2012-11-29 14:48:04 +04:00
Andrew Borodin
6e6b2c9912 (copy_dir_dir): get rid of extra string duplication.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-29 14:47:42 +04:00
Andrew Borodin
22a9e2bc0e (copy_dir_dir): refactoring: get rid of goto dont_mkdir.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-29 14:47:42 +04:00
Slack
1a7302e5c5 Ticket #2924: attributes of existing directories are never preserved.
If superuser copies a directory tree (e.g. from a safe backup location
(with sane permission, owner, group, timestamp) over an existing tree,
any attributes are not preserved. All destination dirs retain all their
existing attributes instead of change attributes from source.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-29 14:47:42 +04:00
Andrew Borodin
52108b53d4 Ticket #2934: highlight OGV files as media.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-23 14:25:36 +04:00
Andrew Borodin
b7503b878a Merge branch '2918_cygwin_test_build' into 4.8.1-stable
* 2918_cygwin_test_build:
  Ticket #2918: cygwin test failure.
2012-11-14 13:36:04 +04:00
Andrew Borodin
2209738d1a Ticket #2918: cygwin test failure.
In
tests/lib/mcconfig/Makefile.am
tests/lib/vfs/Makefile.am
tests/src/filemanager/Makefile.am

AM_LDFLAGS = -Wl,-z,muldefs

is used, but on cygwin the linker does not accept the "-z" option and

AM_LDFLAGS = -Wl,--allow-multiple-definition

is required instead.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-14 13:35:47 +04:00
Marco Ciampa
3d9edaa861 Updated italian translation. 2012-11-13 02:07:22 +01:00
Andrew Borodin
8643099745 Merge branch '2917_cppflags_cleanup' into 4.8.1-stable
* 2917_cppflags_cleanup:
  Remove unused AM_CPPFLAGS.
  Ticket #2917: Makefile.ams cleanup.
2012-10-20 15:22:18 +04:00
Andrew Borodin
0da7057cba Remove unused AM_CPPFLAGS.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-13 11:35:03 +04:00
Andrew Borodin
ec0defe60d Ticket #2917: Makefile.ams cleanup.
Set defines via CPPFLAGS variable not via CFLAGS one.
Use AM_CPPFLAGS and AM_CFLAGS variables instead of per-target ones.

Cherry-picked b37af47023.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-13 11:27:52 +04:00
Andrew Borodin
bf10a32c28 src/filemanager/mountlist.c: fix indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:47:32 +04:00
Andrew Borodin
a4b1424767 Merge branch '2906_copy_crash_on_solaris' into 4.8.1-stable
* 2906_copy_crash_on_solaris:
  (get_fs_usage): avoid compile warning about mixed declarations and code.
  Sync with gnulib ffe10f3d20c2eb77efd56b68f2c22b2a810c289d.
  Sync with gnulib 2ab2617ee340ff35a9a4c713004fb302868d41b0
  Sync with gnulib 0a6dafee2bb8f69a931345a1f67d835ee5062967
  Sync with gnulib b1fac377605c0eef8844fc8d3818d360f37d6fa4:
  Ticket #2906: crash on Solaris while trying to copy a file.
2012-10-12 14:09:28 +04:00
Andrew Borodin
cdd9451621 (get_fs_usage): avoid compile warning about mixed declarations and code.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:07:39 +04:00
Andrew Borodin
dd1eb69a6d Sync with gnulib ffe10f3d20c2eb77efd56b68f2c22b2a810c289d.
fsusage: port back to Solaris

* src/filemanager/mountlist.c (get_fs_usage): Fix busted logic causing
compile-time error (fsd not declared) on Solaris 10.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:06:03 +04:00
Andrew Borodin
42b5438045 Sync with gnulib 2ab2617ee340ff35a9a4c713004fb302868d41b0
* src/filemanager/mountlist.c [STAT_STATVFS && (__linux__ && (__GLIBC__||__UCLIBC__))]:
Undefine STAT_STATFS2_FRSIZE to exclude code not used in this case.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:06:03 +04:00
Andrew Borodin
38b35288f9 Sync with gnulib 0a6dafee2bb8f69a931345a1f67d835ee5062967
Avoid needless check on GNU/Linux.

* m4.include/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Omit STAT_STATFS3_OSF1 check
on GNU/Linux systems, since it can't possibly work.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:06:03 +04:00
Andrew Borodin
77b2392aa0 Sync with gnulib b1fac377605c0eef8844fc8d3818d360f37d6fa4:
fs usage: fix block size returned on older Linux 2.6.

* src/filemanager/mountlist.c: Fall back to (struct statfs).f_frsize
which is available since Linux 2.6.
* m4.include/fsusage.m4 (STAT_STATFS2_FRSIZE): Always define
when the member is available so it can be used as a fallback.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:06:03 +04:00
Andrew Borodin
c9f439efe3 Ticket #2906: crash on Solaris while trying to copy a file.
Sync with gnulib c25bdbae48977a527dff69150f59fb0746d31b51:
fs usage: check for GNU/Linux statvfs problem dynamically.

* src/filemanager/mountlist.c [STAT_STATVFS && __linux__ && (__GLIBC__||__UCLIBC__)]:
Define STAT_STATFS2_BSIZE too, since in this case the code now
checks dynamically whether statvfs is reliable, falling back on
Linux-style statfs otherwise.
(statvfs_works): New function, for dynamically testing statvfs.
(get_fs_usage) [STAT_STATVFS]: Use it.
* src/filemanager/filegui.c (filegui__check_attrs_on_fs): apply the same
statvfs_works function.
* m4.include/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Remove static check for
statvfs on GNU/Linux hosts, since it's now done dynamically.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:06:02 +04:00
Andrew Borodin
5893280248 Ticket #2912: add psgi extension to Perl syntax highlighting.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-08 16:55:14 +04:00
Andrew Borodin
00c4dd2e3c Ticket #2910: enter into symlink to commpressed patch shows empty patch.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-04 11:09:58 +04:00
Andrew Borodin
4d82b671f1 Ticket #2898: fix broken path completion on paths starting with ~/.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-04 11:06:34 +04:00
Ilia Maslakov
c123e8cd70 Ticket #2660 (mcedit: reset selection after paste)
mcedit reset selection after the text pasted (only in non-persistent selection mode)

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-10-04 11:04:11 +04:00
Ilya Molchanov
2f5c1bbef7 Ticket #303 (don't indent blank lines)
don't indent blank lines.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-09-18 11:49:40 +04:00
Slava Zanko
d32694e4c6 Updated doc/NEWS file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-14 14:35:29 +03:00
Slava Zanko
d2cff3fe40 Updated translations from Transifex
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-14 14:32:25 +03:00
Andrew Borodin
75a19e2e8d Merge branch '2873_diff_escape_dollar' into 4.8.1-stable
* 2873_diff_escape_dollar:
  Don't close file and pipe that were not opened.
  Ticket #2873: diffviewer cannot open file if name contains '$'.
2012-09-11 16:42:20 +04:00
Andrew Borodin
e7a0d7e94f Don't close file and pipe that were not opened.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-11 16:42:09 +04:00
Andrew Borodin
ac3cec8479 Ticket #2873: diffviewer cannot open file if name contains '$'.
Escape '$' to avoid variable substitution in shell invoked in popen(3) call.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-11 16:42:09 +04:00
Andrew Borodin
e959b5ae53 Merge branch '2881_editor_offset_after_tab' into 4.8.1-stable
* 2881_editor_offset_after_tab:
  Ticket #2881: (edit_move_forward3): fix two-columns extra offset of cursor
2012-09-11 12:51:40 +04:00
Andrew Borodin
dde6cf6625 Ticket #2881: (edit_move_forward3): fix two-columns extra offset of cursor
...after tab character.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-11 12:51:27 +04:00
Slava Zanko
5c4bfd04a7 Updated NEWS file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-10 16:46:38 +03:00
Slava Zanko
dcc325a9a9 Updated translations from transifex.net
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-10 16:43:36 +03:00
Andrew Borodin
2709356f72 (status_string): fix of compilation failure.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 17:29:36 +04:00
Slava Zanko
02bf6e2c59 code indentation
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-10 15:58:46 +03:00
Slava Zanko
d92a9fa9ac Merge branch '2877_stable_cleanup' into 4.8.1-stable
* 2877_stable_cleanup:
  Update EN and RU man pages: add missing options.
  fixed doxygen.cfg, excluded directory /tests/ from doxygen path's
  Ticket #2861: additional error handling in edit_save_block().
  (str_utf8_normalize): ret rid of extra memory allocation.
  Use g_strndup() instead of g_strdup()
  (get_absolute_name): missing finish NULL in vfs_path_append_vpath_new() call.
  (edit_do_undo): cleanup of labeled statement usage.
  mcdiffview: code cleanup and cosmetics.
  Cleanup of screen library detection m4 code.
  Refactoring of many conditions.
  (edit_do_search): refactoring of search loop condition.
  Avoid double checks of bookmarks in editor.
  Ticket #2877: code cleanup before 4.8.1.6 release.
2012-09-10 15:41:46 +03:00
Andrew Borodin
6b0214e508 Update EN and RU man pages: add missing options.
Reported in https://bugzilla.redhat.com/show_bug.cgi?id=854876.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-09 18:41:39 +04:00
Ilia Maslakov
6c640ca35a fixed doxygen.cfg, excluded directory /tests/ from doxygen path's
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-09-06 13:26:04 +04:00
Yury V. Zaytsev
aa29f1b718 Ticket #2861: additional error handling in edit_save_block().
If edit->column_highlight is on and the disk is so full that the editor
is unable even to write the magic (r <= 0), then subsequent if (len)
check might fail, since the value of len is undefined.

The solution is to initialize len with a non-zero value, so that the
function properly returns an error value in all cases (adding an
explicit return 0; is also possible, but then one must take care of
closing file descriptors, which is less convenient).

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2012-09-06 13:25:56 +04:00
Andrew Borodin
149cd8ea96 (str_utf8_normalize): ret rid of extra memory allocation.
(str_utf8_casefold_normalize): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:34 +04:00
Andrew Borodin
f9aacdaf05 Use g_strndup() instead of g_strdup()
...to ret rid of extra calculation of string length.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:34 +04:00
Adam Young
e8bd74f593 (get_absolute_name): missing finish NULL in vfs_path_append_vpath_new() call.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:02 +04:00
Andrew Borodin
b42182b392 (edit_do_undo): cleanup of labeled statement usage.
(edit_do_redo): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:02 +04:00
Andrew Borodin
c41a8182a9 mcdiffview: code cleanup and cosmetics.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:02 +04:00
Andrew Borodin
7d281e071f Cleanup of screen library detection m4 code.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:02 +04:00
Andrew Borodin
e2358f6217 Refactoring of many conditions.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:02 +04:00
Andrew Borodin
44de5a893f (edit_do_search): refactoring of search loop condition.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:01 +04:00
Andrew Borodin
e42db716ca Avoid double checks of bookmarks in editor.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:01 +04:00
Andrew Borodin
3e6f1041f6 Ticket #2877: code cleanup before 4.8.1.6 release.
Better support of --disable-charset.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:01 +04:00
Andrew Borodin
92a0edd15f Merge branch '2874_tilde_directory' into 4.8.1-stable
* 2874_tilde_directory:
  Allow create directory with name '~' (tilda).
  Reimplement support of use ~ as home directory in hotlist.
  Ticket #2874: enter on directory named '~' goes to the home one.
2012-09-06 10:33:31 +04:00