From 24b86cb4f7aa1e14dd9025428140c5fdae5c5227 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 11 Nov 2021 21:41:10 +0200 Subject: [PATCH 1/3] Fix ACL errors with WebDAV volumes on MS-Windows * src/w32.c (acl_get_file): Handle ERROR_INVALID_FUNCTION from WebDAV. Patch from Ioannis Kappas . (Bug#51773) --- src/w32.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/w32.c b/src/w32.c index 9fe698d28d7..80e42acf500 100644 --- a/src/w32.c +++ b/src/w32.c @@ -6595,7 +6595,8 @@ acl_get_file (const char *fname, acl_type_t type) xfree (psd); err = GetLastError (); if (err == ERROR_NOT_SUPPORTED - || err == ERROR_ACCESS_DENIED) + || err == ERROR_ACCESS_DENIED + || err == ERROR_INVALID_FUNCTION) errno = ENOTSUP; else if (err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND @@ -6614,10 +6615,11 @@ acl_get_file (const char *fname, acl_type_t type) || err == ERROR_INVALID_NAME) errno = ENOENT; 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) + /* ERROR_ACCESS_DENIED or ERROR_INVALID_FUNCTION is + what we get for a volume mounted by WebDAV, + which evidently doesn't support ACLs. */ + || err == ERROR_ACCESS_DENIED + || err == ERROR_INVALID_FUNCTION) errno = ENOTSUP; else errno = EIO; From 144ad77fdadd41888c9a715e25c2bc7c57753f74 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 12 Nov 2021 04:39:02 +0100 Subject: [PATCH 2/3] Fix Lisp Intro markup error * doc/lispintro/emacs-lisp-intro.texi (Insert let): Fix @code markup error (bug#51777). --- doc/lispintro/emacs-lisp-intro.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 308153f9231..e3064580580 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -5801,7 +5801,7 @@ written like this: @subsection The @code{let} Expression in @code{insert-buffer} After ensuring that the variable @code{buffer} refers to a buffer itself -and not just to the name of a buffer, the @code{insert-buffer function} +and not just to the name of a buffer, the @code{insert-buffer} function continues with a @code{let} expression. This specifies three local variables, @code{start}, @code{end}, and @code{newmark} and binds them to the initial value @code{nil}. These variables are used inside the From a6905e90cc3358a21726646c4ee9154e80fc96d6 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 12 Nov 2021 04:44:09 +0100 Subject: [PATCH 3/3] Fix problem with temp buffer killing in package-install-file * lisp/emacs-lisp/package.el (package-install-file): Allow killing the temporary buffer without querying (bug#51769). --- lisp/emacs-lisp/package.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 5445fa970f8..2c37e19980d 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2239,6 +2239,7 @@ directory." (dired-mode)) (insert-file-contents-literally file) (set-visited-file-name file) + (set-buffer-modified-p nil) (when (string-match "\\.tar\\'" file) (tar-mode))) (package-install-from-buffer)))