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 | |
| 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')
| -rw-r--r-- | lisp/eshell/esh-cmd.el | 6 | ||||
| -rw-r--r-- | lisp/eshell/esh-util.el | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 535e169bcb3..72c8a239ff3 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -284,7 +284,7 @@ command line.") (defvar eshell-command-arguments nil) (defvar eshell-in-pipeline-p nil "Internal Eshell variable, non-nil inside a pipeline. -Has the value 'first, 'last for the first/last commands in the pipeline, +Has the value `first', `last' for the first/last commands in the pipeline, otherwise t.") (defvar eshell-in-subcommand-p nil) (defvar eshell-last-arguments nil) @@ -670,8 +670,8 @@ For an external command, it means an exit code of 0." "Separate TERMS using SEPARATOR. If REVERSED is non-nil, the list of separated term groups will be returned in reverse order. If LAST-TERMS-SYM is a symbol, its value -will be set to a list of all the separator operators found (or '(list -nil)' if none)." +will be set to a list of all the separator operators found (or (nil) +if none)." (let ((sub-terms (list t)) (eshell-sep-terms (list t)) subchains) 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") |