diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2019-07-12 15:13:20 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2019-07-12 15:13:20 +0200 |
| commit | 812715a471c8854359733b11aec53fc31f56648f (patch) | |
| tree | c97b626e5e77426e56d8714951ee26c85dc61764 | |
| parent | 955db220053778bd1e47ff9daf87896b7fd52a67 (diff) | |
| parent | 305abae50e8e10471125be6cdf3a7270befea0b0 (diff) | |
| download | emacs-812715a471c8854359733b11aec53fc31f56648f.tar.gz | |
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):...
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 774f8e5eb92..c093d8650da 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 b8b981bc1a6..63c1bf48f51 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 |