Merge from origin/emacs-28
a6905e90cc
Fix problem with temp buffer killing in package-install-file144ad77fda
Fix Lisp Intro markup error24b86cb4f7
Fix ACL errors with WebDAV volumes on MS-Windows
This commit is contained in:
commit
fc00fe53e1
3 changed files with 9 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -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)))
|
||||
|
||||
|
|
12
src/w32.c
12
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;
|
||||
|
|
Loading…
Add table
Reference in a new issue