Commit Graph

11726 Commits

Author SHA1 Message Date
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
Andrew Borodin
622c51b086 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:33:13 +04:00
Andrew Borodin
c1ef748ff9 Reimplement support of use ~ as home directory in hotlist.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 10:33:13 +04:00
Andrew Borodin
d6f1728fff 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:33:13 +04:00
Andrew Borodin
5a64ae16d8 Merge branch '1977_mcedit_type_accuracy' into 4.8.1-stable
* 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_drop_hotkey_menu): return gboolean instead of int.
  (edit_translate_keys): return gboolean instead of int.
  (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 int.
  (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-09-05 16:16:45 +04:00
Slava Zanko
21b33f446c Avoid compiler errors about comparsion signed and unsigned variables
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-05 16:16:08 +04:00
Ilia Maslakov
a0d59f6c25 (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-09-05 16:16:08 +04:00
Ilia Maslakov
3c710a6e24 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-09-05 16:16:07 +04:00
Andrew Borodin
1aa6a9574c Use long for line numbers and columns.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
8cbea3a9a2 (edit_drop_hotkey_menu): return gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
82e3391719 (edit_translate_keys): return gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
d6511ce8b2 (edit_find_word_start): return gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
24bda30176 (edit_save_cmd): return gboolean instead of int.
(edit_save_as_cmd): likewise.
(edit_save_confirm_cmd): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
55e719bb32 (edit_copy_to_X_buf_cmd): return gboolean instead of int.
(edit_cut_to_X_buf_cmd): likewise.
(edit_paste_from_X_buf_cmd): return gboolean.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
08bfbc0d47 (edit_save_block): return gboolean instead of int.
(edit_save_block_cmd): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
603d136db4 (editcmd_dialog_raw_key_query): take gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
3b96b9b8b8 (edit_mark_cmd): take gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
2cd706f8f6 WEdit::caches_valid: change int to gboolean.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
94db4513b0 (is_in_indent): refactoring, return gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Andrew Borodin
b7ee0d346c Ticket #1977: type accuracy of WEdit members and mceditor functions.
(line_is_blank): return gboolean instead of int.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:16:07 +04:00
Leonid Krivoshein
0a42d171ad Ticket #2649: dlink.syntax: syntax highlighting for D-Link switches command set.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:07:22 +04:00
Ralesk
6d8b82b845 Ticket #2084: cmake.syntax: preliminary syntax file for CMakeLists.txt files.
It's nowhere near complete, but it's better than nothing.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-05 16:06:52 +04:00
Roman 'gryf' Dobosz
12e8f5f498 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:58:14 +03:00
Slava Zanko
8db3c51d36 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:58:09 +03:00
Slava Zanko
0ec92fd0f7 Merge branch '2832_mcedit_safe_save' into 4.8.1-stable
* 2832_mcedit_safe_save:
  Ticket #2832: Fixed mcedit: unable to save changes in "Safe save" mode
2012-09-05 14:49:21 +03:00
Slava Zanko
d60e43a6c9 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:48:57 +03:00
Andrew Borodin
d80f63176b Merge branch '2664_ogm_deprecated' into 4.8.1-stable
* 2664_ogm_deprecated:
  Ticket #2664: ogm extension was deprecated in favor of .ogv.
2012-09-05 13:54:57 +04:00
Andrew Borodin
f068a4228c 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:54:23 +04:00
Andrew Borodin
d85c22b8f9 Update PO files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-30 13:53:12 +04:00
Andrew Borodin
6b41afecbf Allow define keymap file without .keymap extension
...in the command line, environment variable and configuration file.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-30 13:18:46 +04:00
Andrew Borodin
260bd9742d Optimization of ini files load.
Some ini files (keymaps, skins) are loaded in read-only mode. For those
files, we don't need load and keep comments.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-30 13:18:34 +04:00
Andrew Borodin
5e136a8981 mc.keymap.default, mc.keymap.emacs: comment out unassigned commands.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-30 13:18:11 +04:00
Andrew Borodin
b3415de019 Ticket #2848: fixup of user-defined keymap load.
Modify algorithm of keymap files load:
1) Unconditionally load /usr/share/mc/mc.keymap
2) Unconditionally load /etc/mc/mc.keymap
Then load one of following user-defined keymaps, stop on success:
3) set via --keymap command line option
4) set via MC_KEYMAP environment variable
5) set via keymap key in config file
6) ~/.config/mc/mc.keymap

Fix of double load of keymap file if name is same as name of
system-wide keymap file.

Update man pages.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-30 13:15:45 +04:00
Andrew Borodin
d1f465680e lib/widget/input.c: indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-30 13:11:50 +04:00
Andrew Borodin
338d986115 Handle directory history of panel.
Added pointer to the current history item and use to walk in history.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-29 17:26:19 +04:00
Andrew Borodin
a3a1d0a41a Handle history of input line.
Added pointer to the current history item and use to walk in history.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-29 17:26:04 +04:00
Andrew Borodin
957fb141e1 Ticket #2313: CK_History removes CK_HistoryNext entries
Steps to reproduce:

1. traverse through some directories,
2. press alt-y multiple times,
3. press alt-u multiple times,
4. press alt-y again a few times,
5. press alt-shift-h (notice no dirs to forward to), press esc,
6. press alt-u - nothing happens.

Initial step: (directory_history_add): make static and use vfs_path_t as argument.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-29 17:25:08 +04:00
Slava Zanko
5950d638ee Merge branch '2791_path_encoding' into 4.8.1-stable
* 2791_path_encoding:
  Ticket #2791: Fixed: cannot Copy/Move files with filename encoding change
2012-08-29 13:34:15 +03:00