b575a4c142
- update to 4.8.22 * Core - Support BTRFS's file clone operation - Find file: show pattern and content in the results window title - Find file: remember state (empty or not) of Content field - Improve support IBM i - Improve handling of hard link creation errors - Support user-defined prompt in the Fish subshell * VFS - sftp: preserve atime and mtime (#3917) * Editor - man page cleanup (#3918) - syntax: PHP - highlight keyword 'null' (#3920) Meson - initial implementation (#3940) * Misc - ext.d: use MPV as a fallback for mplayer -identify (#3919) - ext.d: improve recognition of MS Office formats (#3929) * Fixes - "Cannot create target file" when target has backslash space in the name (#3923) - Quiet single file overwrite (#3908) - Show error message for each not-installed program when view documents in MS Word and Excel formats (#3926) - Crash when trying some sftp connections (#3937) - Crash when return to filemanager from subshell (#3943) - mc-extd-doc.patch: refreshed - mc-extd-video.patch: refreshed - mc-vfs-fish-deleted_source_file.patch: refreshed - xls2csv_update.patch: refreshed OBS-URL: https://build.opensuse.org/request/show/666258 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=124
23 lines
854 B
Diff
23 lines
854 B
Diff
Index: misc/ext.d/doc.sh.in
|
|
===================================================================
|
|
--- misc/ext.d/doc.sh.in.orig
|
|
+++ misc/ext.d/doc.sh.in
|
|
@@ -52,7 +52,7 @@ do_view_action() {
|
|
fi
|
|
;;
|
|
msdoc)
|
|
- if wvHtml >/dev/null 2>&1; then
|
|
+ if wvHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1; then
|
|
tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX`
|
|
wvHtml "${MC_EXT_FILENAME}" --targetdir="$tmp" page.html
|
|
elinks -dump "$tmp/page.html"
|
|
@@ -68,7 +68,7 @@ do_view_action() {
|
|
fi
|
|
;;
|
|
msxls)
|
|
- if xlhtml >/dev/null 2>&1; then
|
|
+ if xlhtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1; then
|
|
tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX`
|
|
xlhtml -a "${MC_EXT_FILENAME}" > "$tmp/page.html"
|
|
elinks -dump "$tmp/page.html"
|