Commit Graph

11862 Commits

Author SHA1 Message Date
Slava Zanko 22595e3d6a Merge branch '2876_cleanup'
* 2876_cleanup:
  Update EN and RU man pages: add missing options.
  fixed doxygen documentation
  fixed doxygen.cfg, excluded directory /tests/ from doxygen path's
  removed obsolete params from edit_push_undo_action/edit_push_redo_action
  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.
  Fix mouse event handling in menu that overlaps buttonbar.
  mcdiffview: code cleanup and cosmetics.
  Reorder checks in configure.ac.
  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 #2876: code cleanup before 4.8.6 release.
2012-09-10 14:30:19 +03:00
Andrew Borodin cbdd38405a 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-10 14:29:53 +03:00
Ilia Maslakov 55c8f041da fixed doxygen documentation
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-09-10 14:29:53 +03:00
Ilia Maslakov f7c4dfa8ab fixed doxygen.cfg, excluded directory /tests/ from doxygen path's
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-09-10 14:29:53 +03:00
Ilia Maslakov fa7a8dcbeb removed obsolete params from edit_push_undo_action/edit_push_redo_action
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-09-10 14:29:53 +03:00
Yury V. Zaytsev fbc013421c 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-10 14:29:53 +03:00
Andrew Borodin 8e224507c1 (str_utf8_normalize): ret rid of extra memory allocation.
(str_utf8_casefold_normalize): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:53 +03:00
Andrew Borodin 8b382756bf 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-10 14:29:53 +03:00
Adam Young 5e1ae44eca (get_absolute_name): missing finish NULL in vfs_path_append_vpath_new() call.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:53 +03:00
Andrew Borodin 45a4197fa6 (edit_do_undo): cleanup of labeled statement usage.
(edit_do_redo): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:53 +03:00
Andrew Borodin ce0e129891 Fix mouse event handling in menu that overlaps buttonbar.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:53 +03:00
Andrew Borodin d7482275c3 mcdiffview: code cleanup and cosmetics.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:52 +03:00
Andrew Borodin c34fdcf946 Reorder checks in configure.ac.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:52 +03:00
Andrew Borodin d84e462b89 Cleanup of screen library detection m4 code.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:19:19 +04:00
Andrew Borodin 6c249ec0f2 Refactoring of many conditions.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:19:19 +04:00
Andrew Borodin 5bf69875dc (edit_do_search): refactoring of search loop condition.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:19:19 +04:00
Andrew Borodin 37054596f6 Avoid double checks of bookmarks in editor.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:19:19 +04:00
Ilia Maslakov 1b1071cdac Ticket #2876: code cleanup before 4.8.6 release.
mcedit: 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:19:19 +04:00
Andrew Borodin ded2b30443 Merge branch '2874_tilde_directory'
* 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:30:54 +04:00
Andrew Borodin 513d30e5a1 Allow create directory with name '~' (tilda).
Use escaping for that (as in shell): \~.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 10:30:28 +04:00
Andrew Borodin 85ed2bd331 Reimplement support of use ~ as home directory in hotlist.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 10:30:28 +04:00
Andrew Borodin 4a0004f6c2 Ticket #2874: enter on directory named '~' goes to the home one.
Revert "Support of use ~ as home directory in hotlist."
This partially reverts commit dd9c7516a3.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 10:30:28 +04:00
Slava Zanko 21b432b822 Merge branch '2832_mcedit_safe_save'
* 2832_mcedit_safe_save:
  Ticket #2832: Fixed mcedit: unable to save changes in "Safe save" mode
2012-09-05 14:40:11 +03:00
Slava Zanko e2fb1c8dd3 Ticket #2832: Fixed mcedit: unable to save changes in "Safe save" mode
If mcedit is configured to use "Safe save" I'm unable to save changes to existing file.
Same problem is for editor_option_save_mode=2 (backup mode)
Saving to new file works.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-05 14:39:58 +03:00
Slava Zanko 9cec25429e Merge branch '2864_uc1541'
* 2864_uc1541:
  fixes following issues:
  Ticket #2864: New implementation of uc1541 VFS
2012-09-05 14:30:32 +03:00
Roman 'gryf' Dobosz 198a10ca7d fixes following issues:
* F3/F4 on 'del' and 0-length files works, however it is impossible to change 'del'
   files (cached content can be confusing)
 * Koala files and other with non-ASCII characters are supported (implemented directory
   reading routine in pure python - for now only D64 format is supported)
 * Added workaround for filenames with space at the beginning (however, as it was stressed
   before, it is more generic issue than this script. Maybe it is good idea to use pcre
   instead of iterating and splitting?)
 * minor bugfixes and code cleanup

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-05 14:29:53 +03:00
Slava Zanko 43e4938a09 Ticket #2864: New implementation of uc1541 VFS
Due to date formatting, uc1541 extfs plugin is unusable, even tough the date formatting,
which is the one cause of the problem is coherent with the attached documentation (MM-DD-YYYY hh:mm).

Another problem with uc1541 script is connected rather with legal characters used in filename
rather than with script itself - in PET ASCII it is perfectly fine to use slash "/" character
in filenames, and as a side effect all files containing slash inside d64 image are represented
as directories on MC.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-05 14:29:53 +03:00
Andrew Borodin e6963fc3b2 Merge branch '2664_ogm_deprecated'
* 2664_ogm_deprecated:
  Ticket #2664: ogm extension was deprecated in favor of .ogv.
2012-09-05 13:51:00 +04:00
Andrew Borodin 353ed376ba Ticket #2664: ogm extension was deprecated in favor of .ogv.
Conform to http://wiki.xiph.org/MIME_Types_and_File_Extensions, .ogm
extension was deprecated in favor of .ogv (with mimetype video/ogg).

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 13:50:31 +04:00
Andrew Borodin 6e6303918d Update PO-files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-03 10:11:08 +04:00
Andrew Borodin 028853b567 Adjust i18n stuff in editor menu.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-03 10:07:30 +04:00
Ilia Maslakov 1a5dc8fe64 Merge branch '2863_mcdiff_merge_enhance'
* 2863_mcdiff_merge_enhance:
  fixed the doxygen documentation.
  Added doxygen comments
  Added diff_place_t enum.
  Added action_direction_t type
  Ticket #2863 (mcdiff bidirectional merge enhancement)
2012-08-30 17:14:27 +04:00
Ilia Maslakov 7d34775231 fixed the doxygen documentation.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com
2012-08-30 17:10:05 +04:00
Slava Zanko 405007bca1 Added doxygen comments
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-30 10:45:02 +04:00
Slava Zanko e2b53f7d21 Added diff_place_t enum.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-30 10:45:02 +04:00
Slava Zanko 872f9daa26 Added action_direction_t type
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-30 10:45:01 +04:00
Gergely Szasz d8aa98b7d4 Ticket #2863 (mcdiff bidirectional merge enhancement)
Added feature for the mcdiff for the bidirectional merge.
    With F15 mcdiffviewer merge left panel to right panel direction.

    original patch by Gergely Szasz <szaszg@hu.inter.net>

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>

added bind "MergeOther" into mc.keymap.default, mc.keymap.emacs.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-08-30 10:43:20 +04:00
Slava Zanko 961019d078 Merge branch '2791_path_encoding'
* 2791_path_encoding:
  Ticket #2791: Fixed: cannot Copy/Move files with filename encoding change
2012-08-29 13:30:49 +03:00
Slava Zanko 949d257f37 Ticket #2791: Fixed: cannot Copy/Move files with filename encoding change
Steps to reproduce:
 * run mc
 * change encoding one of panels to any different from system encoding
 * try to copy any file to panel with changed encoding

Expected result: files should be copied.

Actual result: error box here.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-29 13:30:28 +03:00
Slava Zanko 4e64456ee2 Merge branch '2869_mcext_m4a'
* 2869_mcext_m4a:
  Fixed OGV file extention handle.
  Ticket #2869: Added  M4A support
2012-08-29 13:03:12 +03:00
Slava Zanko 2a8c94352d Fixed OGV file extention handle.
Currently OGV files handles as video.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-29 13:02:48 +03:00
Artem S. Tashkinov 4fd2156c2d Ticket #2869: Added M4A support
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-29 13:02:48 +03:00
Andrew Borodin c3820a7e1a Merge branch '2862_tree_refresh_fix'
* 2862_tree_refresh_fix:
  Fix of memory leak in TreeStore::check_name destruction.
  Ticket #2862: fix syncronization with filelist and tree panels
2012-08-29 10:24:18 +04:00
Andrew Borodin 30313679b4 Fix of memory leak in TreeStore::check_name destruction.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-29 10:23:52 +04:00
Andrew Borodin fa27aaf018 Ticket #2862: fix syncronization with filelist and tree panels
...in case of rename and delete directories.

Steps to reproduce the problem:
  * Choose "file listing" mode for one panel and "directory tree" mode for the other.
  * Perform all operations on the "file listing" panel.
  * Create a new directory -> tree view will update correctly.
  * Perform an operation, which changes this directory like rename/delete.
  * Deleted directory will still show up on the "directory tree" view.
Renamed directory will show up with the new name, but the old name will also stay there.

Minor cleanup: remove extra parenthesis.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-29 10:23:52 +04:00
Andrew Borodin bf8755f412 Merge branch '1977_mcedit_type_accuracy'
* 1977_mcedit_type_accuracy:
  Avoid compiler errors about comparsion signed and unsigned variables
  (is_aligned_on_a_tab): return gboolean instead of int. Minor optimization.
  Use off_t instead of long for all variables related to position in file:
  Use long for line numbers and columns.
  (edit_find_word_start): return gboolean instead of int.
  (edit_save_cmd): return gboolean instead of int.
  (edit_copy_to_X_buf_cmd): return gboolean instead of int.
  (edit_save_block): return gboolean instead of int.
  (editcmd_dialog_raw_key_query): take gboolean instead of boolean.
  (edit_mark_cmd): take gboolean instead of int.
  WEdit::caches_valid: change int to gboolean.
  (is_in_indent): refactoring, return gboolean instead of int.
  Ticket #1977: type accuracy of WEdit members and mceditor functions.
2012-08-27 16:29:11 +04:00
Slava Zanko c29a5a594d Avoid compiler errors about comparsion signed and unsigned variables
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 16:27:43 +04:00
Ilia Maslakov 1326197d1b (is_aligned_on_a_tab): return gboolean instead of int. Minor optimization.
(right_of_four_spaces): likewise.
(left_of_four_spaces): likewise.

Simplifying expression for easy code support.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 16:27:43 +04:00
Ilia Maslakov ad0f58e51e Use off_t instead of long for all variables related to position in file:
...offset, cursor position, etc.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 16:27:37 +04:00
Andrew Borodin 72f50b458b Use long for line numbers and columns.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:24 +04:00