From c6775bc9ca9d321bda258e812198a37d29947aff Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 10 Jul 2019 10:34:02 +0200 Subject: [PATCH 1/2] * lisp/net/tramp-sh.el (tramp-inline-compress-start-size): Set nil on w32. --- lisp/net/tramp-sh.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 6e868aa1fc6..18ae2951084 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -41,12 +41,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 From 305abae50e8e10471125be6cdf3a7270befea0b0 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 12 Jul 2019 09:03:39 +0900 Subject: [PATCH 2/2] Raise required librsvg version so as to match the current use * configure.ac: Set RSVG_REQUIRED to 2.14.0 as rsvg_handle_get_dimensions needs it. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index aead404b5fd..a79b322ecdd 100644 --- a/configure.ac +++ b/configure.ac @@ -2500,7 +2500,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])