diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/eshell/esh-util.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/eshell/esh-util.el')
| -rw-r--r-- | lisp/eshell/esh-util.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index f645702ac2b..e99a316889a 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -678,8 +678,8 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable. (defun eshell-file-attributes (file &optional id-format) "Return the attributes of FILE, playing tricks if it's over ange-ftp. The optional argument ID-FORMAT specifies the preferred uid and -gid format. Valid values are 'string and 'integer, defaulting to -'integer. See `file-attributes'." +gid format. Valid values are `string' and `integer', defaulting to +`integer'. See `file-attributes'." (let* ((file (expand-file-name file)) entry) (if (string-equal (file-remote-p file 'method) "ftp") |