masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 11:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Give a more sensible message if file-attributes fails (Bug#29070)

Browse source 
* lisp/server.el (server-ensure-safe-dir): Don't claim the directory
is a file if we fail to get anything from `file-attributes'.
This commit is contained in:
Noam Postavsky 2017-11-01 19:39:34 -04:00
parent 8453423c7c
commit dc0a25c2f9
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/server.el
View file

@ -527,8 +527,10 @@ Creates the directory if necessary and makes sure:
(w32 (eq system-type 'windows-nt)) (w32 (eq system-type 'windows-nt))
(unsafe (cond (unsafe (cond
((not (eq t (car attrs))) ((not (eq t (car attrs)))
(format "it is a %s" (if (stringp (car attrs)) (if (null attrs) "its attributes can't be checked"
"symlink" "file"))) (format "it is a %s"
(if (stringp (car attrs))
"symlink" "file"))))
((and w32 (zerop uid)) ; on FAT32? ((and w32 (zerop uid)) ; on FAT32?
(display-warning (display-warning
'server 'server