From a6ef167b8dbcfbe5e5792d19737957b030597609 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 13 Nov 2018 09:44:06 +0100 Subject: [PATCH 1/5] * test/README: Explain $REMOTE_TEMPORARY_FILE_DIRECTORY. --- test/README | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/README b/test/README index e473248c9e0..ef5f53cba55 100644 --- a/test/README +++ b/test/README @@ -59,6 +59,15 @@ debugging. To do that, use make TEST_INTERACTIVE=yes ... +Some of the tests require a remote temporary directory +(filenotify-tests.el, shadowfile-tests.el and tramp-tests.el). Per +default, a mock-up connection method is used (this might not be +possible when running on MS Windows). If you want to test a real +remote connection, set $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable +value in order to overwrite the default value: + + env REMOTE_TEMPORARY_FILE_DIRECTORY=/ssh:host:/tmp make ... + (Also, see etc/compilation.txt for compilation mode font lock tests.) From acee0a8f2052abb9aacb8d782afcc5cd64363f04 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 13 Nov 2018 09:45:42 +0100 Subject: [PATCH 2/5] ; Cosmetic changes in etc/NEWS --- etc/NEWS | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index dfafe7c5c94..6dba2a950bd 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3,8 +3,8 @@ GNU Emacs NEWS -- history of user-visible changes. Copyright (C) 2016-2018 Free Software Foundation, Inc. See the end of the file for license conditions. -Please send Emacs bug reports to bug-gnu-emacs@gnu.org. -If possible, use M-x report-emacs-bug. +Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'. +If possible, use 'M-x report-emacs-bug'. This file is about changes in Emacs version 26. @@ -13,7 +13,7 @@ See files NEWS.25, NEWS.24, ..., NEWS.18, and NEWS.1-17 for changes in older Emacs versions. You can narrow news to a specific version by calling 'view-emacs-news' -with a prefix argument or by typing C-u C-h C-n. +with a prefix argument or by typing 'C-u C-h C-n'. * Installation Changes in Emacs 26.2 @@ -65,12 +65,17 @@ often cause crashes. Set it to nil if you really need those fonts. --- *** Mailutils movemail will now be used if found at runtime. -The default value of mail-source-movemail-program is now "movemail". +The default value of 'mail-source-movemail-program' is now "movemail". This ensures that the movemail program from GNU Mailutils will be used if found in 'exec-path', even if it was not found at build time. To -use a different program, customize mail-source-movemail-program to the +use a different program, customize 'mail-source-movemail-program' to the absolute file name of the desired executable. +** Shadowfile + +--- +*** shadowfile.el has been rewritten to support Tramp file names. + ** Shell mode --- @@ -103,16 +108,13 @@ whether the version shown on the mode line is that of the visited file or of the repository working copy. --- -**** Display of Mercurial revisions in the mode-line has changed. +**** Display of Mercurial revisions in the mode line has changed. Previously, the mode line displayed the local number (1, 2, 3, ...) of the revision. Starting with Emacs 26.1, the default has changed, and it now shows the global revision number, in the form of its changeset hash value. To get back the previous behavior, customize the new option 'vc-hg-symbolic-revision-styles' to the value '("{rev}")'. ---- -** shadowfile.el has been rewritten to support Tramp file names. - * New Modes and Packages in Emacs 26.2 @@ -175,11 +177,11 @@ version 2.6.6 or later. ** The new option 'configure --with-mailutils' causes Emacs to rely on GNU Mailutils to retrieve email. It is recommended, and is the -default if GNU Mailutils is installed. When --with-mailutils is not +default if GNU Mailutils is installed. When '--with-mailutils' is not in effect, the Emacs build procedure by default continues to build and install a limited 'movemail' substitute that retrieves POP3 email only via insecure channels. To avoid this problem, use either ---with-mailutils or --without-pop when configuring; --without-pop +'--with-mailutils' or '--without-pop' when configuring; '--without-pop' is the default on platforms other than native MS-Windows. ** The new option 'configure --enable-gcc-warnings=warn-only' causes From 3287a7c048c0c2efc9da59ecd4a12f56f42bb044 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 14 Nov 2018 16:19:39 +0100 Subject: [PATCH 3/5] Fix Bug#33364 * lisp/net/tramp.el (tramp-parse-sconfig-group): Support also "Host host1 host2 ..." syntax. (Bug#33364) --- lisp/net/tramp.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 98ec8415c74..e9f5f7d4347 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2739,7 +2739,9 @@ User is always nil." "Return a (user host) tuple allowed to access. User is always nil." (tramp-parse-group - (concat "^[ \t]*Host[ \t]+" "\\(" tramp-host-regexp "\\)") 1 ",")) + (concat "\\(?:^[ \t]*Host\\)" "\\|" "\\(?:^.+\\)" + "\\|" "\\(" tramp-host-regexp "\\)") + 1 "[ \t]+")) ;; Generic function. (defun tramp-parse-shostkeys-sknownhosts (dirname regexp) From 168a8c258c820804d7a57db59b7e0d986312f227 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 14 Nov 2018 17:59:05 +0200 Subject: [PATCH 4/5] * src/coding.c (Fcheck_coding_systems_region): Doc fix. (Bug#33372) --- src/coding.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/coding.c b/src/coding.c index 867f84de609..3b1d8c95042 100644 --- a/src/coding.c +++ b/src/coding.c @@ -9207,22 +9207,22 @@ to the string and treated as in `substring'. */) DEFUN ("check-coding-systems-region", Fcheck_coding_systems_region, Scheck_coding_systems_region, 3, 3, 0, - doc: /* Check if the region is encodable by coding systems. + doc: /* Check if text between START and END is encodable by CODING-SYSTEM-LIST. START and END are buffer positions specifying the region. CODING-SYSTEM-LIST is a list of coding systems to check. -The value is an alist ((CODING-SYSTEM POS0 POS1 ...) ...), where -CODING-SYSTEM is a member of CODING-SYSTEM-LIST and can't encode the -whole region, POS0, POS1, ... are buffer positions where non-encodable -characters are found. - If all coding systems in CODING-SYSTEM-LIST can encode the region, the -value is nil. +function returns nil. + +If some of the coding systems cannot encode the whole region, value is +an alist, each element of which has the form (CODING-SYSTEM POS1 POS2 ...), +which means that CODING-SYSTEM cannot encode the text at buffer positions +POS1, POS2, ... START may be a string. In that case, check if the string is -encodable, and the value contains indices to the string instead of -buffer positions. END is ignored. +encodable, and the value contains character indices into the string +instead of buffer positions. END is ignored in this case. If the current buffer (or START if it is a string) is unibyte, the value is nil. */) From edcd6b722c8e495498b1619e4d073962b8a8f3e8 Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Tue, 13 Nov 2018 22:42:01 +0100 Subject: [PATCH 5/5] Small documentation correction. * doc/lispref/windows.texi (Textual Scrolling): In the description of scroll-up-aggressively, refer to scroll-down-aggressively instead of a recursive reference to scroll-up-aggressively. (Bug#33369) --- doc/lispref/windows.texi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 106074e13d1..e9bd0c7d83e 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -4908,7 +4908,8 @@ fashion. @defopt scroll-up-aggressively Likewise, for scrolling up. The value, @var{f}, specifies how far point should be placed from the bottom of the window; thus, as with -@code{scroll-up-aggressively}, a larger value scrolls more aggressively. +@code{scroll-down-aggressively}, a larger value scrolls more +aggressively. @end defopt @defopt scroll-step