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
|
|
|
|
2013-01-01 09:11:05 +00:00
|
|
|
;; Copyright (C) 1999-2013 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
|
2008-05-06 03:36:21 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://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
|
|
|
(provide 'esh-opt)
|
|
|
|
|
Silence many eshell compilation warnings
* lisp/eshell/em-tramp.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/em-xtra.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/esh-ext.el: Adjust requires.
(eshell-parse-command, eshell-close-handles): Autoload.
* lisp/eshell/esh-io.el: Adjust requires.
(eshell-output-filter): Autoload.
* lisp/eshell/esh-util.el: No need to load tramp when compiling.
(tramp-file-name-structure, ange-ftp-ls, ange-ftp-file-modtime): Declare.
(eshell-parse-ange-ls): Require ange-ftp and tramp.
* lisp/eshell/em-alias.el, lisp/eshell/em-banner.el, lisp/eshell/em-basic.el:
* lisp/eshell/em-cmpl.el, lisp/eshell/em-glob.el, lisp/eshell/em-pred.el:
* lisp/eshell/em-prompt.el, lisp/eshell/em-rebind.el, lisp/eshell/em-smart.el:
* lisp/eshell/em-term.el, lisp/eshell/esh-arg.el, lisp/eshell/esh-mode.el:
* lisp/eshell/esh-opt.el, lisp/eshell/esh-proc.el:
* lisp/eshell/esh-var.el: Adjust requires.
* lisp/eshell/eshell.el: Do not require esh-util twice.
(eshell-add-input-to-history): Declare.
(eshell-command): Check history module is active before using it.
2013-05-22 21:57:27 -07:00
|
|
|
(require 'esh-ext)
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2013-05-15 19:55:41 -04:00
|
|
|
;; Unused.
|
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
|
|
|
;; (defgroup eshell-opt nil
|
|
|
|
;; "The options processing code handles command argument parsing for
|
|
|
|
;; Eshell commands implemented in Lisp."
|
|
|
|
;; :tag "Command options processing"
|
|
|
|
;; :group 'eshell)
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;;; User Functions:
|
|
|
|
|
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
|
|
|
|
If present, do not pass MACRO-ARGS through `eshell-flatten-list'
|
|
|
|
and `eshell-stringify-list'.
|
|
|
|
|
|
|
|
For example, OPTIONS might look like:
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
'((?C nil nil multi-column \"multi-column display\")
|
|
|
|
(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
|
|
|
|
|
|
|
Lastly, any remaining arguments will be available in a locally
|
|
|
|
interned variable `args' (created using a `let' form)."
|
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))
|
|
|
|
macro-args
|
|
|
|
(list 'eshell-stringify-list
|
|
|
|
(list 'eshell-flatten-list macro-args))))
|
|
|
|
(processed-args (eshell--do-opts ,name ,options temp-args))
|
|
|
|
,@(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))
|
|
|
|
,@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
|
|
|
|
2013-09-16 14:23:30 -04:00
|
|
|
(defun eshell--do-opts (name options 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."
|
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
|
|
|
|
(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
|
|
|
|
(eshell-external-command ext-command args))
|
|
|
|
args)))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-show-usage (name options)
|
|
|
|
"Display the usage message for NAME, using OPTIONS."
|
|
|
|
(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
|
|
|
|
(format "
|
|
|
|
This command is implemented in Lisp. If an unrecognized option is
|
|
|
|
passed to this command, the external version '%s'
|
|
|
|
will be called instead." extcmd)))))
|
|
|
|
(throw 'eshell-usage usage)))
|
|
|
|
|
2013-09-16 14:23:30 -04:00
|
|
|
(defun eshell--set-option (name ai opt options opt-vals)
|
2000-06-23 05:24:10 +00:00
|
|
|
"Using NAME's remaining args (index AI), set the OPT within OPTIONS.
|
|
|
|
If the option consumes an argument for its value, the argument list
|
|
|
|
will be modified."
|
|
|
|
(if (not (nth 3 opt))
|
|
|
|
(eshell-show-usage name options)
|
2013-09-16 14:23:30 -04:00
|
|
|
(setcdr (assq (nth 3 opt) opt-vals)
|
|
|
|
(if (eq (nth 2 opt) t)
|
|
|
|
(if (> ai (length eshell--args))
|
|
|
|
(error "%s: missing option argument" name)
|
|
|
|
(prog1 (nth ai eshell--args)
|
|
|
|
(if (> ai 0)
|
|
|
|
(setcdr (nthcdr (1- ai) eshell--args)
|
|
|
|
(nthcdr (1+ ai) eshell--args))
|
|
|
|
(setq eshell--args (cdr eshell--args)))))
|
|
|
|
(or (nth 2 opt) t)))))
|
|
|
|
|
|
|
|
(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.
|
|
|
|
|
|
|
|
SWITCH should be either a string or character. KIND should be the
|
|
|
|
integer 0 if it's a character, or 1 if it's a string.
|
|
|
|
|
|
|
|
The SWITCH is then be matched against OPTIONS. If no matching handler
|
|
|
|
is found, and an :external command is defined (and available), it will
|
|
|
|
be called; otherwise, an error will be triggered to say that the
|
|
|
|
switch is unrecognized."
|
|
|
|
(let* ((opts options)
|
|
|
|
found)
|
|
|
|
(while opts
|
|
|
|
(if (and (listp (car opts))
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 19:13:41 -04:00
|
|
|
(nth kind (car opts))
|
|
|
|
(equal switch (nth kind (car opts))))
|
2000-06-23 05:24:10 +00:00
|
|
|
(progn
|
2013-09-16 14:23:30 -04:00
|
|
|
(eshell--set-option name ai (car opts) options opt-vals)
|
2000-06-23 05:24:10 +00:00
|
|
|
(setq found t opts nil))
|
|
|
|
(setq opts (cdr opts))))
|
|
|
|
(unless found
|
|
|
|
(let ((extcmd (memq ':external options)))
|
|
|
|
(when extcmd
|
|
|
|
(setq extcmd (eshell-search-path (cadr extcmd)))
|
|
|
|
(if extcmd
|
|
|
|
(throw 'eshell-ext-command extcmd)
|
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
|
|
|
(error (if (characterp switch) "%s: unrecognized option -%c"
|
|
|
|
"%s: unrecognized option --%s")
|
|
|
|
name 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
|
|
|
|
(eshell--args args))
|
2000-06-23 05:24:10 +00:00
|
|
|
(while (< ai (length args))
|
|
|
|
(setq arg (nth ai args))
|
|
|
|
(if (not (and (stringp arg)
|
|
|
|
(string-match "^-\\(-\\)?\\(.*\\)" arg)))
|
|
|
|
(setq ai (1+ ai))
|
|
|
|
(let* ((dash (match-string 1 arg))
|
|
|
|
(switch (match-string 2 arg)))
|
|
|
|
(if (= ai 0)
|
|
|
|
(setq args (cdr args))
|
|
|
|
(setcdr (nthcdr (1- ai) args) (nthcdr (1+ ai) args)))
|
|
|
|
(if dash
|
|
|
|
(if (> (length switch) 0)
|
2013-09-16 14:23:30 -04:00
|
|
|
(eshell--process-option name switch 1 ai options opt-vals)
|
2000-06-23 05:24:10 +00:00
|
|
|
(setq ai (length args)))
|
|
|
|
(let ((len (length switch))
|
|
|
|
(index 0))
|
|
|
|
(while (< index len)
|
2013-09-16 14:23:30 -04:00
|
|
|
(eshell--process-option name (aref switch index)
|
|
|
|
0 ai options opt-vals)
|
|
|
|
(setq index (1+ index))))))))
|
|
|
|
(nconc (mapcar #'cdr opt-vals) args)))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;;; esh-opt.el ends here
|