Added feature for the mcdiff for the bidirectional merge.
With F15 mcdiffviewer merge left panel to right panel direction.
original patch by Gergely Szasz <szaszg@hu.inter.net>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
added bind "MergeOther" into mc.keymap.default, mc.keymap.emacs.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
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>
...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>
* 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.
* 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
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>
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>
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>
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>
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>
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>
* 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.
