Merge from origin/emacs-28

a6905e90cc Fix problem with temp buffer killing in package-install-file
144ad77fda Fix Lisp Intro markup error
24b86cb4f7 Fix ACL errors with WebDAV volumes on MS-Windows

3 files changed, 9 insertions, 6 deletions

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index f5f79a543cb..6ddc3bfb5c2 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -5818,7 +5818,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
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 27eaa484f9a..08dfe504d27 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2202,6 +2202,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)))
 
diff --git a/src/w32.c b/src/w32.c
index e4b7ef3b95d..2b2f8aadf6b 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -6548,7 +6548,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
@@ -6567,10 +6568,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;