diff options
| author | Jim Porter <jporterbugs@gmail.com> | 2022-03-27 22:28:40 -0700 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-05-01 20:41:18 +0200 |
| commit | ade1424a975aabaa208010c6fdd3c8b7c51242ff (patch) | |
| tree | f4c2e874ed3b1f5684f6e72e7f41401b9b3bd22c /doc/misc/eshell.texi | |
| parent | 788694d026b401715330576633a98542623978ff (diff) | |
| download | emacs-ade1424a975aabaa208010c6fdd3c8b7c51242ff.tar.gz emacs-ade1424a975aabaa208010c6fdd3c8b7c51242ff.tar.bz2 emacs-ade1424a975aabaa208010c6fdd3c8b7c51242ff.zip | |
Use a common set of string delimiters for all Eshell predicates/modifiers
* lisp/eshell/em-pred.el (eshell-pred-delimiter-pairs): New variable.
(eshell-get-comparison-modifier-argument)
(eshell-get-numeric-modifier-argument)
(eshell-get-delimited-modifier-argument): New functions...
(eshell-pred-user-or-group, eshell-pred-file-time)
(eshell-pred-file-links, eshell-pred-file-size)
(eshell-pred-substitute, eshell-join-memebers, eshell-split-members):
... and use them here.
(eshell-include-members): Pass 'mod-char' and use
'eshell-get-delimited-modifier-argument'.
(eshell-pred-file-type, eshell-pred-file-mode): Use 'when-let'.
(eshell-modifier-alist): Pass modifier char to
'eshell-include-members'.
* test/lisp/eshell/em-pred-tests.el
(em-pred-test/predicate-delimiters): New test.
(em-pred-test/predicate-uid, em-pred-test/predicate-gid,
em-pred-test/modifier-include, em-pred-test/modifier-exclude): Remove
cases covered by 'em-pred-test/predicate-delimiters'.
(em-pred-test/modifier-substitute): Add test cases for new delimiter
styles.
* doc/misc/eshell.texi (Argument Predication and Modification):
Explain how string parameters are delimited.
(Argument Modifiers): Document some special delimiter behavior with
the 's/PATTERN/REPLACE/' modifier (bug#55204).
* etc/NEWS: Announce this change, and move the
'eshell-eval-using-options' entry to the Eshell section.
Diffstat (limited to 'doc/misc/eshell.texi')
| -rw-r--r-- | doc/misc/eshell.texi | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index e5392061665..a3ed922cf2c 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -1191,6 +1191,13 @@ or modifiers. For example, @samp{*(.)} expands to all regular files in the current directory and @samp{*(^@@:U^u0)} expands to all non-symlinks not owned by @code{root}, upper-cased. +Some predicates and modifiers accept string parameters, such as +@samp{*(u'@var{user}')}, which matches all files owned by @var{user}. +These parameters must be surrounded by delimiters; you can use any of +the following pairs of delimiters: @code{" @dots{} "}, @code{' @dots{} +'}, @code{/ @dots{} /}, @code{| @dots{} |}, @code{( @dots{} )}, +@code{[ @dots{} ]}, @code{< @dots{} >}, or @code{@{ @dots{} @}}. + You can customize the syntax and behavior of predicates and modifiers in Eshell via the Customize group ``eshell-pred'' (@pxref{Easy Customization, , , emacs, The GNU Emacs Manual}). @@ -1379,6 +1386,11 @@ meaning. Replaces the first instance of the regular expression @var{pattern} with @var{replace}. Signals an error if no match is found. +As with other modifiers taking string parameters, you can use +different delimiters to separate @var{pattern} and @var{replace}, such +as @samp{s'@dots{}'@dots{}'}, @samp{s[@dots{}][@dots{}]}, or even +@samp{s[@dots{}]/@dots{}/}. + @item gs/@var{pattern}/@var{replace}/ Replaces all instances of the regular expression @var{pattern} with @var{replace}. |