Commit Graph

11778 Commits

Author SHA1 Message Date
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
nafraf
b69d41d127 Ticket #2542: assembler.syntax: x86 AMD64 registers highlighting.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-27 09:55:29 +04:00
Victor Homyakov
3a055b4d7c 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-27 09:40:50 +04:00
Andrew Borodin
0467c6a435 Merge branch '2852_ext_d_fixes'
* 2852_ext_d_fixes:
  Ticket #2851: fixes of ext.d scripts:
2012-07-22 11:19:20 +04:00
Andrew Borodin
d099c36a98 Ticket #2851: fixes of ext.d scripts:
* cleanup of undefined variables;
  * use proper variables instead of udefine ones.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-21 16:39:05 +04:00
Andrew Borodin
488c3f3500 misc/mc.ext.in: update change description.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-20 12:01:49 +04:00
Slava Zanko
4fe8565252 Merge branch '2838_spaces_in_rpm'
* 2838_spaces_in_rpm:
  Ticket #2838: Fixed 'Enter' action on a rpm file containing space character in filename
2012-07-19 12:14:03 +03:00
Slava Zanko
7ddc29649b 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 11:17:16 +03:00
Andrew Borodin
3fe3f60d75 doc/NEWS: cosmetics and forgotten #2768
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-19 11:07:11 +04:00
Slava Zanko
034b796206 Updated NEWS file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-07-18 13:30:09 +03:00
Slava Zanko
ea8ead958e Updated translations from Transifex
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-07-18 13:24:25 +03:00
Andrew Borodin
acdac76a49 Revert "Try fix of compile warnings about assigned but unused variables"
This reverts commit 6505f7d6fa.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-18 12:03:31 +04:00
Andrew Borodin
03916ee15b Merge branch '2845_cleanup'
* 2845_cleanup:
  Clarify cvs dependency.
  (mcview_moveto_eol): comparison of unsigned expression < 0 fixup.
  Makefile.ams cleanup.
  Code indentation.
  Try fix of compile warnings about assigned but unused variables
  Code cleanup: removed unused variables amd removed unnedeed code.
  (exec_extension): ret rid of double filename conversion.
  Ticket #2839: Fix keybindings for Quit command of mcedit.
  Tweak of select codepage code in case of --disable-charset
  Fix of 'External panelize' dialog: update of 'Command' field content after mouse click.
  Fix of f13 key handling.
  Fix typos.
  Ticket #2538: mcviewer: unused result of str_term_width1().
  src/filemanager/mountlist.c: apply mc code indentation policy.
  Ticket #2845: code cleanup before 4.8.4 release.
2012-07-17 17:04:42 +04:00
Andrew Borodin
bafd8e7f8a Clarify cvs dependency.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Andrew Borodin
79b44e6be2 (mcview_moveto_eol): comparison of unsigned expression < 0 fixup.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Andrew Borodin
b37af47023 Makefile.ams cleanup.
Set defines via CPPFLAGS variable not via CFLAGS one.
Use AM_CPPFLAGS and AM_CFLAGS variables instead of per-target ones.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Slava Zanko
94bd4b1f78 Code indentation.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-07-17 17:04:05 +04:00
Slava Zanko
6505f7d6fa Try fix of compile warnings about assigned but unused variables
...as returned values of functions declared with attribute
warn_unused_result [-Wunused-result].

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-07-17 17:04:05 +04:00
Andrew Borodin
23c95d36ac Code cleanup: removed unused variables amd removed unnedeed code.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Andrew Borodin
71ebcc5896 (exec_extension): ret rid of double filename conversion.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Andrew Borodin
9cf11516fc Ticket #2839: Fix keybindings for Quit command of mcedit.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Andrew Borodin
fec326f641 Tweak of select codepage code in case of --disable-charset
...in mceditor, mcviewer and mcdiffviewer.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Ilia Maslakov
973aae2b5e Fix of 'External panelize' dialog: update of 'Command' field content after mouse click.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-07-17 17:04:05 +04:00
Andrew Borodin
40d6e96471 Fix of f13 key handling.
ViewFile doesn't have the default key, and f13 is key for ViewRaw
which is handled in panel not.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Andrew Borodin
14a4eefc43 Fix typos.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Pavel Vasilyev
2c4562d759 Ticket #2538: mcviewer: unused result of str_term_width1().
And reduce size of buffer used to show file size.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Slava Zanko
16a624db07 src/filemanager/mountlist.c: apply mc code indentation policy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Andrew Borodin
e3b36c8b3d Ticket #2845: code cleanup before 4.8.4 release.
Sync with gnulib 06b335ade65c8fe60fee8b9e18b670bb54ed924a:

Write "Mac OS X" instead of "MacOS X".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:04:05 +04:00
Andrew Borodin
78ab34ae9f Update po/mc.pot file.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-12 22:16:21 +04:00
Andrew Borodin
527bea807b Merge branch '2788_mcedit_aspell'
* 2788_mcedit_aspell:
  Remove misc/edit.spell.rc since aspell is supported by mcedit directly.
  Ticket #2788 (aspell support)
2012-07-12 16:06:20 +04:00
Andrew Borodin
3d4ed51b7c Remove misc/edit.spell.rc since aspell is supported by mcedit directly.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-12 16:00:49 +04:00
Ilia Maslakov
1d4ca9608a Ticket #2788 (aspell support)
Add aspell support for internal editor.
The aspell library is dinamycally loaded.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-07-12 16:00:45 +04:00
Andrew Borodin
54b2b2fe67 Merge branch '2843_search_hotkey_conflict'
* 2843_search_hotkey_conflict:
  Ticket #2842: change hotkey for Normal search mode.
2012-07-10 20:59:21 +04:00
Andrew Borodin
562ef41b15 Ticket #2842: change hotkey for Normal search mode.
In Search dialog in mcedit M-n hotkey was used for normal search mode.
Therefore, M-n as HistoryPrev in the input line was in accessible.

Change hotkey for normal seach mode to M-r. Use this hotkey for normal diff
mode in mcdiffviewer to unify i18n resources.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-08 16:27:48 +04:00
Slava Zanko
04bce06ce4 Merge branch '1535_vfs_sftp_fixes'
* 1535_vfs_sftp_fixes:
  Add SFTP to the list of supported VFSes.
  SFTP connections are shown now in 'Active VFS connections' list.
  Fixed reget support in SFTP.
  Ticket #1535: configure: don't fail if 'sftp' support was not requested explicitly
2012-07-05 10:35:55 +03:00
Andrew Borodin
3786051314 Add SFTP to the list of supported VFSes.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-05 10:34:30 +03:00
Slava Zanko
8f15940f50 SFTP connections are shown now in 'Active VFS connections' list.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-07-05 10:34:30 +03:00
Andrew Borodin
4841bc608a Fixed reget support in SFTP.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-05 10:34:30 +03:00
Sergei Trofimovich
bd59cea6ad Ticket #1535: configure: don't fail if 'sftp' support was not requested explicitly
Before the patch default ./configure led to configure crash:
    checking for LIBSSH... no
    configure: error: libssh2 >= 1.2.5 library not found

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
2012-07-05 10:34:30 +03:00
Andrew Borodin
a343070843 Merge branch '2825_solaris_statvfs_members'
* 2825_solaris_statvfs_members:
  Ticket #2825: obtain FS name from stat info: sync with coreutils.
2012-07-02 20:50:41 +04:00