Merging upstream version 3:4.8.31.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

42 files changed, 168 insertions, 72 deletions

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 783bd1e..929e50d 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -136,7 +136,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \
-	$(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \
+	$(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \
diff --git a/misc/ext.d/Makefile.in b/misc/ext.d/Makefile.in
index 61fc57a..441152d 100644
--- a/misc/ext.d/Makefile.in
+++ b/misc/ext.d/Makefile.in
@@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \
-	$(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \
+	$(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \
diff --git a/misc/ext.d/archive.sh b/misc/ext.d/archive.sh
index 840fd47..12beb01 100755
--- a/misc/ext.d/archive.sh
+++ b/misc/ext.d/archive.sh
@@ -32,6 +32,9 @@ do_view_action() {
     lzma)
         lzma -dc "${MC_EXT_FILENAME}" 2>/dev/null
         ;;
+    lzo)
+        lzop -dc "${MC_EXT_FILENAME}" 2>/dev/null
+        ;;
     xz)
         xz -dc "${MC_EXT_FILENAME}" 2>/dev/null
         ;;
@@ -65,6 +68,10 @@ do_view_action() {
         lzma -dc "${MC_EXT_FILENAME}" 2>/dev/null | \
             tar tvvf -
         ;;
+    tar.lzo|tzo)
+        lzop -dc "${MC_EXT_FILENAME}" 2>/dev/null | \
+            tar tvvf -
+        ;;
     tar.xz)
         xz -dc "${MC_EXT_FILENAME}" 2>/dev/null | \
             tar tvvf -
@@ -114,6 +121,10 @@ do_view_action() {
         lz4 -dc "${MC_EXT_FILENAME}" | \
             cpio -itv 2>/dev/null
         ;;
+    cpio.lzo)
+        lzop -dc "${MC_EXT_FILENAME}" | \
+            cpio -itv 2>/dev/null
+        ;;
     cpio.xz)
         xz -dc "${MC_EXT_FILENAME}" | \
             cpio -itv 2>/dev/null
@@ -177,6 +188,9 @@ do_open_action() {
     lzma)
         lzma -dc "${MC_EXT_FILENAME}" | ${pager}
         ;;
+    lzo)
+        lzop -dc "${MC_EXT_FILENAME}" | ${pager}
+        ;;
     xz)
         xz -dc "${MC_EXT_FILENAME}" | ${pager}
         ;;
diff --git a/misc/ext.d/image.sh b/misc/ext.d/image.sh
index 04307e0..c191225 100755
--- a/misc/ext.d/image.sh
+++ b/misc/ext.d/image.sh
@@ -12,14 +12,19 @@ do_view_action() {
     filetype=$1
 
     case "${filetype}" in
-    jpeg)
-        identify "${MC_EXT_FILENAME}"
-        which exif >/dev/null 2>&1 && exif "${MC_EXT_FILENAME}" 2>/dev/null
-        ;;
     xpm)
-        sxpm "${MC_EXT_FILENAME}"
+        [ -n "$DISPLAY" ] && sxpm "${MC_EXT_FILENAME}"
         ;;
     *)
+        if which exif >/dev/null 2>&1; then
+            exif "${MC_EXT_FILENAME}" 2>/dev/null
+            E=$?
+        else
+            E=1
+        fi
+        if [ $E != 0 ] && which exiftool >/dev/null 2>&1; then
+            exiftool "${MC_EXT_FILENAME}" 2>/dev/null
+        fi
         identify "${MC_EXT_FILENAME}"
         ;;
     esac
diff --git a/misc/ext.d/text.sh.in b/misc/ext.d/text.sh.in
index 2bd6ca0..357f9e1 100644
--- a/misc/ext.d/text.sh.in
+++ b/misc/ext.d/text.sh.in
@@ -31,6 +31,9 @@ get_unpacker() {
     man.lzma)
         unpacker="lzma -dc"
         ;;
+    man.lzo)
+        unpacker="lzop -dc"
+        ;;
     man.xz)
         unpacker="xz -dc"
         ;;
@@ -67,7 +70,7 @@ do_view_action() {
     nroff.ms)
         nroff @MAN_FLAGS@ -ms "${MC_EXT_FILENAME}"
         ;;
-    man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.xz|man.zst)
+    man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.lzo|man.xz|man.zst)
         case "${MC_EXT_FILENAME}" in
         */log/*|*/logs/*)
             ${unpacker} "${MC_EXT_FILENAME}"
@@ -114,7 +117,7 @@ do_open_action() {
     nroff.ms)
         nroff @MAN_FLAGS@ -ms "${MC_EXT_FILENAME}" | ${pager}
         ;;
-    man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.xz|man.zst)
+    man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.lzo|man.xz|man.zst)
         case "${MC_EXT_FILENAME}" in
         */log/*|*/logs/*)
             ${unpacker} "${MC_EXT_FILENAME}"
diff --git a/misc/filehighlight.ini b/misc/filehighlight.ini
index c31f562..2882423 100644
--- a/misc/filehighlight.ini
+++ b/misc/filehighlight.ini
@@ -25,7 +25,7 @@
     regexp=(^#.*|.*~$)
 
 [archive]
-    extensions=7z;Z;ace;apk;arc;arj;ark;bz2;cab;cpio;deb;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzst;vsix;xz;zip;zoo;zst
+    extensions=7z;Z;ace;apk;arc;arj;ark;bz2;cab;cpio;deb;gz;lha;lz;lz4;lzh;lzma;lzo;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzo;tzst;vsix;xz;zip;zoo;zst
 
 [doc]
     extensions=chm;css;ctl;diz;doc;docm;docx;dtd;fodg;fodp;fods;fodt;htm;html;json;letter;lsm;mail;man;markdown;md;me;mkd;msg;nroff;odg;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt
diff --git a/misc/macros.d/Makefile.in b/misc/macros.d/Makefile.in
index 23206dc..808e941 100644
--- a/misc/macros.d/Makefile.in
+++ b/misc/macros.d/Makefile.in
@@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \
-	$(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \
+	$(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \
diff --git a/misc/mc.default.keymap b/misc/mc.default.keymap
index 34df586..6e7e8bd 100644
--- a/misc/mc.default.keymap
+++ b/misc/mc.default.keymap
@@ -50,7 +50,7 @@ ScreenList = alt-prime
 # EditExtensionsFile =
 # EditFileHighlightFile =
 # Filter =
-# ConnectFish =
+# ConnectShell =
 # ConnectFtp =
 # Undelete =
 EditorViewerHistory = alt-shift-e
diff --git a/misc/mc.emacs.keymap b/misc/mc.emacs.keymap
index d5071ab..53c4749 100644
--- a/misc/mc.emacs.keymap
+++ b/misc/mc.emacs.keymap
@@ -50,7 +50,7 @@ ScreenList = alt-prime
 # EditExtensionsFile =
 # EditFileHighlightFile =
 # Filter =
-# ConnectFish =
+# ConnectShell =
 # ConnectFtp =
 # Undelete =
 EditorViewerHistory = alt-shift-e
diff --git a/misc/mc.ext.ini.in b/misc/mc.ext.ini.in
index 87dc1d2..c2152ee 100644
--- a/misc/mc.ext.ini.in
+++ b/misc/mc.ext.ini.in
@@ -26,8 +26,8 @@
 # Section [Include/xxxx] can be located as before as after sections that point to it.
 #
 # Sections are processed from top to bottom, thus the order is important.
-# If there are more than one sections with the same name in this file, the first
-# section will be used.
+# Multiple sections with the same name are allowed, they are merged together.
+# Sections may contain the same key multiple times; the last entry wins.
 #
 # [Default] should be a catch-all action and come last.
 #
@@ -57,8 +57,12 @@
 #            the literal | and | has a special meaning (or), and () have a special meaning
 #            and \( \) stand for literal ( ).
 #
+#            An unescaped backslash \ is handled as invalid escape sequences in glib = 2.77.3 and
+#            glib >= 2.79 (https://gitlab.gnome.org/GNOME/glib/-/issues/3094), therefore backslash
+#            must be escaped.
+#
 #            Example:
-#                Regex=\.t(ar\.lzma|lz)$
+#                Regex=\\.t(ar\\.lzma|lz)$
 #            matches *.tar.lzma or *.tlz.
 #
 #        RegexIgnoreCase [true|false]
@@ -188,7 +192,7 @@ Version=4.0
 
 ### GIT Repo ###
 [gitfs changeset]
-Regex=^\[git\]
+Regex=^\\[git\\]
 Open=%cd %p/changesetfs://
 View=%cd %p/patchsetfs://
 
@@ -200,7 +204,7 @@ View=%cd %p/patchsetfs://
 
 # .tgz, .tpz, .tar.gz, .tar.z, .tar.Z
 [tar.gzip]
-Regex=\.t([gp]?z|ar\.g?[zZ])$
+Regex=\\.t([gp]?z|ar\\.g?[zZ])$
 Include=tar.gz
 
 [ipk]
@@ -217,13 +221,13 @@ Shell=.tar.bz
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.bzip
 
 [tar.bzip2]
-Regex=\.t(ar\.bz2|bz2?|b2)$
+Regex=\\.t(ar\\.bz2|bz2?|b2)$
 Open=%cd %p/utar://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.bzip2
 
 # .tar.lzma, .tlz
 [tar.lzma]
-Regex=\.t(ar\.lzma|lz)$
+Regex=\\.t(ar\\.lzma|lz)$
 Open=%cd %p/utar://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lzma
 
@@ -234,19 +238,25 @@ View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lz
 
 # .tar.lz4, .tlz4
 [tar.lz4]
-Regex=\.t(ar\.lz4|lz4)$
+Regex=\\.t(ar\\.lz4|lz4)$
 Open=%cd %p/utar://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lz4
 
+# .tar.lzo, .tzo
+[tar.lzo]
+Regex=\\.t(ar\\.lzo|zo)$
+Open=%cd %p/utar://
+View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lzo
+
 # .tar.xz, .txz
 [tar.xz]
-Regex=\.t(ar\.xz|xz)$
+Regex=\\.t(ar\\.xz|xz)$
 Open=%cd %p/utar://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.xz
 
 # .tar.zst, .tzst
 [tar.zst]
-Regex=\.t(ar\.zst|zst)$
+Regex=\\.t(ar\\.zst|zst)$
 Open=%cd %p/utar://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.zst
 
@@ -258,7 +268,7 @@ View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.F
 
 # .qpr/.qpk - QNX Neutrino package installer files
 [tar.qpr]
-Regex=\.qp[rk]$
+Regex=\\.qp[rk]$
 Open=%cd %p/utar://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.qpr
 
@@ -269,7 +279,7 @@ Open=%cd %p/utar://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar
 
 [arj]
-Regex=\.a(rj|[0-9][0-9])$
+Regex=\\.a(rj|[0-9][0-9])$
 RegexIgnoreCase=true
 Open=%cd %p/uarj://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view arj
@@ -287,7 +297,7 @@ Open=%cd %p/uha://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ha
 
 [rar]
-Regex=\.r(ar|[0-9][0-9])$
+Regex=\\.r(ar|[0-9][0-9])$
 RegexIgnoreCase=true
 Open=%cd %p/urar://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view rar
@@ -314,6 +324,11 @@ Shell=.cpio.lz4
 Open=%cd %p/ucpio://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view cpio.lz4
 
+[cpio.lzo]
+Shell=.cpio.lzo
+Open=%cd %p/ucpio://
+View=%view{ascii} @EXTHELPERSDIR@/archive.sh view cpio.lzo
+
 [cpio.xz]
 Shell=.cpio.xz
 Open=%cd %p/ucpio://
@@ -335,7 +350,7 @@ ShellIgnoreCase=true
 Include=cpio
 
 [initrd]
-Regex=^(initramfs.*\.img|initrd(-.+)?\.img(-.+)?)$
+Regex=^(initramfs.*\\.img|initrd(-.+)?\\.img(-.+)?)$
 Include=cpio
 
 [7zip]
@@ -345,32 +360,32 @@ Open=%cd %p/u7z://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view 7z
 
 [patch]
-Regex=\.(diff|patch)$
+Regex=\\.(diff|patch)$
 Open=%cd %p/patchfs://
 View=%view{ascii} @EXTHELPERSDIR@/misc.sh view cat
 
 [patch.gz]
-Regex=\.(diff|patch)\.(gz|Z)$
+Regex=\\.(diff|patch)\\.(gz|Z)$
 Open=%cd %p/patchfs://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view gz
 
 [patch.bz2]
-Regex=\.(diff|patch)\.bz2$
+Regex=\\.(diff|patch)\\.bz2$
 Open=%cd %p/patchfs://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view bz2
 
 [patch.xz]
-Regex=\.(diff|patch)\.xz$
+Regex=\\.(diff|patch)\\.xz$
 Open=%cd %p/patchfs://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view xz
 
 [patch.zst]
-Regex=\.(diff|patch)\.zst$
+Regex=\\.(diff|patch)\\.zst$
 Open=%cd %p/patchfs://
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view zst
 
 [ls-lR]
-Regex=(^|\.)ls-?lR(\.gz|Z|bz2)$
+Regex=(^|\\.)ls-?lR(\\.gz|Z|bz2)$
 Open=%cd %p/lslR://
 
 [trpm]
@@ -380,7 +395,7 @@ View=%view{ascii} @EXTHELPERSDIR@/package.sh view trpm
 
 # RPM packages (SuSE uses *.spm for source packages)
 [src.rpm]
-Regex=\.(src\.rpm|spm)$
+Regex=\\.(src\\.rpm|spm)$
 Open=%cd %p/rpm://
 View=%view{ascii} @EXTHELPERSDIR@/package.sh view src.rpm
 
@@ -390,7 +405,7 @@ Open=%cd %p/rpm://
 View=%view{ascii} @EXTHELPERSDIR@/package.sh view rpm
 
 [deb]
-Regex=\.u?deb$
+Regex=\\.u?deb$
 Open=%cd %p/deb://
 View=%view{ascii} @EXTHELPERSDIR@/package.sh view deb
 
@@ -411,7 +426,7 @@ Open=%cd %p/iso9660://
 View=%view{ascii} @EXTHELPERSDIR@/misc.sh view iso9660
 
 [ar]
-Regex=\.s?a$
+Regex=\\.s?a$
 Open=%cd %p/uar://
 #Open=%view{ascii} ar tv %f
 View=%view{ascii} @EXTHELPERSDIR@/misc.sh view ar
@@ -425,12 +440,12 @@ View=%view{ascii} @EXTHELPERSDIR@/misc.sh view lib
 ### Sources ###
 
 [C/C++]
-Regex=\.(c|cc|cpp|cxx|c\+\+)$
+Regex=\\.(c|cc|cpp|cxx|c\\+\\+)$
 RegexIgnoreCase=true
 Include=editor
 
 [C/C++ header]
-Regex=\.(h|hh|hpp|hxx|h\+\+)$
+Regex=\\.(h|hh|hpp|hxx|h\\+\\+)$
 RegexIgnoreCase=true
 Include=editor
 
@@ -440,7 +455,7 @@ ShellIgnoreCase=true
 Include=editor
 
 [Assembler]
-Regex=\.(s|asm)$
+Regex=\\.(s|asm)$
 RegexIgnoreCase=true
 Include=editor
 
@@ -452,19 +467,19 @@ Include=editor
 
 # .so libraries
 [so]
-Regex=\.(so|so\.[0-9\.]*)$
+Regex=\\.(so|so\\.[0-9\\.]*)$
 View=%view{ascii} @EXTHELPERSDIR@/misc.sh view so
 
 # .dylib libraries
 [dylib]
-Regex=\.(dylib|dylib\.[0-9\.]*)$
+Regex=\\.(dylib|dylib\\.[0-9\\.]*)$
 View=%view{ascii} @EXTHELPERSDIR@/misc.sh view dylib
 
 
 ### Documentation ###
 
 #[Texinfo]
-#Regex=\.(te?xi|texinfo)$
+#Regex=\\.(te?xi|texinfo)$
 
 [info-by-shell]
 Shell=.info
@@ -497,27 +512,32 @@ View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view nroff.ms %var{PAGER:more}
 # Manual page
 
 [man.lz]
-Regex=([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lz$
+Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.lz$
 Open=@EXTHELPERSDIR@/text.sh open man.lz %var{PAGER:more}
 View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.lz %var{PAGER:more}
 
 [man.lz4]
-Regex=([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lz4$
+Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.lz4$
 Open=@EXTHELPERSDIR@/text.sh open man.lz4 %var{PAGER:more}
 View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.lz4 %var{PAGER:more}
 
 [man.lzma]
-Regex=([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lzma$
+Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.lzma$
 Open=@EXTHELPERSDIR@/text.sh open man.lzma %var{PAGER:more}
 View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.lzma %var{PAGER:more}
 
+[man.lzo]
+Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.lzo$
+Open=@EXTHELPERSDIR@/text.sh open man.lzo %var{PAGER:more}
+View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.lzo %var{PAGER:more}
+
 [man.xz]
-Regex=([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.xz$
+Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.xz$
 Open=@EXTHELPERSDIR@/text.sh open man.xz %var{PAGER:more}
 View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.xz %var{PAGER:more}
 
 [man.zst]
-Regex=([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.zst$
+Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.zst$
 Open=@EXTHELPERSDIR@/text.sh open man.zst %var{PAGER:more}
 View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.zst %var{PAGER:more}
 
@@ -556,17 +576,26 @@ ShellIgnoreCase=true
 View=%view{ascii} @EXTHELPERSDIR@/image.sh view svg
 Open=@EXTHELPERSDIR@/image.sh open svg
 
+[webp]
+Shell=.webp
+View=%view{ascii} @EXTHELPERSDIR@/image.sh view webp
+Open=@EXTHELPERSDIR@/image.sh open webp
+
+[avif]
+Shell=.avif
+View=%view{ascii} @EXTHELPERSDIR@/image.sh view avif
+Open=@EXTHELPERSDIR@/image.sh open avif
 
 ### Sound files ###
 
 [sound]
-Regex=\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv|spx|flac)$
+Regex=\\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv|spx|flac)$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/sound.sh open common
 View=%view{ascii} @EXTHELPERSDIR@/sound.sh view common
 
 [mod]
-Regex=\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$
+Regex=\\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/sound.sh open mod
 
@@ -582,7 +611,7 @@ Open=@EXTHELPERSDIR@/sound.sh open mp3
 View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3
 
 [ogg]
-Regex=\.og[gax]$
+Regex=\\.og[gax]$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/sound.sh open ogg
 View=%view{ascii} @EXTHELPERSDIR@/sound.sh view ogg
@@ -594,7 +623,7 @@ Open=@EXTHELPERSDIR@/sound.sh open opus
 View=%view{ascii} @EXTHELPERSDIR@/sound.sh view opus
 
 [midi]
-Regex=\.(midi?|rmid?)$
+Regex=\\.(midi?|rmid?)$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/sound.sh open midi
 
@@ -606,7 +635,7 @@ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wma
 
 # Play list
 [playlist]
-Regex=\.(m3u|pls)$
+Regex=\\.(m3u|pls)$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/sound.sh open playlist
 
@@ -619,7 +648,7 @@ ShellIgnoreCase=true
 Include=video
 
 [asf]
-Regex=\.as[fx]$
+Regex=\\.as[fx]$
 RegexIgnoreCase=true
 Include=video
 
@@ -634,12 +663,12 @@ ShellIgnoreCase=true
 Include=video
 
 [mov]
-Regex=\.(mov|qt)$
+Regex=\\.(mov|qt)$
 RegexIgnoreCase=true
 Include=video
 
 [mp4]
-Regex=\.(mp4|m4v|mpe?g)$
+Regex=\\.(mp4|m4v|mpe?g)$
 RegexIgnoreCase=true
 Include=video
 
@@ -665,7 +694,7 @@ ShellIgnoreCase=true
 Include=video
 
 [fli]
-Regex=\.fl[icv]$
+Regex=\\.fl[icv]$
 RegexIgnoreCase=true
 Include=video
 
@@ -675,7 +704,7 @@ ShellIgnoreCase=true
 Include=video
 
 [realaudio]
-Regex=\.ra?m$
+Regex=\\.ra?m$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/video.sh open ram
 
@@ -688,7 +717,7 @@ Include=video
 ### Documents ###
 
 [html]
-Regex=\.html?$
+Regex=\\.html?$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/web.sh open html
 View=%view{ascii} @EXTHELPERSDIR@/web.sh view html
@@ -700,7 +729,7 @@ Open=@EXTHELPERSDIR@/doc.sh open ooffice
 
 # StarOffice 6 and OpenOffice.org formats
 [OpenOffice.org]
-Regex=\.(odt|fodt|ott|sxw|stw|ods|fods|ots|sxc|stc|odp|fodp|otp|sxi|sti|odg|fodg|otg|sxd|std|odb|odf|sxm|odm|sxg)$
+Regex=\\.(odt|fodt|ott|sxw|stw|ods|fods|ots|sxc|stc|odp|fodp|otp|sxi|sti|odg|fodg|otg|sxd|std|odb|odf|sxm|odm|sxg)$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/doc.sh open ooffice
 View=%view{ascii} @EXTHELPERSDIR@/doc.sh view odt
@@ -722,21 +751,21 @@ Open=@EXTHELPERSDIR@/doc.sh open msdoc
 
 # Microsoft Word Document
 [msdoc-by-shell]
-Regex=\.(do[ct]|wri|docx)$
+Regex=\\.(do[ct]|wri|docx)$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/doc.sh open msdoc
 View=%view{ascii} @EXTHELPERSDIR@/doc.sh view msdoc
 
 # Microsoft Excel Worksheet
 [msxls-by-shell]
-Regex=\.(xl[sw]|xlsx)$
+Regex=\\.(xl[sw]|xlsx)$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/doc.sh open msxls
 View=%view{ascii} @EXTHELPERSDIR@/doc.sh view msxls
 
 # Microsoft PowerPoint Presentation
 [msppt]
-Regex=\.(pp[ts]|pptx)$
+Regex=\\.(pp[ts]|pptx)$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/doc.sh open msppt
 View=%view{ascii} @EXTHELPERSDIR@/doc.sh view msppt
@@ -753,25 +782,25 @@ ShellIgnoreCase=true
 Include=editor
 
 [markdown]
-Regex=\.mk?d$
+Regex=\\.mk?d$
 RegexIgnoreCase=true
 Include=editor
 
 [djvu]
-Regex=\.djvu?$
+Regex=\\.djvu?$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/doc.sh open djvu
 View=%view{ascii} @EXTHELPERSDIR@/doc.sh view djvu
 
 # Comic Books
 [cbr]
-Regex=\.cb[zr]$
+Regex=\\.cb[zr]$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/doc.sh open comic
 
 # Epup, mobi, fb2
 [ebook]
-Regex=\.(epub|mobi|fb2)$
+Regex=\\.(epub|mobi|fb2)$
 RegexIgnoreCase=true
 Open=@EXTHELPERSDIR@/doc.sh open ebook
 View=%view{ascii} @EXTHELPERSDIR@/doc.sh view ebook
@@ -790,11 +819,11 @@ Open=xmkmf -a
 
 # Makefile.PL (MakeMaker)
 [Makefile.pl]
-Regex=^Makefile\.(PL|pl)$
+Regex=^Makefile\\.(PL|pl)$
 Open=%var{PERL:perl} %f
 
 [Makefile]
-Regex=^[Mm]akefile
+Regex=^[Mm]akefile$
 Open=make -f %f %{Enter parameters}
 
 [dbf]
@@ -805,7 +834,7 @@ View=%view{ascii} @EXTHELPERSDIR@/misc.sh view dbf
 
 # REXX script
 [rexx]
-Regex=\.(rexx?|cmd)$
+Regex=\\.(rexx?|cmd)$
 Open=rexx %f %{Enter parameters};echo "Press ENTER";read y
 
 # Disk images for Commodore computers (VIC20, C64, C128)
@@ -874,6 +903,12 @@ ShellIgnoreCase=true
 Open=@EXTHELPERSDIR@/archive.sh view lz4 %var{PAGER:more}
 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view lz4
 
+[lzo]
+Shell=.lzo
+ShellIgnoreCase=true
+Open=@EXTHELPERSDIR@/archive.sh view lzo %var{PAGER:more}
+View=%view{ascii} @EXTHELPERSDIR@/archive.sh view lzo
+
 [wim]
 Shell=.wim
 ShellIgnoreCase=true
diff --git a/misc/mc.menu.in b/misc/mc.menu.in
index c491858..9d37e37 100644
--- a/misc/mc.menu.in
+++ b/misc/mc.menu.in
@@ -93,6 +93,15 @@ shell_patterns=0
         tar cf - "$Pwd" | zstd -f > "$tar.tar.zst" && \
         echo "../$tar.tar.zst created."
 
+8       Compress the current subdirectory (tar.lzo)
+        Pwd=`basename %d /`
+        echo -n "Name of the compressed file (without extension) [$Pwd]: "
+        read tar
+        [ "$tar"x = x ] && tar="$Pwd"
+        cd .. && \
+        tar cf - "$Pwd" | lzop -f > "$tar.tar.lzo" && \
+        echo "../$tar.tar.lzo created."
+
 = f \.c$ & t r
 + f \.c$ & t r & ! t t
 c       Compile and link current .c file
@@ -228,7 +237,7 @@ U       Uudecode marked news articles (needs work)
         fi
         echo "Please test the output file before deleting anything."
 
-=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.lz$ | f \.tar\.lz4$ | f \.tar\.lzma$ | f \.tar\.7z$ | f \.tar\.xz$ | f \.tar\.zst | f \.tar\.Z$ | f \.tar\.bz2$ & t rl
+=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.lz$ | f \.tar\.lz4$ | f \.tar\.lzma$ | f \.tar\.lzo$ | f \.tar\.7z$ | f \.tar\.xz$ | f \.tar\.zst | f \.tar\.Z$ | f \.tar\.bz2$ & t rl
 x       Extract the contents of a compressed tar file
         unset PRG
         case %f in
@@ -238,6 +247,7 @@ x       Extract the contents of a compressed tar file
             *.tar.lz)   PRG="lzip -dc";;
             *.tar.lz4)  PRG="lz4 -dc";;
             *.tar.lzma) PRG="lzma -dc";;
+            *.tar.lzo)  PRG="lzop -dc";;
             *.tar.xz)   PRG="xz -dc";;
             *.tar.zst)  PRG="zstd -dc";;
             *)          exit 1;;
diff --git a/misc/skins/Makefile.in b/misc/skins/Makefile.in
index a752490..de5a2db 100644
--- a/misc/skins/Makefile.in
+++ b/misc/skins/Makefile.in
@@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \
-	$(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \
+	$(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \
diff --git a/misc/skins/dark.ini b/misc/skins/dark.ini
index 8ad29b3..707b05b 100644
--- a/misc/skins/dark.ini
+++ b/misc/skins/dark.ini
@@ -104,6 +104,7 @@
     editbold = yellow;green
     editmarked = black;lightgray
     editwhitespace = brightblue;black
+    editnonprintable = ;black
     editlinestate = white;cyan
     bookmark = white;red
     bookmarkfound = black;green
diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini
index 9ac7399..1329e1d 100644
--- a/misc/skins/darkfar.ini
+++ b/misc/skins/darkfar.ini
@@ -104,6 +104,7 @@
     editbold = yellow;green
     editmarked = black;lightgray
     editwhitespace = brightblue;black
+    editnonprintable = ;black
     editlinestate = white;cyan
     bookmark = white;red
     bookmarkfound = black;green
diff --git a/misc/skins/default.ini b/misc/skins/default.ini
index 145eb99..a3dd3e3 100644
--- a/misc/skins/default.ini
+++ b/misc/skins/default.ini
@@ -104,6 +104,7 @@
     editbold = yellow;green
     editmarked = black;cyan
     editwhitespace = brightblue;blue
+    editnonprintable = ;black
     editlinestate = white;cyan
     bookmark = white;red
     bookmarkfound = black;green
diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini
index 7f35df0..f6bdac0 100644
--- a/misc/skins/double-lines.ini
+++ b/misc/skins/double-lines.ini
@@ -104,6 +104,7 @@
     editbold = yellow;green
     editmarked = black;cyan
     editwhitespace = brightblue;blue
+    editnonprintable = ;black
     editlinestate = white;cyan
     bookmark = white;red
     bookmarkfound = black;green
diff --git a/misc/skins/featured-plus.ini b/misc/skins/featured-plus.ini
index a0dc070..def2147 100644
--- a/misc/skins/featured-plus.ini
+++ b/misc/skins/featured-plus.ini
@@ -106,6 +106,7 @@
     editbold = yellow;green
     editmarked = black;cyan
     editwhitespace = brightblue;blue
+    editnonprintable = ;black
     editlinestate = white;cyan
     bookmark = white;red
     bookmarkfound = black;green
diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini
index 43ce2f2..f5b6f5d 100644
--- a/misc/skins/featured.ini
+++ b/misc/skins/featured.ini
@@ -107,6 +107,7 @@
     editmarked = black;cyan
     editwhitespace = brightblue;blue
     editlinestate = white;cyan
+    editnonprintable = ;black
     bookmark = white;red
     bookmarkfound = black;green
     editrightmargin = brightblue;black
diff --git a/misc/skins/gotar.ini b/misc/skins/gotar.ini
index 3b81867..d49ddb6 100644
--- a/misc/skins/gotar.ini
+++ b/misc/skins/gotar.ini
@@ -101,6 +101,7 @@
     editbold = yellow;blue
     editmarked = brightgreen;red
     editwhitespace = brightblue;blue
+    editnonprintable = ;black
     editlinestate = brightgreen
     bookmark = white;red
     bookmarkfound = black;green
diff --git a/misc/skins/gray-green-purple256.ini b/misc/skins/gray-green-purple256.ini
index 3f00e2a..12a09e3 100644
--- a/misc/skins/gray-green-purple256.ini
+++ b/misc/skins/gray-green-purple256.ini
@@ -111,6 +111,7 @@
     editbold = rgb400
     editmarked = ;main1
     editwhitespace = rgb400;bgdarker
+    editnonprintable = ;black
     editlinestate = ;bgdarker
     bookmark = ;rgb531
     bookmarkfound = ;main2
diff --git a/misc/skins/gray-orange-blue256.ini b/misc/skins/gray-orange-blue256.ini
index 4953c16..bce1a98 100644
--- a/misc/skins/gray-orange-blue256.ini
+++ b/misc/skins/gray-orange-blue256.ini
@@ -111,6 +111,7 @@
     editbold = rgb400
     editmarked = ;main1
     editwhitespace = rgb400;bgdarker
+    editnonprintable = ;black
     editlinestate = ;bgdarker
     bookmark = ;rgb531
     bookmarkfound = ;main2
diff --git a/misc/skins/julia256.ini b/misc/skins/julia256.ini
index 18ed248..2a73180 100644
--- a/misc/skins/julia256.ini
+++ b/misc/skins/julia256.ini
@@ -107,6 +107,7 @@
     editbold = yellow;green
     editmarked = black;lightgray
     editwhitespace = brightblue;black
+    editnonprintable = ;black
     editlinestate = white;cyan
     bookmark = white;red
     bookmarkfound = black;green
diff --git a/misc/skins/mc46.ini b/misc/skins/mc46.ini
index f971310..fe42e79 100644
--- a/misc/skins/mc46.ini
+++ b/misc/skins/mc46.ini
@@ -95,6 +95,7 @@
     editbold = yellow;
     editmarked = black;cyan
     editwhitespace = brightblue;blue
+    editnonprintable = ;black
     editlinestate = white;cyan
     bookmark = white;red
     bookmarkfound = black;green
diff --git a/misc/skins/modarcon16-defbg.ini b/misc/skins/modarcon16-defbg.ini
index e06e721..c79a5a2 100644
--- a/misc/skins/modarcon16-defbg.ini
+++ b/misc/skins/modarcon16-defbg.ini
@@ -146,6 +146,7 @@
     editbold = color15;;bold
     editmarked = color11;color2;bold
     editwhitespace = color12;color4
+    editnonprintable = ;black
     editlinestate = color2;color0
     bookmark = color0;color7
     bookmarkfound = color0;color7
diff --git a/misc/skins/modarcon16.ini b/misc/skins/modarcon16.ini
index e2c86d7..6e95836 100644
--- a/misc/skins/modarcon16.ini
+++ b/misc/skins/modarcon16.ini
@@ -146,6 +146,7 @@
     editbold = color15;;bold
     editmarked = color11;color2;bold
     editwhitespace = color2;color0
+    editnonprintable = ;black
     editlinestate = color2;color0
     bookmark = color0;color7
     bookmarkfound = color0;color7
diff --git a/misc/skins/modarcon16root-defbg.ini b/misc/skins/modarcon16root-defbg.ini
index 5d05269..677f3ea 100644
--- a/misc/skins/modarcon16root-defbg.ini
+++ b/misc/skins/modarcon16root-defbg.ini
@@ -146,6 +146,7 @@
     editbold = color15;;bold
     editmarked = color11;color1;bold
     editwhitespace = color12;color4
+    editnonprintable = ;black
     editlinestate = color1;color0
     bookmark = color0;color7
     bookmarkfound = color0;color7
diff --git a/misc/skins/modarcon16root.ini b/misc/skins/modarcon16root.ini
index 46ed695..49164d6 100644
--- a/misc/skins/modarcon16root.ini
+++ b/misc/skins/modarcon16root.ini
@@ -146,6 +146,7 @@
     editbold = color15;;bold
     editmarked = color11;color1;bold
     editwhitespace = color12;color4
+    editnonprintable = ;black
     editlinestate = color1;color0
     bookmark = color0;color7
     bookmarkfound = color0;color7
diff --git a/misc/skins/modarin256-defbg.ini b/misc/skins/modarin256-defbg.ini
index 9ba2e60..d4e84fe 100644
--- a/misc/skins/modarin256-defbg.ini
+++ b/misc/skins/modarin256-defbg.ini
@@ -146,6 +146,7 @@
     editbold = color228;;bold
     editmarked = color228;color23;bold
     editwhitespace = color56;color234
+    editnonprintable = ;black
     editlinestate = color66;color235
     bookmark = ;color239
     bookmarkfound = ;color239;bold
diff --git a/misc/skins/modarin256.ini b/misc/skins/modarin256.ini
index 0dba217..afdd71c 100644
--- a/misc/skins/modarin256.ini
+++ b/misc/skins/modarin256.ini
@@ -146,6 +146,7 @@
     editbold = color228;;bold
     editmarked = color228;color23;bold
     editwhitespace = color56;color234
+    editnonprintable = ;black
     editlinestate = color66;color235
     bookmark = ;color239
     bookmarkfound = ;color239;bold
diff --git a/misc/skins/modarin256root-defbg.ini b/misc/skins/modarin256root-defbg.ini
index 2a8fa75..bb0a823 100644
--- a/misc/skins/modarin256root-defbg.ini
+++ b/misc/skins/modarin256root-defbg.ini
@@ -146,6 +146,7 @@
     editbold = color228;;bold
     editmarked = color228;color88;bold
     editwhitespace = color56;color234
+    editnonprintable = ;black
     editlinestate = color95;color235
     bookmark = ;color239
     bookmarkfound = ;color239;bold
diff --git a/misc/skins/modarin256root.ini b/misc/skins/modarin256root.ini
index 688fea3..dd05c00 100644
--- a/misc/skins/modarin256root.ini
+++ b/misc/skins/modarin256root.ini
@@ -146,6 +146,7 @@
     editbold = color228;;bold
     editmarked = color228;color88;bold
     editwhitespace = color56;color234
+    editnonprintable = ;black
     editlinestate = color95;color235
     bookmark = ;color239
     bookmarkfound = ;color239;bold
diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini
index 0b5ee01..3bace63 100644
--- a/misc/skins/nicedark.ini
+++ b/misc/skins/nicedark.ini
@@ -104,6 +104,7 @@
     editbold = brown;blue
     editmarked = black;cyan
     editwhitespace = brightblue;blue
+    editnonprintable = ;black
     editlinestate = white;cyan
     bookmark = white;red
     bookmarkfound = black;green
diff --git a/misc/skins/sand256.ini b/misc/skins/sand256.ini
index 664ce7a..33c43c7 100644
--- a/misc/skins/sand256.ini
+++ b/misc/skins/sand256.ini
@@ -161,6 +161,7 @@
     editbold = rgb400
     editmarked = ;rgb452;italic
     editwhitespace = rgb400;rgb553
+    editnonprintable = ;black
     editlinestate = ;rgb553
     bookmark = ;rgb551
     bookmarkfound = ;rgb530
diff --git a/misc/skins/seasons-autumn16M.ini b/misc/skins/seasons-autumn16M.ini
index 47abb4c..4a94ccb 100644
--- a/misc/skins/seasons-autumn16M.ini
+++ b/misc/skins/seasons-autumn16M.ini
@@ -171,6 +171,7 @@
     editbold = MarkedFg;;bold
     editmarked = ;Selected
     editwhitespace = ;EditorWhitespace
+    editnonprintable = ;black
     editlinestate = #000;EditorLineNumber
     bookmark = #000;EditorBookmark
     bookmarkfound = #000;EditorFindAll
diff --git a/misc/skins/seasons-spring16M.ini b/misc/skins/seasons-spring16M.ini
index 855b4e1..c839f81 100644
--- a/misc/skins/seasons-spring16M.ini
+++ b/misc/skins/seasons-spring16M.ini
@@ -171,6 +171,7 @@
     editbold = MarkedFg;;bold
     editmarked = ;Selected
     editwhitespace = ;EditorWhitespace
+    editnonprintable = ;black
     editlinestate = #000;EditorLineNumber
     bookmark = #000;EditorBookmark
     bookmarkfound = #000;EditorFindAll
diff --git a/misc/skins/seasons-summer16M.ini b/misc/skins/seasons-summer16M.ini
index 7cad34b..3ab0148 100644
--- a/misc/skins/seasons-summer16M.ini
+++ b/misc/skins/seasons-summer16M.ini
@@ -171,6 +171,7 @@
     editbold = MarkedFg;;bold
     editmarked = ;Selected
     editwhitespace = ;EditorWhitespace
+    editnonprintable = ;black
     editlinestate = #000;EditorLineNumber
     bookmark = #000;EditorBookmark
     bookmarkfound = #000;EditorFindAll
diff --git a/misc/skins/seasons-winter16M.ini b/misc/skins/seasons-winter16M.ini
index 76479bd..cae092f 100644
--- a/misc/skins/seasons-winter16M.ini
+++ b/misc/skins/seasons-winter16M.ini
@@ -171,6 +171,7 @@
     editbold = MarkedFg;;bold
     editmarked = ;Selected
     editwhitespace = ;EditorWhitespace
+    editnonprintable = ;black
     editlinestate = #000;EditorLineNumber
     bookmark = #000;EditorBookmark
     bookmarkfound = #000;EditorFindAll
diff --git a/misc/skins/xoria256.ini b/misc/skins/xoria256.ini
index cbc9c99..d1e9dd0 100644
--- a/misc/skins/xoria256.ini
+++ b/misc/skins/xoria256.ini
@@ -147,6 +147,7 @@
     editbold = ;;bold
     editmarked = ;color60
     editwhitespace = color236;color234
+    editnonprintable = ;black
     editlinestate = ;color235
     bookmark = ;color239;
     bookmarkfound = ;color239;bold
diff --git a/misc/skins/yadt256-defbg.ini b/misc/skins/yadt256-defbg.ini
index ea3d7c7..d59b65a 100644
--- a/misc/skins/yadt256-defbg.ini
+++ b/misc/skins/yadt256-defbg.ini
@@ -113,6 +113,7 @@
     editbold = color228;;bold
     editmarked = color228;blue;bold
     editwhitespace = color56;color234
+    editnonprintable = ;black
     editlinestate = color66;color235
     bookmark = ;color239
     bookmarkfound = ;color239;bold
diff --git a/misc/skins/yadt256.ini b/misc/skins/yadt256.ini
index 194c2b0..2aaf4e5 100644
--- a/misc/skins/yadt256.ini
+++ b/misc/skins/yadt256.ini
@@ -112,6 +112,7 @@
     editbold = color228;;bold
     editmarked = color228;blue;bold
     editwhitespace = color56;color234
+    editnonprintable = ;black
     editlinestate = color66;color235
     bookmark = ;color239
     bookmarkfound = ;color239;bold
diff --git a/misc/syntax/Makefile.in b/misc/syntax/Makefile.in
index 5d495f5..f063ef2 100644
--- a/misc/syntax/Makefile.in
+++ b/misc/syntax/Makefile.in
@@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \
-	$(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \
+	$(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \
diff --git a/misc/syntax/sh.syntax b/misc/syntax/sh.syntax
index e89142d..3f4754d 100644
--- a/misc/syntax/sh.syntax
+++ b/misc/syntax/sh.syntax
@@ -1564,6 +1564,7 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
     keyword whole lsusb cyan
     keyword whole lzip cyan
     keyword whole lziprecover cyan
+    keyword whole lzop cyan
     keyword whole lynx cyan
     keyword whole MAKEDEV cyan
     keyword whole MAKEFLOPPIES cyan