mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-22 18:35:09 +00:00
Code Issues Releases Activity

Merge from origin/emacs-26

Browse Source 
305abae50e Raise required librsvg version so as to match the current use
c6775bc9ca * lisp/net/tramp-sh.el (tramp-inline-compress-start-size):...
This commit is contained in:
Michael Albinus 2019-07-12 15:13:20 +02:00
commit 812715a471
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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])

4
lisp/net/tramp-sh.el
View File

@ -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