[Emacs-diffs] master 812715a: Merge from origin/emacs-26

[Michael Albinus]

branch: master
commit 812715a471c8854359733b11aec53fc31f56648f
Merge: 955db22 305abae
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Merge from origin/emacs-26
    
    305abae50e Raise required librsvg version so as to match the current use
    c6775bc9ca * lisp/net/tramp-sh.el (tramp-inline-compress-start-size):...
---
 configure.ac         | 2 +-
 lisp/net/tramp-sh.el | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 774f8e5..c093d86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2603,7 +2603,7 @@ fi
 HAVE_RSVG=no
 if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" 
= "mingw32"; then
   if test "${with_rsvg}" != "no"; then
-    RSVG_REQUIRED=2.11.0
+    RSVG_REQUIRED=2.14.0
     RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
 
     EMACS_CHECK_MODULES([RSVG], [$RSVG_MODULE])
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index b8b981b..63c1bf4 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -38,12 +38,14 @@
 (defvar vc-hg-program)
 
 ;;;###tramp-autoload
-(defcustom tramp-inline-compress-start-size 4096
+(defcustom tramp-inline-compress-start-size
+  (unless (memq system-type '(windows-nt)) 4096)
   "The minimum size of compressing where inline transfer.
 When inline transfer, compress transferred data of file
 whose size is this value or above (up to `tramp-copy-size-limit').
 If it is nil, no compression at all will be applied."
   :group 'tramp
+  :version "26.3"
   :type '(choice (const nil) integer))
 
 ;;;###tramp-autoload