Commit Graph

9142 Commits

Author SHA1 Message Date
Slava Zanko
3518f7c585 Added debug options for --enable-maintainer mode
Also, added extra warnings and now all warnongs threaded as errors.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-28 13:37:40 +02:00
Slava Zanko
c9b4b0159d Ticket #1656: Incorrect processing of cases the lack of rights to save preferences.
In the case where insufficient rights to the contents of the directory ~/.mc/* to
save preferences I get "settings saved in ~ /.mc/ini", but really nothing is saved.

It would be correct to issue a message like "Not enough permissions to save the ~/.mc/ini"

Also, when autosave should be issued a message about the lack of rights.

This branch will check rights of config-files.

testCase:
 *) chmod 0400 ~/.mc
 *) run mc

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-28 13:37:39 +02:00
Andrew Borodin
45d8208ff6 Merge branch '1750_view_next_prev_file'
* 1750_view_next_prev_file:
  Sync argument name of mcview_viewer() function in header and in source files.
  Ticket #1750: fix of view next/prev file in viewer.
2009-10-28 14:32:06 +03:00
Andrew Borodin
00e267c2e0 Sync argument name of mcview_viewer() function in header and in source files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-28 14:31:38 +03:00
Andrew Borodin
3d1114652f Ticket #1750: fix of view next/prev file in viewer.
To view the next (C-f) of previous (C-f) file in viewer,
the quit from viewer is required now.
This commit restores the previous behavior.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-28 14:31:38 +03:00
Slava Zanko
35415bbcd8 Merge branch '1748_tlz_extention'
* 1748_tlz_extention:
  Ticket #1748: lzma archives with .tlz extention are not recognized as archives
2009-10-28 13:01:46 +02:00
Slava Zanko
575f996e0d Ticket #1748: lzma archives with .tlz extention are not recognized as archives
Attempting to open a .tlz lzma archive fails - error 'xxx.tlz doesn't look like a tar archive'.
If the file is renamed to .tar.lzma, it is opened without problems.

Fix issue: add recognize of '.tlz' extention.

Refactoring: avoid calls of strlen() function

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-28 13:00:37 +02:00
Slava Zanko
9c854e73d4 Merge branch '1500_segfault_on_bg_copy'
* 1500_segfault_on_bg_copy:
  Fixed problems:
  Ticket #1500: Segmentation fault while background copying
2009-10-28 12:05:36 +02:00
Alexander Moiseenko
936727622d Fixed problems:
* When try to replace existing file in background operation
  assertion raised (created operations for initialization ctx->ui for background):
  ** (mc:25716): CRITICAL **: file_progress_real_query_replace: assertion `ctx->ui != NULL' failed

 * Process has been already done, but still draw in list (C-x j)

 * Process is stopped or worked, remove operation don't hide process from list, but kill it

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-28 12:05:07 +02:00
Alexander Moiseenko
81f5b5e0b8 Ticket #1500: Segmentation fault while background copying
Test case:
 * create file with name "test" in "tmp" directory (for example)
 * create directory with same name ("test") in other "tmp2" directory (for example)
 * try to copy or move file "test" into "tmp2" in background mode
 * wait for some time

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-28 12:05:06 +02:00
Slava Zanko
720eca3fa3 Merge branch '1642_fstype'
* 1642_fstype:
  Ticket #1642: filegui.c contains Linux-specific things
2009-10-28 10:38:38 +02:00
sfionov
1551db2f9f Ticket #1642: filegui.c contains Linux-specific things
mc 4.7.0-pre1 introduced dynamic "Save attributes" checkbox value in Copy/Move dialog.
But code is Linux-specific, and not even isolated by macros.

I suggest to add code specific for BSD and SVR4 systems.

In BSD systems (MacOS X, NetBSD, FreeBSD) there is statfs.f_fstypename which contains name of filesystem.
Valid FS names are: msdos, msdosfs (FreeBSD), ntfs, smbfs, procfs, fusefs (BSD), fusefs_subfstype (Mac)

In SVR4 systems (Solaris and other SVR4 Unixes) there are statvfs.f_basetype and statvfs
syscall instead of statfs and also autotools define STAT_STATVFS.
Valid FS names are: pcfs, proc, ntfs, fuse, smbfs

(Note that NetBSD 3.0+ also use statvfs but with BSD syntax.)

For all other OSes we simply return 1.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-28 10:38:20 +02:00
Ilia Maslakov
ca79091215 added skin 'Dark FAR' darkfar.ini
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-10-28 08:28:54 +00:00
Slava Zanko
ff860abd70 Merge branch '119_conf_option_preserve_attributes'
* 119_conf_option_preserve_attributes:
  Ticket #119: Persistent global configuration option for "Preserve attributes" wanted
2009-10-27 23:21:31 +02:00
Slava Zanko
27cc9ac15e Ticket #119: Persistent global configuration option for "Preserve attributes" wanted
Currently, there is no way to change the defaults. The file mask
dialog options are not persistent.

Added new config option 'copymove_persistent_attr'. If this option is equal to '0'
then 'Preserve attributes' in copy/move dialog will always switched off.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-27 23:20:48 +02:00
Slava Zanko
2445ccf9b9 Merge branch '1691_minus_signs_in_mans'
* 1691_minus_signs_in_mans:
  Set of patches to escape minus signs in mans by Denis Briand.
2009-10-27 23:00:40 +02:00
Yury V. Zaytsev
6f7f14ab50 Set of patches to escape minus signs in mans by Denis Briand.
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-27 22:53:03 +02:00
Tomasz Pala
6d5cccc623 Ticket #1659: Darker color style (gotar.ini)
This is raw commit into master.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-27 22:45:34 +02:00
Slava Zanko
ea1a2abdf6 Merge branch '1674_syntax_highlightings'
* 1674_syntax_highlightings:
  Fixed error of opening yum *.repo files.
  unknown.syntax to something more useful
  Yacc/Bison syntax added
  added new syntax file 'filehighlight.syntax'; hah
  Syntax file for java .properties format
2009-10-27 20:56:08 +02:00
Slava Zanko
dcd628dda9 Fixed error of opening yum *.repo files.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-27 17:48:54 +02:00
Vladimir
a8d1c9be43 unknown.syntax to something more useful
IMO, it would be nice to use attached unknown.syntax
file from http://mc.linuxinside.com/cgi-bin/dir.cgi instead the current one.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-27 17:48:49 +02:00
SZABO Gergely
09f8afa8b6 Yacc/Bison syntax added
Syntax: file extensions y/ypp/yxx added as Yacc/Bison Parser.
yxx.syntax added based cxx.syntax.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-27 17:48:42 +02:00
Balwinder S Dheeman
dc49f2db3e added new syntax file 'filehighlight.syntax'; hah
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-27 17:48:34 +02:00
thorsky
ea083f119b Syntax file for java .properties format
As the format is basically a set of key/value pairs, but allows a number of ways to write them,
syntax file tries hard to highlight them all correctly. Plus highlights some specific tokens that can be found in values.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-27 17:48:23 +02:00
Slava Zanko
143f078738 Merge branch '1718_suse_b_letter_in_prompt'
* 1718_suse_b_letter_in_prompt:
  Ticket #1718: OpenSuse: Showing 'B' artefact in command line of user 'root'
2009-10-27 14:43:14 +02:00
pavlinux
ad8e1563d4 Ticket #1718: OpenSuse: Showing 'B' artefact in command line of user 'root'
This patch was grabbed from Russian fork (ru-fork). Original commit message:

[COMMAND LINE]:  Fix SUSE gabage, letter B in command prompt under root!  Yessssssss! :)

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-27 14:42:42 +02:00
Ilia Maslakov
467d833ac3 Ticket #46 (mcedit: check POSIX newline at end of file)
* added warning dialog (showed before save/save as)
    * added option "editor_check_new_line"
    * changed dialog 'Edit Save Mode' (added check box 'Check POSIX new line')

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

    * Redesing of 'Edit Save Mode' dialog.
    * Added hotkeys in 'Edit Save Mode' dialog.
    * Modified warning message, minor optimization.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-27 12:08:45 +00:00
Slava Zanko
47ee28f6eb Merge branch '1627_glib_macros_fix'
* 1627_glib_macros_fix:
  Ticket #1627: glib macros fix.
2009-10-27 11:42:43 +02:00
Slava Zanko
bf5b6f368b Ticket #1627: glib macros fix.
This is incomplete copy of same glib-function.
For older glib (less than 2.13) functional is enought.
For full version of glib welcome to glib update.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-27 11:42:19 +02:00
Ilia Maslakov
d449c5f383 Ticket #1724 (fix for mc.keymap)
* fixed keybind for 'ViewMoveToBol', 'ViewMoveToEol'
    'EditScrollUpHighlight', 'EditScrollDownHighlight'
    * fixed hardcoded bindings into keybind.c
2009-10-26 21:29:39 +00:00
Ilia Maslakov
6d311fd852 Ticket #408
menu Command split to Command and Format

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-10-26 15:23:25 +00:00
Andrew Borodin
21fd13bf90 Merge branch 'HACK_menu'
* HACK_menu:
  Added new keybinding files in mc.spec.
  Show actual shortcuts in editor menu.
  Implemented default actual shortcuts for main menu.
  Implemented display of actual shortcuts in main menu.
  Add support for multi-hotkeys in editor (like a ctrl-x,t).
  Added default keybinding strings.
  Added missed '#include "fileloc.h"' in main.c.
  Some refactoring.
  Reimplemented keybindings parser.
  Use commands instead of callbacks to execute menu items.
  Fixed key translation in editor.
  Use commands instead of callbacks to execute menu items.
  Menu fixes and optimization.
  New menu engine: use GList instead of GPtrArray.
  Menu: handle HOME and END keys.
  Ticket #1563: Modified menu engine to create and modify menu dynamically.
2009-10-26 16:23:42 +03:00
Andrew Borodin
b1994a1cc8 Added new keybinding files in mc.spec.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:32 +03:00
Andrew Borodin
7e33c12685 Show actual shortcuts in editor menu.
Key emulation in editor was removed. Default key emulation
is stored in misc/mc.keymap.default file. Emacs key emulation
is stored in misc/mc.keymap.emacs.
Editor options dialog was redesigned.
Shortcut parser was fixed.
Fixes after rebase to recent master.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:32 +03:00
Andrew Borodin
729d4f08a9 Implemented default actual shortcuts for main menu.
Some functions and commands are renamed.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Andrew Borodin
41989bd0c6 Implemented display of actual shortcuts in main menu.
Many shortcuts are not defined in keymap file and therefore
not displayed in menu.

Editor menu is not reimplemented yet.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Ilia Maslakov
82b7c4fdee Add support for multi-hotkeys in editor (like a ctrl-x,t).
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-10-26 16:15:31 +03:00
Andrew Borodin
e5feeea8d9 Added default keybinding strings.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Andrew Borodin
89336afb6b Added missed '#include "fileloc.h"' in main.c.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Andrew Borodin
b4b30941f5 Some refactoring.
Renamed name_key_map_t to name_keymap_t.
Renamed global_key_map_t to global_keymap_t.
Use more '#ifdef USE_INTERNAL_EDIT' preprocessor directives
Removed unused variables and structure members.
Aplly const modificator to keybind argument of keybind_cmd_bind().
Aplly const modificator to keyname argument of lookup_action().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Ilia Maslakov
de56559df5 Reimplemented keybindings parser.
New parser allows get the string representation of menu shortcuts.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-10-26 16:15:31 +03:00
Andrew Borodin
095fc65580 Use commands instead of callbacks to execute menu items.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Andrew Borodin
4a02baa202 Fixed key translation in editor.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Andrew Borodin
b3b332083c Use commands instead of callbacks to execute menu items.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Andrew Borodin
e73664d966 Menu fixes and optimization.
Fixed hotkey handling.
Optimized call of menu item callback.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Andrew Borodin
c47d2d20d7 New menu engine: use GList instead of GPtrArray.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Andrew Borodin
83b855027e Menu: handle HOME and END keys.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Andrew Borodin
7f7bc452e3 Ticket #1563: Modified menu engine to create and modify menu dynamically.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-10-26 16:15:31 +03:00
Slava Zanko
a563b5d429 Merge branch '1715_i18n_duplicate'
* 1715_i18n_duplicate:
  Ticket #1715: Sort types: duplicate of i18n strings
2009-10-26 12:13:16 +02:00
Slava Zanko
11a54c7edf Ticket #1715: Sort types: duplicate of i18n strings
Avoid translations duplicates of sort type names.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-10-26 12:08:12 +02:00