Merging upstream version 3:4.8.31.

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

29 files changed, 29 insertions, 1 deletions

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