From ce0842a165d0496e08accd211eab711d7c1c3b87 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 28 Sep 2020 12:45:28 +0300 Subject: [PATCH 1/5] * lisp/hi-lock.el (hi-lock-find-patterns): Autoload it. (Bug#43670) --- lisp/hi-lock.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index b15731943f5..3e7a960bf23 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -773,6 +773,7 @@ REGEXP is highlighted." (font-lock-add-keywords nil hi-lock-file-patterns t) (font-lock-flush))) +;;;###autoload (defun hi-lock-find-patterns () "Add patterns from the current buffer to the list of hi-lock patterns." (interactive) From 6f73cc357994c2776ff8cd4f12804ebb20d29efd Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 29 Sep 2020 18:07:44 +0300 Subject: [PATCH 2/5] ; * lisp/net/eww.el (eww-search-words): Doc fix. --- lisp/net/eww.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 568b96f4d58..449618bd672 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -363,11 +363,11 @@ the default EWW buffer." ;;;###autoload (defun eww-search-words () - "Search the web for the text between BEG and END. + "Search the web for the text in the region. If region is active (and not whitespace), search the web for -the text between BEG and END. Else, prompt the user for a search -string. See the `eww-search-prefix' variable for the search -engine used." +the text between region beginning and end. Else, prompt the +user for a search string. See the variable `eww-search-prefix' +for the search engine used." (interactive) (if (use-region-p) (let ((region-string (buffer-substring (region-beginning) (region-end)))) From 90e5549f027f01c16f6f34e55c33d8a549fb32e7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 29 Sep 2020 18:21:23 +0300 Subject: [PATCH 3/5] Don't signal an error when saving files on WdebDAV volumes * src/w32.c (acl_get_file): If get_file_security raises the ERROR_ACCESS_DENIED error, treat that like unsupported ACLs. --- src/w32.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/w32.c b/src/w32.c index 78e75f0937e..6fed5ba8d3d 100644 --- a/src/w32.c +++ b/src/w32.c @@ -6399,7 +6399,8 @@ acl_get_file (const char *fname, acl_type_t type) { xfree (psd); err = GetLastError (); - if (err == ERROR_NOT_SUPPORTED) + if (err == ERROR_NOT_SUPPORTED + || err == ERROR_ACCESS_DENIED) errno = ENOTSUP; else if (err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND @@ -6417,7 +6418,11 @@ acl_get_file (const char *fname, acl_type_t type) be encoded in the current ANSI codepage. */ || err == ERROR_INVALID_NAME) errno = ENOENT; - else if (err == ERROR_NOT_SUPPORTED) + else if (err == ERROR_NOT_SUPPORTED + /* ERROR_ACCESS_DENIED is what we get for a volume + mounted by WebDAV, which evidently doesn't + support ACLs. */ + || err == ERROR_ACCESS_DENIED) errno = ENOTSUP; else errno = EIO; From 8fbaca7d417e35a89e5c47c67d87d2a8bd4b8a1f Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 1 Oct 2020 12:16:59 +0200 Subject: [PATCH 4/5] Check Emacs version used for Tramp compilation * lisp/net/tramp-compat.el (tramp-compat-emacs-compiled-version): New defconst. Raise a warning, when it is not equal to the Emacs version. --- lisp/net/tramp-compat.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 3f25afedb99..b7a7cc4f003 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -44,6 +44,14 @@ ;; `temporary-file-directory' as function is introduced with Emacs 26.1. (declare-function tramp-handle-temporary-file-directory "tramp") +(defconst tramp-compat-emacs-compiled-version (eval-when-compile emacs-version) + "The Emacs version used for compilation.") + +(unless (= emacs-major-version + (car (version-to-list tramp-compat-emacs-compiled-version))) + (warn "Tramp has been compiled with Emacs %s, this is Emacs %s" + tramp-compat-emacs-compiled-version emacs-version)) + ;; For not existing functions, obsolete functions, or functions with a ;; changed argument list, there are compiler warnings. We want to ;; avoid them in cases we know what we do. From 2af6b3147dc0116e481229951d34487f6a9a0748 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 1 Oct 2020 14:23:20 +0200 Subject: [PATCH 5/5] Clarification in Tramp manual * doc/misc/tramp.texi: Harmonize "Git" spelling. (Frequently Asked Questions): Describe Emacs version mismatch. --- doc/misc/tramp.texi | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index fd3415d1ca0..27390983343 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -383,7 +383,7 @@ After one of the above commands, @file{~/emacs/tramp} will containing the latest version of @value{tramp}. @noindent -To fetch updates from the repository, use git pull: +To fetch updates from the repository, use @code{git pull}: @example @group @@ -1687,9 +1687,9 @@ Integration for LXD containers. A container is accessed via @item magit-tramp @cindex method @option{git} @cindex @option{git} method -Browsing git repositories with @code{magit}. A versioned file is +Browsing Git repositories with @code{magit}. A versioned file is accessed via @file{@trampfn{git,rev@@root-dir,/path/to/file}}. -@samp{rev} is a git revision, and @samp{root-dir} is a virtual host +@samp{rev} is a Git revision, and @samp{root-dir} is a virtual host name for the root directory, specified in @code{magit-tramp-hosts-alist}. @@ -4646,6 +4646,18 @@ path, or somewhere else entirely (including locally). @pxref{Renaming remote files}. +@item +I get a warning @samp{Tramp has been compiled with Emacs a.b, this is Emacs c.d} + +@value{tramp} comes with compatibility code for different Emacs +versions. When you see this warning, you don't use the Emacs built-in +version of @value{tramp}. In case you have installed @value{tramp} +from GNU ELPA, you must delete and reinstall it. +@ifset installchapter +In case you have installed it from its Git repository, @ref{Recompilation}. +@end ifset + + @item How to disable other packages from calling @value{tramp}?