mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
esh-opt.el: Add a :parse-leading-options-only argument (Bug#28323)
* lisp/eshell/esh-opt.el (eshell-eval-using-options): Add a new :parse-leading-options-only argument which ignores dash/switch arguments after the first positional argument. (eshell--process-args): Abort processing of arguments if we see one positional argument and :parse-leading-options-only is set. * lisp/eshell/em-tramp.el (eshell/sudo): Use :parse-leading-options-only, to avoid parsing subcommand switches as switches of sudo itself. * test/lisp/eshell/esh-opt-tests.el: Add tests for new and old behavior.
This commit is contained in:
parent
92a8230e49
commit
a4c616e27a
3 changed files with 139 additions and 3 deletions
|
|
@ -107,6 +107,7 @@ Uses the system sudo through TRAMP's sudo method."
|
|||
'((?h "help" nil nil "show this usage screen")
|
||||
(?u "user" t user "execute a command as another USER")
|
||||
:show-usage
|
||||
:parse-leading-options-only
|
||||
:usage "[(-u | --user) USER] COMMAND
|
||||
Execute a COMMAND as the superuser or another USER.")
|
||||
(throw 'eshell-external
|
||||
|
|
|
|||
|
|
@ -80,6 +80,10 @@ arguments, some do not. The recognized :KEYWORDS are:
|
|||
If present, do not pass MACRO-ARGS through `eshell-flatten-list'
|
||||
and `eshell-stringify-list'.
|
||||
|
||||
:parse-leading-options-only
|
||||
If present, do not parse dash or switch arguments after the first
|
||||
positional argument. Instead, treat them as positional arguments themselves.
|
||||
|
||||
For example, OPTIONS might look like:
|
||||
|
||||
((?C nil nil multi-column \"multi-column display\")
|
||||
|
|
@ -245,12 +249,19 @@ switch is unrecognized."
|
|||
(list sym)))))
|
||||
options)))
|
||||
(ai 0) arg
|
||||
(eshell--args args))
|
||||
(while (< ai (length eshell--args))
|
||||
(eshell--args args)
|
||||
(pos-argument-found nil))
|
||||
(while (and (< ai (length eshell--args))
|
||||
;; Abort if we saw the first pos argument and option is set
|
||||
(not (and pos-argument-found
|
||||
(memq :parse-leading-options-only options))))
|
||||
(setq arg (nth ai eshell--args))
|
||||
(if (not (and (stringp arg)
|
||||
(string-match "^-\\(-\\)?\\(.*\\)" arg)))
|
||||
(setq ai (1+ ai))
|
||||
;; Positional argument found, skip
|
||||
(setq ai (1+ ai)
|
||||
pos-argument-found t)
|
||||
;; dash or switch argument found, parse
|
||||
(let* ((dash (match-string 1 arg))
|
||||
(switch (match-string 2 arg)))
|
||||
(if (= ai 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue