diff --git a/ChangeLog b/ChangeLog index a1dba5d89..f939011e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2002-08-18 Pavel Roskin + * lib/mc.ext.in: Try links before lynx. Force full path when + invoking X11 browsers - it breaks VFS, but VFS support in mc.ext + is already broken if the program starts in background. Add a + comment discouraging taking this code as example. + * doc/mc.1.in (Controlling Midnight Commander): Remove, it's obsolete. * doc/es/mc.1.in: Likewise. diff --git a/lib/mc.ext.in b/lib/mc.ext.in index 2d9878cf9..fa8149cb6 100644 --- a/lib/mc.ext.in +++ b/lib/mc.ext.in @@ -280,11 +280,13 @@ type/^PDF #Open=(ghostview %f &) View=%view{ascii} pdftotext %f - +# The following code very ugly and should not be taken as example. +# It should be cleaned up when the new format of mc.ext is developed. + # html regex/\.([Hh]tml?|HTML?)$ - #Open=if echo "%d/%p" | grep ^ftp; then $viewer %d/%p; else $viewer file:%p; fi - Open=if test -n "@X11_WWW@" && test -n "$DISPLAY"; then echo @X11_WWW@ %f; (@X11_WWW@ %f &) >/dev/null 2>&1; else lynx -force_html %f; fi - View=%view{ascii} lynx -dump -force_html %f + Open=if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) >/dev/null 2>&1; else links %f || lynx -force_html %f; fi + View=%view{ascii} links -dump %f || lynx -dump -force_html %f # StarOffice and OpenOffice shell/.sdw