Commit Graph

11917 Commits

Author SHA1 Message Date
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
Andrew Borodin
d07af4a374 (edit_find_word_start): return gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:24 +04:00
Andrew Borodin
6040d5c17a (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-08-27 16:16:24 +04:00
Andrew Borodin
7d2975a53e (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-08-27 16:16:24 +04:00
Andrew Borodin
70528dc30a (edit_save_block): return gboolean instead of int.
(edit_save_block_cmd): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:24 +04:00
Andrew Borodin
2453f82bbd (editcmd_dialog_raw_key_query): take gboolean instead of boolean.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:24 +04:00
Andrew Borodin
32d32996fd (edit_mark_cmd): take gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:24 +04:00
Andrew Borodin
30e185bb69 WEdit::caches_valid: change int to gboolean.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:23 +04:00
Andrew Borodin
d3b7b5987b (is_in_indent): refactoring, return gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:23 +04:00
Andrew Borodin
dc9df84693 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-08-27 16:16:23 +04:00
Slava Zanko
b3258da868 Update PO-files
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 11:26:45 +03:00
Slava Zanko
3bc09cc253 Merge branch '2103_mcext_enhancement'
* 2103_mcext_enhancement:
  Added support of viewing the compiled Java files (*.class).
  changed type of checking: used -n operator instead of -z
  Added support of SQLite database files
  Ticket #2103: mc.ext enhancement
2012-08-27 11:13:29 +03:00
Slava Zanko
b03da1c3b3 Added support of viewing the compiled Java files (*.class).
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 11:11:05 +03:00
Slava Zanko
aa5ffa2b87 changed type of checking: used -n operator instead of -z
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 11:11:05 +03:00
Slava Zanko
8498c6afe0 Added support of SQLite database files
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 11:11:05 +03:00
Slava Zanko
ce07bec728 Ticket #2103: mc.ext enhancement
This commit makes a few improvements in default bindings:

 * use chm_http text-mode handler for CHM files;
 * play sounds only from videos in text mode;
 * use pdftotext -layout -nopgbrk switches;
 * try to use elinks before links for HTML;
 * soffice2html text-mode handler for SXW files;
 * wvHtml text-mode handler for doc files;
 * xlhtml text-mode handler for XLS files;
 * ppthtml text-mode handler for PPT/PPS files;
 * open=view+pager fallback (noX) for PostScript, PDF, OD[PST] and DVI;
 * standarized $DISPLAY checks.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 11:11:05 +03:00
Slava Zanko
ff096a3e3a Merge branch '2835_treeview'
* 2835_treeview:
  Ticket #2835: Fixed duplicate entities in panel with 'tree view' mode
2012-08-23 13:06:55 +03:00
Slava Zanko
64af4886d6 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-22 16:53:16 +03:00
Ilia Maslakov
4bfa681069 Merge branch '2859_mcedit_ctags_segfault'
* 2859_mcedit_ctags_segfault:
  Ticket #2859 (mcedit ctags fix)
2012-08-21 13:10:53 +04:00
Ilia Maslakov
73c85ed015 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 13:07:54 +04:00
Andrew Borodin
14cd4fce0a Merge branch '2849_without_prefix'
* 2849_without_prefix:
  Ticket #2849: bad EXTHELPERSDIR substitution if --prefix is not used.
2012-08-06 13:21:22 +04:00
Andrew Borodin
596203f9a9 Ticket #2849: bad EXTHELPERSDIR substitution if --prefix is not used.
If --prefix is not set in command line, EXTHELPERSDIR was expanded to
NONE/libexec/mc/ext.d in misc/mc.ext and misc/ext.d/Makefile.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-06 13:21:05 +04:00
Andrew Borodin
98d5b21c87 Merge branch '2856_aspell_segfault'
* 2856_aspell_segfault:
  Ticket #2856: Fixed mceditor 4.8.4 segfaults when aspell dictionaries aren't installed
2012-08-05 19:40:00 +04:00
Slava Zanko
105ac777e1 Ticket #2856: Fixed mceditor 4.8.4 segfaults when aspell dictionaries aren't installed
Steps to reproduce:
 * compile mc with aspell support
 * remove all aspell's dictionaries
 * run mc and try to open any file in the internal editor
 * close the error dialog
 * try to exit from editor

Expected behaviour: a file panels should be shown
Actual behaviour: the segfault here.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-05 19:39:41 +04:00
Andrew Borodin
ed6cf8e3ad Merge branch '2854_panel_history_refresh'
* 2854_panel_history_refresh:
  Ticket #2854: panel was not refreshed if panel history is called using mouse.
2012-08-05 17:23:01 +04:00
Andrew Borodin
e31e41e04a Ticket #2854: panel was not refreshed if panel history is called using mouse.
If call panel history using mouse (click on [^] icon on panel top frame)
and then select any path from history, panel was not refreshed to show
actual file list in the new current directory.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-05 17:22:39 +04:00
Andrew Borodin
bcfb8c8f98 Merge branch '2250_mcext_case_insense'
* 2250_mcext_case_insense:
  Implement case insensitive for type keyword.
  Use shell instead of regex for simple regular expressions.
  Implement case insensitive for shell keyword.
  Implement case insensitive for regex keyword.
  Ticket #2250: implement case-insensitive patterns in mc.ext.
2012-08-05 13:42:08 +04:00
Slava Zanko
b71f35ee60 Implement case insensitive for type keyword.
type/i is used now for case-insensitive type patterns.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-03 15:16:18 +04:00
Andrew Borodin
ca6be65562 Use shell instead of regex for simple regular expressions.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-03 15:16:18 +04:00
Andrew Borodin
81c3d80f4b Implement case insensitive for shell keyword.
shell/i is used now for case-insensitive shell patterns.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-03 15:16:17 +04:00
Andrew Borodin
cbcae18836 Implement case insensitive for regex keyword.
regex/i is used now for case-insensitive regular expressions.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-03 15:16:17 +04:00
Andrew Borodin
97cd63b9fd Ticket #2250: implement case-insensitive patterns in mc.ext.
(regex_command): minor cleanup and refacroring.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-03 15:16:17 +04:00
Andrew Borodin
06e874ea21 Merge branch '2853_mcedit_filepos'
* 2853_mcedit_filepos:
  Ticket #2853: standalone mcedit doesn't load saved file position.
2012-08-03 10:56:52 +04:00
Andrew Borodin
e39c697df4 Ticket #2853: standalone mcedit doesn't load saved file position.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-03 10:56:32 +04:00
Andrew Borodin
849fe8e4b1 Merge branch '2848_keymap_load'
* 2848_keymap_load:
  Allow define keymap file without .keymap extension
  Optimization of ini files load.
  mc.keymap.default, mc.keymap.emacs: comment out unassigned commands.
  Ticket #2848: fixup of user-defined keymap load.
2012-07-31 14:50:33 +04:00
Andrew Borodin
98564b91a1 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-07-31 14:50:11 +04:00
Andrew Borodin
908e747861 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-07-31 14:50:11 +04:00
Andrew Borodin
09427eacad mc.keymap.default, mc.keymap.emacs: comment out unassigned commands.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-31 14:50:11 +04:00
Andrew Borodin
99ead577f7 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-07-31 14:50:11 +04:00
Andrew Borodin
23ad3ecda1 Merge branch '2858_mcview_html_segfault'
* 2858_mcview_html_segfault:
  Ticket #2858: segfault when viewing HTML files with "mc -v".
2012-07-31 14:24:54 +04:00
Andrew Borodin
e2f30017a0 Ticket #2858: segfault when viewing HTML files with "mc -v".
(expand_format): don't try expand format and return empty line
for modes that are not used formatted variables.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-30 10:14:46 +04:00
Sergei Trofimovich
ab05b54337 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-28 10:40:40 +03:00
Andrew Borodin
3c17a08e00 ru/mc.1: fix formatting.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-27 12:02:43 +04:00
Andrew Borodin
068a2e56e2 mc.keymap.emacs: fix of LinkSymbolicRelative keymap.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-27 10:35:40 +04:00
Leonid Krivoshein
ed51e5830f Ticket #2649: dlink.syntax: syntax highlighting for D-Link switches command set.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-27 10:17:11 +04:00
Ralesk
cac767fc44 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-07-27 10:06:32 +04:00