Commit Graph

11659 Commits

Author SHA1 Message Date
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
Slava Zanko
a1719d12cd 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:33:49 +03:00
Slava Zanko
9da517a169 Fixed OGV file extention handle.
Currently OGV files handles as video.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-29 13:06:34 +03:00
Andrew Borodin
fe7d00a4c7 Merge branch '2862_tree_refresh_fix' into 4.8.1-stable
* 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:26:32 +04:00
Andrew Borodin
dc52b3488d Fix of memory leak in TreeStore::check_name destruction.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-29 10:25:22 +04:00
Andrew Borodin
7ede081a14 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:25:21 +04:00
Slava Zanko
53f04a6677 Merge branch '2835_treeview' into 4.8.1-stable
* 2835_treeview:
  Ticket #2835: Fixed duplicate entities in panel with 'tree view' mode
2012-08-23 13:09:46 +03:00
Slava Zanko
fb00cfc95a Ticket #2835: Fixed duplicate entities in panel with 'tree view' mode
Steps to reproduce:

 * run mc
 * go to 'F9 -> left/right panel -> Tree'

Expected result: unique directory names.

Actual result: duplicate directory names
(one name with leading slash, second directory name without leading slash).

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-23 13:09:34 +03:00
Ilia Maslakov
da9eda40a9 Ticket #2859 (mcedit ctags fix)
How to reproduce:

    on sources: ctags -R .
    with tags in current dir open any file (needn't be C source or headers)
    Alt- (i.e. alt minus or Esc '-')

Current result: sigsegv

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-08-21 15:26:21 +04:00
Andrew Borodin
8f0ae5c2d5 Merge branch '2847_view_rar' into 4.8.1-stable
* 2847_view_rar:
  Ticket #2847: use unrar to view RAR archives if rar is unavailable.
2012-08-20 21:09:31 +04:00
Andrew Borodin
77105e3233 Ticket #2847: use unrar to view RAR archives if rar is unavailable.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-20 21:09:19 +04:00
Sergei Trofimovich
85a2e70c46 po: added 'et' and 'de_CH' missing from translation
Reported-by: Mart Raudsepp <leio@gentoo.org>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
2012-07-31 14:31:26 +04:00
Andrew Borodin
bf3dd9058e ru/mc.1: fix formatting.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-31 14:31:00 +04:00
Andrew Borodin
4c66451f19 mc.keymap.emacs: fix of LinkSymbolicRelative keymap.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-31 14:30:49 +04:00
nafraf
d5fceb9310 Ticket #2542: assembler.syntax: x86 AMD64 registers highlighting.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-31 14:29:53 +04:00
Victor Homyakov
1d82709c48 Ticket #1869: properties.syntax colors are difficult to read.
Syntax file properties.syntax used very dark color for keys (cyan is
almost invisible on default MC background), and bright color for
delimiters (yellow), which made highlighted file difficult to read.

Change keys color to yellow.
Change delimeters color to bright cyan.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-31 14:27:54 +04:00
Slava Zanko
da584eacc0 Merge branch '2838_spaces_in_rpm' into 4.8.1-stable
* 2838_spaces_in_rpm:
  Ticket #2838: Fixed 'Enter' action on a rpm file containing space character in filename
2012-07-19 12:44:00 +03:00
Slava Zanko
5484367e53 Ticket #2838: Fixed 'Enter' action on a rpm file containing space character in filename
Test case:
 * cp /path/to/any-file.rpm '/tmp/a n y - f i l e.rpm'
 * run /usr/bin/mc, go to /tmp
 * Press Enter on 'a n y - f i l e.rpm' file

Expected result: mc should be entered to RPM package as in directory

Actual result: gor errors:
Inconsistent extfs archive
error: open of /tmp/a\ failed: No such file or directory
...
error: open of e.rpm failed: No such file or directory
-r--r--r-- 1 root root 0 Jun 29 15:12 ERROR

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-07-19 12:16:14 +03:00