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.
269 lines
9.8 KiB
EmacsLisp
269 lines
9.8 KiB
EmacsLisp
;;; esh-opt.el --- command options processing -*- lexical-binding:t -*-
|
||
|
||
;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
|
||
|
||
;; Author: John Wiegley <johnw@gnu.org>
|
||
|
||
;; This file is part of GNU Emacs.
|
||
|
||
;; GNU Emacs is free software: you can redistribute it and/or modify
|
||
;; it under the terms of the GNU General Public License as published by
|
||
;; the Free Software Foundation, either version 3 of the License, or
|
||
;; (at your option) any later version.
|
||
|
||
;; 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
|
||
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
||
|
||
;;; Commentary:
|
||
|
||
;;; Code:
|
||
|
||
(provide 'esh-opt)
|
||
|
||
(require 'esh-ext)
|
||
|
||
;; Unused.
|
||
;; (defgroup eshell-opt nil
|
||
;; "The options processing code handles command argument parsing for
|
||
;; Eshell commands implemented in Lisp."
|
||
;; :tag "Command options processing"
|
||
;; :group 'eshell)
|
||
|
||
;;; User Functions:
|
||
|
||
(defmacro eshell-eval-using-options (name macro-args options &rest body-forms)
|
||
"Process NAME's MACRO-ARGS using a set of command line OPTIONS.
|
||
After doing so, stores settings in local symbols as declared by OPTIONS;
|
||
then evaluates BODY-FORMS -- assuming all was OK.
|
||
|
||
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:
|
||
|
||
'((?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
|
||
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.
|
||
|
||
Lastly, any remaining arguments will be available in a locally
|
||
interned variable `args' (created using a `let' form)."
|
||
(declare (debug (form form sexp body)))
|
||
`(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))
|
||
|
||
;;; Internal Functions:
|
||
|
||
;; Documented part of the interface; see eshell-eval-using-options.
|
||
(defvar eshell--args)
|
||
|
||
(defun eshell--do-opts (name options args)
|
||
"Helper function for `eshell-eval-using-options'.
|
||
This code doesn't really need to be macro expanded everywhere."
|
||
(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))))))
|
||
(if ext-command
|
||
(throw 'eshell-external
|
||
(eshell-external-command ext-command args))
|
||
args)))
|
||
|
||
(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-message "
|
||
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)))
|
||
|
||
(defun eshell--set-option (name ai opt options opt-vals)
|
||
"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)
|
||
(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)
|
||
"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))
|
||
(nth kind (car opts))
|
||
(equal switch (nth kind (car opts))))
|
||
(progn
|
||
(eshell--set-option name ai (car opts) options opt-vals)
|
||
(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)
|
||
(error (if (characterp switch) "%s: unrecognized option -%c"
|
||
"%s: unrecognized option --%s")
|
||
name switch)))))))
|
||
|
||
(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))
|
||
(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)
|
||
(eshell--process-option name switch 1 ai options opt-vals)
|
||
(setq ai (length args)))
|
||
(let ((len (length switch))
|
||
(index 0))
|
||
(while (< index len)
|
||
(eshell--process-option name (aref switch index)
|
||
0 ai options opt-vals)
|
||
(setq index (1+ index))))))))
|
||
(nconc (mapcar #'cdr opt-vals) args)))
|
||
|
||
;;; esh-opt.el ends here
|