2013-09-12 16:15:53 -04:00
|
|
|
;;; esh-opt.el --- command options processing -*- lexical-binding:t -*-
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2023-01-01 05:31:12 -05:00
|
|
|
;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2000-10-16 12:27:09 +00:00
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:36:21 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-06-23 05:24:10 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:36:21 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2007-12-05 07:08:55 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
2009-01-22 06:33:06 +00:00
|
|
|
;;; Code:
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;;; User Functions:
|
|
|
|
|
2019-04-10 10:11:50 -04:00
|
|
|
;; Macro expansion of eshell-eval-using-options refers to eshell-stringify-list
|
|
|
|
;; defined in esh-util.
|
|
|
|
(require 'esh-util)
|
|
|
|
|
2023-02-12 23:25:59 -08:00
|
|
|
(defgroup eshell-opt nil
|
|
|
|
"Functions for argument parsing in Eshell commands."
|
|
|
|
:tag "Option parsing"
|
|
|
|
:group 'eshell)
|
|
|
|
|
2011-03-20 23:42:23 -07:00
|
|
|
(defmacro eshell-eval-using-options (name macro-args options &rest body-forms)
|
2000-06-23 05:24:10 +00:00
|
|
|
"Process NAME's MACRO-ARGS using a set of command line OPTIONS.
|
2011-03-20 23:42:23 -07:00
|
|
|
After doing so, stores settings in local symbols as declared by OPTIONS;
|
|
|
|
then evaluates BODY-FORMS -- assuming all was OK.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2011-03-20 23:42:23 -07:00
|
|
|
OPTIONS is a list, beginning with one or more elements of the form:
|
|
|
|
\(SHORT LONG VALUE SYMBOL HELP-STRING)
|
|
|
|
Each of these elements represents a particular command-line switch.
|
|
|
|
|
|
|
|
SHORT is either nil, or a character that can be used as a switch -SHORT.
|
|
|
|
LONG is either nil, or a string that can be used as a switch --LONG.
|
|
|
|
At least one of SHORT and LONG must be non-nil.
|
|
|
|
VALUE is the value associated with the option. It can be either:
|
|
|
|
t - the option needs a value to be specified after the switch;
|
|
|
|
nil - the option is given the value t;
|
|
|
|
anything else - specifies the actual value for the option.
|
|
|
|
SYMBOL is either nil, or the name of the Lisp symbol that will be bound
|
|
|
|
to VALUE. A nil SYMBOL calls `eshell-show-usage', and so is appropriate
|
|
|
|
for a \"--help\" type option.
|
|
|
|
HELP-STRING is a documentation string for the option.
|
|
|
|
|
|
|
|
Any remaining elements of OPTIONS are :KEYWORD arguments. Some take
|
|
|
|
arguments, some do not. The recognized :KEYWORDS are:
|
|
|
|
|
|
|
|
:external STRING
|
|
|
|
STRING is an external command to run if there are unknown switches.
|
|
|
|
|
|
|
|
:usage STRING
|
|
|
|
STRING is the initial part of the command's documentation string.
|
|
|
|
It appears before the options are listed.
|
|
|
|
|
|
|
|
:post-usage STRING
|
|
|
|
STRING is an optional trailing part of the command's documentation string.
|
|
|
|
It appears after the options, but before the final part of the
|
|
|
|
documentation about the associated external command (if there is one).
|
|
|
|
|
|
|
|
:show-usage
|
|
|
|
If present, then show the usage message if the command is called with no
|
|
|
|
arguments.
|
|
|
|
|
|
|
|
:preserve-args
|
New function flatten-tree
Co-authored-by: Basil L. Contovounesios <contovob@tcd.ie>
* doc/lispref/lists.texi: Document `flatten-tree'.
* lisp/progmodes/js.el (js--maybe-join):
* lisp/printing.el (pr-switches):
* lisp/lpr.el (lpr-print-region):
* lisp/gnus/nnimap.el (nnimap-find-wanted-parts):
* lisp/gnus/message.el (message-talkative-question):
* lisp/gnus/gnus-sum.el (gnus-remove-thread)
(gnus-thread-highest-number, gnus-thread-latest-date):
* lisp/eshell/esh-util.el (eshell-flatten-and-stringify):
* lisp/eshell/esh-opt.el (eshell-eval-using-options):
* lisp/eshell/esh-ext.el (eshell-external-command):
* lisp/eshell/em-xtra.el (eshell/expr):
* lisp/eshell/em-unix.el (eshell/rm, eshell-mvcpln-template)
(eshell/cat, eshell/make, eshell-poor-mans-grep, eshell-grep)
(eshell/du, eshell/time, eshell/diff, eshell/locate):
* lisp/eshell/em-tramp.el (eshell/su, eshell/sudo):
* lisp/eshell/em-term.el (eshell-exec-visual):
* lisp/eshell/em-dirs.el (eshell-dirs-substitute-cd, eshell/cd):
* lisp/eshell/em-basic.el (eshell/printnl):
Use new flatten-tree.
* lisp/progmodes/js.el (js--flatten-list):
* lisp/lpr.el (lpr-flatten-list):
* lisp/gnus/message.el (message-flatten-list):
* lisp/eshell/esh-util.el (eshell-flatten-list):
Obsolete in favor of Emacs-wide `flatten-tree'.
* lisp/subr.el (flatten-list): Alias to `flatten-tree' for
discoverability.
* lisp/subr.el (flatten-tree): New defun.
* test/lisp/subr-tests.el (subr-tests-flatten-tree): New test.
2018-12-17 12:15:09 +01:00
|
|
|
If present, do not pass MACRO-ARGS through `flatten-tree'
|
2011-03-20 23:42:23 -07:00
|
|
|
and `eshell-stringify-list'.
|
|
|
|
|
2018-05-08 12:36:36 -07:00
|
|
|
: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.
|
|
|
|
|
2011-03-20 23:42:23 -07:00
|
|
|
For example, OPTIONS might look like:
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2015-09-01 18:21:42 -07:00
|
|
|
((?C nil nil multi-column \"multi-column display\")
|
2000-06-23 05:24:10 +00:00
|
|
|
(nil \"help\" nil nil \"show this usage display\")
|
|
|
|
(?r \"reverse\" nil reverse-list \"reverse order while sorting\")
|
|
|
|
:external \"ls\"
|
|
|
|
:usage \"[OPTION]... [FILE]...
|
|
|
|
List information about the FILEs (the current directory by default).
|
|
|
|
Sort entries alphabetically across.\")
|
|
|
|
|
|
|
|
`eshell-eval-using-options' returns the value of the last form in
|
2011-03-20 23:42:23 -07:00
|
|
|
BODY-FORMS. If instead an external command is run (because of
|
|
|
|
an unknown option), the tag `eshell-external' will be thrown with
|
|
|
|
the new process for its value.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2018-03-10 21:49:22 -05:00
|
|
|
Lastly, any remaining arguments will be available in the locally
|
|
|
|
let-bound variable `args'."
|
2007-08-26 01:52:30 +00:00
|
|
|
(declare (debug (form form sexp body)))
|
2013-09-16 14:23:30 -04:00
|
|
|
`(let* ((temp-args
|
|
|
|
,(if (memq ':preserve-args (cadr options))
|
2022-01-24 21:03:42 -08:00
|
|
|
(list 'copy-tree macro-args)
|
2013-09-16 14:23:30 -04:00
|
|
|
(list 'eshell-stringify-list
|
New function flatten-tree
Co-authored-by: Basil L. Contovounesios <contovob@tcd.ie>
* doc/lispref/lists.texi: Document `flatten-tree'.
* lisp/progmodes/js.el (js--maybe-join):
* lisp/printing.el (pr-switches):
* lisp/lpr.el (lpr-print-region):
* lisp/gnus/nnimap.el (nnimap-find-wanted-parts):
* lisp/gnus/message.el (message-talkative-question):
* lisp/gnus/gnus-sum.el (gnus-remove-thread)
(gnus-thread-highest-number, gnus-thread-latest-date):
* lisp/eshell/esh-util.el (eshell-flatten-and-stringify):
* lisp/eshell/esh-opt.el (eshell-eval-using-options):
* lisp/eshell/esh-ext.el (eshell-external-command):
* lisp/eshell/em-xtra.el (eshell/expr):
* lisp/eshell/em-unix.el (eshell/rm, eshell-mvcpln-template)
(eshell/cat, eshell/make, eshell-poor-mans-grep, eshell-grep)
(eshell/du, eshell/time, eshell/diff, eshell/locate):
* lisp/eshell/em-tramp.el (eshell/su, eshell/sudo):
* lisp/eshell/em-term.el (eshell-exec-visual):
* lisp/eshell/em-dirs.el (eshell-dirs-substitute-cd, eshell/cd):
* lisp/eshell/em-basic.el (eshell/printnl):
Use new flatten-tree.
* lisp/progmodes/js.el (js--flatten-list):
* lisp/lpr.el (lpr-flatten-list):
* lisp/gnus/message.el (message-flatten-list):
* lisp/eshell/esh-util.el (eshell-flatten-list):
Obsolete in favor of Emacs-wide `flatten-tree'.
* lisp/subr.el (flatten-list): Alias to `flatten-tree' for
discoverability.
* lisp/subr.el (flatten-tree): New defun.
* test/lisp/subr-tests.el (subr-tests-flatten-tree): New test.
2018-12-17 12:15:09 +01:00
|
|
|
(list 'flatten-tree macro-args))))
|
2022-01-24 21:03:42 -08:00
|
|
|
(processed-args (eshell--do-opts ,name ,options temp-args ,macro-args))
|
2013-09-16 14:23:30 -04:00
|
|
|
,@(delete-dups
|
|
|
|
(delq nil (mapcar (lambda (opt)
|
|
|
|
(and (listp opt) (nth 3 opt)
|
|
|
|
`(,(nth 3 opt) (pop processed-args))))
|
|
|
|
;; `options' is of the form (quote OPTS).
|
|
|
|
(cadr options))))
|
|
|
|
(args processed-args))
|
2018-03-10 21:49:22 -05:00
|
|
|
;; Silence unused lexical variable warning if body does not use `args'.
|
|
|
|
(ignore args)
|
2013-09-16 14:23:30 -04:00
|
|
|
,@body-forms))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;;; Internal Functions:
|
|
|
|
|
2010-11-10 20:11:33 -08:00
|
|
|
;; Documented part of the interface; see eshell-eval-using-options.
|
Cleanup Eshell to rely less on dynamic scoping.
* lisp/eshell/esh-opt.el (eshell-eval-using-options): Don't bind usage-msg,
last-value, and ext-command here. Bind `args' closer to `body'.
(temp-args, last-value, usage-msg, ext-command, args): Don't defvar.
(eshell--args): Declare new dynamic var.
(eshell-do-opt): Add argument `args'. Bind our own usage-msg,
last-value, and ext-command. Pass `args' to `body'.
(eshell-process-args): Bind eshell--args.
(eshell-set-option): Use eshell--args.
* lisp/eshell/eshell.el (eshell): Use derived-mode-p.
* lisp/eshell/esh-var.el (eshell-parse-variable): Use backquote.
(eshell-parse-variable-ref): Remove unused vars `end' and `err'.
(eshell-glob-function): Declare.
* lisp/eshell/esh-util.el: Require cl-lib.
(eshell-read-hosts-file): Avoid add-to-list.
* lisp/eshell/esh-cmd.el (eshell-parse-lisp-argument): Remove unused var
`err'.
* lisp/eshell/em-unix.el (compilation-scroll-output, locate-history-list):
Declare.
(eshell/diff): Remove unused var `err'.
* lisp/eshell/em-rebind.el (eshell-delete-backward-char): Remove unused arg
`killflag'.
* lisp/eshell/em-pred.el (eshell-parse-modifiers): Remove unused var `err'.
* lisp/eshell/em-ls.el (eshell-ls-highlight-alist): Move defvars before
first use.
* lisp/eshell/em-glob.el (eshell-glob-matches, message-shown):
Move declaration before first use.
* lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias): Use backquotes.
* autorevert.el (auto-revert-notify-handler): Use `cl-dolist' since we
rely on cl-return.
2013-09-12 01:20:07 -04:00
|
|
|
(defvar eshell--args)
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2022-01-24 21:03:42 -08:00
|
|
|
(defun eshell--do-opts (name options args orig-args)
|
2000-06-23 05:24:10 +00:00
|
|
|
"Helper function for `eshell-eval-using-options'.
|
|
|
|
This code doesn't really need to be macro expanded everywhere."
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(require 'esh-ext)
|
|
|
|
(declare-function eshell-external-command "esh-ext" (command args))
|
2013-09-16 14:23:30 -04:00
|
|
|
(let ((ext-command
|
|
|
|
(catch 'eshell-ext-command
|
|
|
|
(let ((usage-msg
|
|
|
|
(catch 'eshell-usage
|
|
|
|
(if (and (= (length args) 0)
|
|
|
|
(memq ':show-usage options))
|
|
|
|
(eshell-show-usage name options)
|
|
|
|
(setq args (eshell--process-args name args options))
|
|
|
|
nil))))
|
|
|
|
(when usage-msg
|
2022-12-11 10:56:49 -05:00
|
|
|
(user-error "%s" usage-msg))))))
|
Cleanup Eshell to rely less on dynamic scoping.
* lisp/eshell/esh-opt.el (eshell-eval-using-options): Don't bind usage-msg,
last-value, and ext-command here. Bind `args' closer to `body'.
(temp-args, last-value, usage-msg, ext-command, args): Don't defvar.
(eshell--args): Declare new dynamic var.
(eshell-do-opt): Add argument `args'. Bind our own usage-msg,
last-value, and ext-command. Pass `args' to `body'.
(eshell-process-args): Bind eshell--args.
(eshell-set-option): Use eshell--args.
* lisp/eshell/eshell.el (eshell): Use derived-mode-p.
* lisp/eshell/esh-var.el (eshell-parse-variable): Use backquote.
(eshell-parse-variable-ref): Remove unused vars `end' and `err'.
(eshell-glob-function): Declare.
* lisp/eshell/esh-util.el: Require cl-lib.
(eshell-read-hosts-file): Avoid add-to-list.
* lisp/eshell/esh-cmd.el (eshell-parse-lisp-argument): Remove unused var
`err'.
* lisp/eshell/em-unix.el (compilation-scroll-output, locate-history-list):
Declare.
(eshell/diff): Remove unused var `err'.
* lisp/eshell/em-rebind.el (eshell-delete-backward-char): Remove unused arg
`killflag'.
* lisp/eshell/em-pred.el (eshell-parse-modifiers): Remove unused var `err'.
* lisp/eshell/em-ls.el (eshell-ls-highlight-alist): Move defvars before
first use.
* lisp/eshell/em-glob.el (eshell-glob-matches, message-shown):
Move declaration before first use.
* lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias): Use backquotes.
* autorevert.el (auto-revert-notify-handler): Use `cl-dolist' since we
rely on cl-return.
2013-09-12 01:20:07 -04:00
|
|
|
(if ext-command
|
2013-09-16 14:23:30 -04:00
|
|
|
(throw 'eshell-external
|
2022-01-24 21:03:42 -08:00
|
|
|
(eshell-external-command ext-command orig-args))
|
2013-09-16 14:23:30 -04:00
|
|
|
args)))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-show-usage (name options)
|
|
|
|
"Display the usage message for NAME, using OPTIONS."
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(require 'esh-ext)
|
|
|
|
(declare-function eshell-search-path "esh-ext" (name))
|
2000-06-23 05:24:10 +00:00
|
|
|
(let ((usage (format "usage: %s %s\n\n" name
|
|
|
|
(cadr (memq ':usage options))))
|
|
|
|
(extcmd (memq ':external options))
|
|
|
|
(post-usage (memq ':post-usage options))
|
|
|
|
had-option)
|
|
|
|
(while options
|
|
|
|
(when (listp (car options))
|
|
|
|
(let ((opt (car options)))
|
|
|
|
(setq had-option t)
|
|
|
|
(cond ((and (nth 0 opt)
|
|
|
|
(nth 1 opt))
|
|
|
|
(setq usage
|
|
|
|
(concat usage
|
|
|
|
(format " %-20s %s\n"
|
|
|
|
(format "-%c, --%s" (nth 0 opt)
|
|
|
|
(nth 1 opt))
|
|
|
|
(nth 4 opt)))))
|
|
|
|
((nth 0 opt)
|
|
|
|
(setq usage
|
|
|
|
(concat usage
|
|
|
|
(format " %-20s %s\n"
|
|
|
|
(format "-%c" (nth 0 opt))
|
|
|
|
(nth 4 opt)))))
|
|
|
|
((nth 1 opt)
|
|
|
|
(setq usage
|
|
|
|
(concat usage
|
|
|
|
(format " %-20s %s\n"
|
|
|
|
(format " --%s" (nth 1 opt))
|
|
|
|
(nth 4 opt)))))
|
|
|
|
(t (setq had-option nil)))))
|
|
|
|
(setq options (cdr options)))
|
|
|
|
(if post-usage
|
|
|
|
(setq usage (concat usage (and had-option "\n")
|
|
|
|
(cadr post-usage))))
|
|
|
|
(when extcmd
|
|
|
|
(setq extcmd (eshell-search-path (cadr extcmd)))
|
|
|
|
(if extcmd
|
|
|
|
(setq usage
|
|
|
|
(concat usage
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-24 23:39:33 -07:00
|
|
|
(format-message "
|
2000-06-23 05:24:10 +00:00
|
|
|
This command is implemented in Lisp. If an unrecognized option is
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 08:41:44 -07:00
|
|
|
passed to this command, the external version `%s'
|
2000-06-23 05:24:10 +00:00
|
|
|
will be called instead." extcmd)))))
|
|
|
|
(throw 'eshell-usage usage)))
|
|
|
|
|
2022-01-04 12:58:38 -08:00
|
|
|
(defun eshell--split-switch (switch kind)
|
|
|
|
"Split SWITCH into its option name and potential value, if any.
|
|
|
|
KIND should be the integer 0 if SWITCH is a short option, or 1 if it's
|
|
|
|
a long option."
|
|
|
|
(if (eq kind 0)
|
|
|
|
;; Short option
|
|
|
|
(cons (aref switch 0)
|
|
|
|
(and (> (length switch) 1) (substring switch 1)))
|
|
|
|
;; Long option
|
|
|
|
(save-match-data
|
|
|
|
(string-match "\\([^=]*\\)\\(?:=\\(.*\\)\\)?" switch)
|
|
|
|
(cons (match-string 1 switch) (match-string 2 switch)))))
|
|
|
|
|
|
|
|
(defun eshell--set-option (name ai opt value options opt-vals)
|
2000-06-23 05:24:10 +00:00
|
|
|
"Using NAME's remaining args (index AI), set the OPT within OPTIONS.
|
2022-01-04 12:58:38 -08:00
|
|
|
VALUE is the potential value of the OPT, coming from args like
|
|
|
|
\"-fVALUE\" or \"--foo=VALUE\", or nil if no value was supplied. If
|
|
|
|
OPT doesn't consume a value, return VALUE unchanged so that it can be
|
2022-05-15 11:15:06 +02:00
|
|
|
processed later; otherwise, return nil.
|
2022-01-04 12:58:38 -08:00
|
|
|
|
|
|
|
If the OPT consumes an argument for its value and VALUE is nil, the
|
|
|
|
argument list will be modified."
|
2000-06-23 05:24:10 +00:00
|
|
|
(if (not (nth 3 opt))
|
|
|
|
(eshell-show-usage name options)
|
2022-01-04 12:58:38 -08:00
|
|
|
(if (eq (nth 2 opt) t)
|
|
|
|
(progn
|
|
|
|
(setcdr (assq (nth 3 opt) opt-vals)
|
|
|
|
(or value
|
|
|
|
(if (> ai (length eshell--args))
|
|
|
|
(error "%s: missing option argument" name)
|
|
|
|
(pop (nthcdr ai eshell--args)))))
|
|
|
|
nil)
|
|
|
|
(setcdr (assq (nth 3 opt) opt-vals)
|
|
|
|
(or (nth 2 opt) t))
|
|
|
|
value)))
|
2013-09-16 14:23:30 -04:00
|
|
|
|
|
|
|
(defun eshell--process-option (name switch kind ai options opt-vals)
|
2000-06-23 05:24:10 +00:00
|
|
|
"For NAME, process SWITCH (of type KIND), from args at index AI.
|
|
|
|
The SWITCH will be looked up in the set of OPTIONS.
|
|
|
|
|
2022-01-04 12:58:38 -08:00
|
|
|
SWITCH should be a string starting with the option to process,
|
|
|
|
possibly followed by its value, e.g. \"u\" or \"uUSER\". KIND should
|
|
|
|
be the integer 0 if it's a short option, or 1 if it's a long option.
|
|
|
|
|
|
|
|
The SWITCH is then be matched against OPTIONS. If KIND is 0 and the
|
|
|
|
SWITCH matches an option that doesn't take a value, return the
|
|
|
|
remaining characters in SWITCH to be processed later as further short
|
|
|
|
options.
|
|
|
|
|
|
|
|
If no matching handler is found, and an :external command is defined
|
2022-12-11 10:56:49 -05:00
|
|
|
\(and available), it will be called; otherwise, an error will be
|
2022-01-04 12:58:38 -08:00
|
|
|
triggered to say that the switch is unrecognized."
|
|
|
|
(let ((switch (eshell--split-switch switch kind))
|
|
|
|
(opts options)
|
|
|
|
found remaining)
|
2000-06-23 05:24:10 +00:00
|
|
|
(while opts
|
|
|
|
(if (and (listp (car opts))
|
2022-01-04 12:58:38 -08:00
|
|
|
(equal (car switch) (nth kind (car opts))))
|
2000-06-23 05:24:10 +00:00
|
|
|
(progn
|
2022-01-04 12:58:38 -08:00
|
|
|
(setq remaining (eshell--set-option name ai (car opts)
|
|
|
|
(cdr switch) options opt-vals))
|
|
|
|
(when (and remaining (eq kind 1))
|
|
|
|
(error "%s: option --%s doesn't allow an argument"
|
|
|
|
name (car switch)))
|
2000-06-23 05:24:10 +00:00
|
|
|
(setq found t opts nil))
|
|
|
|
(setq opts (cdr opts))))
|
2022-01-04 12:58:38 -08:00
|
|
|
(if found
|
|
|
|
remaining
|
2000-06-23 05:24:10 +00:00
|
|
|
(let ((extcmd (memq ':external options)))
|
|
|
|
(when extcmd
|
2022-01-19 18:59:23 -08:00
|
|
|
(setq extcmd (eshell-search-path (cadr extcmd))))
|
|
|
|
(if extcmd
|
|
|
|
(throw 'eshell-ext-command extcmd)
|
|
|
|
(error (if (characterp (car switch)) "%s: unrecognized option -%c"
|
|
|
|
"%s: unrecognized option --%s")
|
|
|
|
name (car switch)))))))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2013-09-16 14:23:30 -04:00
|
|
|
(defun eshell--process-args (name args options)
|
|
|
|
"Process the given ARGS using OPTIONS."
|
|
|
|
(let* ((seen ())
|
|
|
|
(opt-vals (delq nil (mapcar (lambda (opt)
|
|
|
|
(when (listp opt)
|
|
|
|
(let ((sym (nth 3 opt)))
|
|
|
|
(when (and sym (not (memq sym seen)))
|
|
|
|
(push sym seen)
|
|
|
|
(list sym)))))
|
|
|
|
options)))
|
|
|
|
(ai 0) arg
|
2018-05-08 12:36:36 -07:00
|
|
|
(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))))
|
2018-05-08 12:04:00 -07:00
|
|
|
(setq arg (nth ai eshell--args))
|
2000-06-23 05:24:10 +00:00
|
|
|
(if (not (and (stringp arg)
|
2022-01-24 21:08:50 -08:00
|
|
|
;; A string of length 1 can't be an option; (if
|
|
|
|
;; it's "-", that generally means stdin).
|
|
|
|
(> (length arg) 1)
|
2000-06-23 05:24:10 +00:00
|
|
|
(string-match "^-\\(-\\)?\\(.*\\)" arg)))
|
2018-05-08 12:36:36 -07:00
|
|
|
;; Positional argument found, skip
|
|
|
|
(setq ai (1+ ai)
|
|
|
|
pos-argument-found t)
|
|
|
|
;; dash or switch argument found, parse
|
2000-06-23 05:24:10 +00:00
|
|
|
(let* ((dash (match-string 1 arg))
|
|
|
|
(switch (match-string 2 arg)))
|
2018-05-12 15:09:18 -04:00
|
|
|
(pop (nthcdr ai eshell--args))
|
2000-06-23 05:24:10 +00:00
|
|
|
(if dash
|
|
|
|
(if (> (length switch) 0)
|
2013-09-16 14:23:30 -04:00
|
|
|
(eshell--process-option name switch 1 ai options opt-vals)
|
2018-05-08 12:04:00 -07:00
|
|
|
(setq ai (length eshell--args)))
|
2022-01-24 21:08:50 -08:00
|
|
|
(while (> (length switch) 0)
|
|
|
|
(setq switch (eshell--process-option name switch 0
|
|
|
|
ai options opt-vals)))))))
|
2018-05-08 12:04:00 -07:00
|
|
|
(nconc (mapcar #'cdr opt-vals) eshell--args)))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(provide 'esh-opt)
|
2000-06-23 05:24:10 +00:00
|
|
|
;;; esh-opt.el ends here
|