2013-09-12 16:15:53 -04:00
|
|
|
;;; esh-var.el --- handling of variables -*- lexical-binding:t -*-
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
;; Copyright (C) 1999-2019 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
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; These are the possible variable interpolation syntaxes. Also keep
|
|
|
|
;; in mind that if an argument looks like a number, it will be
|
|
|
|
;; converted to a number. This is not significant when invoking
|
|
|
|
;; external commands, but it's important when calling Lisp functions.
|
|
|
|
;;
|
|
|
|
;; $VARIABLE
|
|
|
|
;;
|
|
|
|
;; Interval the value of an environment variable, or a Lisp variable
|
|
|
|
;;
|
|
|
|
;; $ALSO-VAR
|
|
|
|
;;
|
2008-02-05 12:07:11 +00:00
|
|
|
;; "-" is a valid part of a variable name.
|
2000-06-23 05:24:10 +00:00
|
|
|
;;
|
|
|
|
;; $<MYVAR>-TOO
|
|
|
|
;;
|
|
|
|
;; Only "MYVAR" is part of the variable name in this case.
|
|
|
|
;;
|
|
|
|
;; $#VARIABLE
|
|
|
|
;;
|
|
|
|
;; Returns the length of the value of VARIABLE. This could also be
|
|
|
|
;; done using the `length' Lisp function.
|
|
|
|
;;
|
|
|
|
;; $(lisp)
|
|
|
|
;;
|
|
|
|
;; Returns result of lisp evaluation. Note: Used alone like this, it
|
|
|
|
;; is identical to just saying (lisp); but with the variable expansion
|
|
|
|
;; form, the result may be interpolated a larger string, such as
|
|
|
|
;; '$(lisp)/other'.
|
|
|
|
;;
|
|
|
|
;; ${command}
|
|
|
|
;;
|
|
|
|
;; Returns the value of an eshell subcommand. See the note above
|
|
|
|
;; regarding Lisp evaluations.
|
|
|
|
;;
|
|
|
|
;; $ANYVAR[10]
|
|
|
|
;;
|
|
|
|
;; Return the 10th element of ANYVAR. If ANYVAR's value is a string,
|
|
|
|
;; it will be split in order to make it a list. The splitting will
|
|
|
|
;; occur at whitespace.
|
|
|
|
;;
|
|
|
|
;; $ANYVAR[: 10]
|
|
|
|
;;
|
|
|
|
;; As above, except that splitting occurs at the colon now.
|
|
|
|
;;
|
|
|
|
;; $ANYVAR[: 10 20]
|
|
|
|
;;
|
|
|
|
;; As above, but instead of returning just a string, it now returns a
|
|
|
|
;; list of two strings. If the result is being interpolated into a
|
|
|
|
;; larger string, this list will be flattened into one big string,
|
|
|
|
;; with each element separated by a space.
|
|
|
|
;;
|
|
|
|
;; $ANYVAR["\\\\" 10]
|
|
|
|
;;
|
|
|
|
;; Separate on backslash characters. Actually, the first argument --
|
|
|
|
;; if it doesn't have the form of a number, or a plain variable name
|
|
|
|
;; -- can be any regular expression. So to split on numbers, use
|
|
|
|
;; '$ANYVAR["[0-9]+" 10 20]'.
|
|
|
|
;;
|
|
|
|
;; $ANYVAR[hello]
|
|
|
|
;;
|
|
|
|
;; Calls `assoc' on ANYVAR with 'hello', expecting it to be an alist.
|
|
|
|
;;
|
|
|
|
;; $#ANYVAR[hello]
|
|
|
|
;;
|
|
|
|
;; Returns the length of the cdr of the element of ANYVAR who car is
|
|
|
|
;; equal to "hello".
|
|
|
|
;;
|
|
|
|
;; There are also a few special variables defined by Eshell. '$$' is
|
|
|
|
;; the value of the last command (t or nil, in the case of an external
|
|
|
|
;; command). This makes it possible to chain results:
|
|
|
|
;;
|
|
|
|
;; /tmp $ echo /var/spool/mail/johnw
|
|
|
|
;; /var/spool/mail/johnw
|
|
|
|
;; /tmp $ dirname $$
|
|
|
|
;; /var/spool/mail/
|
|
|
|
;; /tmp $ cd $$
|
|
|
|
;; /var/spool/mail $
|
|
|
|
;;
|
|
|
|
;; '$_' refers to the last argument of the last command. And $?
|
|
|
|
;; contains the exit code of the last command (0 or 1 for Lisp
|
|
|
|
;; functions, based on successful completion).
|
|
|
|
|
2009-01-22 06:33:06 +00:00
|
|
|
;;; Code:
|
|
|
|
|
2007-12-05 07:09:53 +00:00
|
|
|
(provide 'esh-var)
|
|
|
|
|
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-util)
|
|
|
|
(require 'esh-cmd)
|
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
|
|
|
(require '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 'pcomplete)
|
2000-06-23 05:24:10 +00:00
|
|
|
(require 'env)
|
|
|
|
(require 'ring)
|
|
|
|
|
2007-12-05 07:09:53 +00:00
|
|
|
(defgroup eshell-var nil
|
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
|
|
|
"Variable interpolation is introduced whenever the `$' character
|
2007-12-05 07:09:53 +00:00
|
|
|
appears unquoted in any argument (except when that argument is
|
|
|
|
surrounded by single quotes). It may be used to interpolate a
|
|
|
|
variable value, a subcommand, or even the result of a Lisp form."
|
|
|
|
:tag "Variable handling"
|
|
|
|
:group 'eshell)
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;;; User Variables:
|
|
|
|
|
2011-03-04 20:11:05 -08:00
|
|
|
(defcustom eshell-var-load-hook nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"A list of functions to call when loading `eshell-var'."
|
2011-03-04 20:11:05 -08:00
|
|
|
:version "24.1" ; removed eshell-var-initialize
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'hook
|
|
|
|
:group 'eshell-var)
|
|
|
|
|
|
|
|
(defcustom eshell-prefer-lisp-variables nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"If non-nil, prefer Lisp variables to environment variables."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'eshell-var)
|
|
|
|
|
|
|
|
(defcustom eshell-complete-export-definition t
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"If non-nil, completing names for `export' shows current definition."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'eshell-var)
|
|
|
|
|
2002-05-03 20:43:53 +00:00
|
|
|
(defcustom eshell-modify-global-environment nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"If non-nil, using `export' changes Emacs's global environment."
|
2002-05-03 20:43:53 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'eshell-var)
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
(defcustom eshell-variable-name-regexp "[A-Za-z0-9_-]+"
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"A regexp identifying what constitutes a variable name reference.
|
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
|
|
|
Note that this only applies for `$NAME'. If the syntax `$<NAME>' is
|
2000-06-23 05:24:10 +00:00
|
|
|
used, then NAME can contain any character, including angle brackets,
|
|
|
|
if they are quoted with a backslash."
|
|
|
|
:type 'regexp
|
|
|
|
:group 'eshell-var)
|
|
|
|
|
|
|
|
(defcustom eshell-variable-aliases-list
|
|
|
|
'(;; for eshell.el
|
|
|
|
("COLUMNS" (lambda (indices) (window-width)) t)
|
|
|
|
("LINES" (lambda (indices) (window-height)) t)
|
|
|
|
|
|
|
|
;; for eshell-cmd.el
|
|
|
|
("_" (lambda (indices)
|
|
|
|
(if (not indices)
|
|
|
|
(car (last eshell-last-arguments))
|
|
|
|
(eshell-apply-indices eshell-last-arguments
|
|
|
|
indices))))
|
|
|
|
("?" eshell-last-command-status)
|
|
|
|
("$" eshell-last-command-result)
|
|
|
|
("0" eshell-command-name)
|
|
|
|
("1" (lambda (indices) (nth 0 eshell-command-arguments)))
|
|
|
|
("2" (lambda (indices) (nth 1 eshell-command-arguments)))
|
|
|
|
("3" (lambda (indices) (nth 2 eshell-command-arguments)))
|
|
|
|
("4" (lambda (indices) (nth 3 eshell-command-arguments)))
|
|
|
|
("5" (lambda (indices) (nth 4 eshell-command-arguments)))
|
|
|
|
("6" (lambda (indices) (nth 5 eshell-command-arguments)))
|
|
|
|
("7" (lambda (indices) (nth 6 eshell-command-arguments)))
|
|
|
|
("8" (lambda (indices) (nth 7 eshell-command-arguments)))
|
|
|
|
("9" (lambda (indices) (nth 8 eshell-command-arguments)))
|
|
|
|
("*" (lambda (indices)
|
|
|
|
(if (not indices)
|
|
|
|
eshell-command-arguments
|
|
|
|
(eshell-apply-indices eshell-command-arguments
|
|
|
|
indices)))))
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"This list provides aliasing for variable references.
|
2000-06-23 05:24:10 +00:00
|
|
|
It is very similar in concept to what `eshell-user-aliases-list' does
|
2013-09-14 16:55:15 -07:00
|
|
|
for commands. Each member of this defines the name of a command,
|
|
|
|
and the Lisp value to return for that variable if it is accessed
|
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
|
|
|
via the syntax `$NAME'.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
If the value is a function, that function will be called with two
|
|
|
|
arguments: the list of the indices that was used in the reference, and
|
|
|
|
whether the user is requesting the length of the ultimate element.
|
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
|
|
|
For example, a reference of `$NAME[10][20]' would result in the
|
2000-06-23 05:24:10 +00:00
|
|
|
function for alias `NAME' being called (assuming it were aliased to a
|
|
|
|
function), and the arguments passed to this function would be the list
|
|
|
|
'(10 20)', and nil."
|
|
|
|
:type '(repeat (list string sexp
|
|
|
|
(choice (const :tag "Copy to environment" t)
|
|
|
|
(const :tag "Use only in Eshell" nil))))
|
|
|
|
:group 'eshell-var)
|
|
|
|
|
|
|
|
(put 'eshell-variable-aliases-list 'risky-local-variable t)
|
|
|
|
|
|
|
|
;;; Functions:
|
|
|
|
|
|
|
|
(defun eshell-var-initialize ()
|
|
|
|
"Initialize the variable handle code."
|
|
|
|
;; Break the association with our parent's environment. Otherwise,
|
|
|
|
;; changing a variable will affect all of Emacs.
|
2002-05-03 20:43:53 +00:00
|
|
|
(unless eshell-modify-global-environment
|
|
|
|
(set (make-local-variable 'process-environment)
|
|
|
|
(eshell-copy-environment)))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(define-key eshell-command-map [(meta ?v)] 'eshell-insert-envvar)
|
|
|
|
|
|
|
|
(set (make-local-variable 'eshell-special-chars-inside-quoting)
|
|
|
|
(append eshell-special-chars-inside-quoting '(?$)))
|
|
|
|
(set (make-local-variable 'eshell-special-chars-outside-quoting)
|
|
|
|
(append eshell-special-chars-outside-quoting '(?$)))
|
|
|
|
|
|
|
|
(add-hook 'eshell-parse-argument-hook 'eshell-interpolate-variable t t)
|
|
|
|
|
|
|
|
(add-hook 'eshell-prepare-command-hook
|
|
|
|
'eshell-handle-local-variables nil t)
|
|
|
|
|
|
|
|
(when (eshell-using-module 'eshell-cmpl)
|
|
|
|
(add-hook 'pcomplete-try-first-hook
|
|
|
|
'eshell-complete-variable-reference nil t)
|
|
|
|
(add-hook 'pcomplete-try-first-hook
|
|
|
|
'eshell-complete-variable-assignment nil t)))
|
|
|
|
|
|
|
|
(defun eshell-handle-local-variables ()
|
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
|
|
|
"Allow for the syntax `VAR=val <command> <args>'."
|
2000-06-23 05:24:10 +00:00
|
|
|
;; strip off any null commands, which can only happen if a variable
|
|
|
|
;; evaluates to nil, such as "$var x", where `var' is nil. The
|
|
|
|
;; command name in that case becomes `x', for compatibility with
|
|
|
|
;; most regular shells (the difference is that they do an
|
|
|
|
;; interpolation pass before the argument parsing pass, but Eshell
|
|
|
|
;; does both at the same time).
|
|
|
|
(while (and (not eshell-last-command-name)
|
|
|
|
eshell-last-arguments)
|
|
|
|
(setq eshell-last-command-name (car eshell-last-arguments)
|
|
|
|
eshell-last-arguments (cdr eshell-last-arguments)))
|
|
|
|
(let ((setvar "\\`\\([A-Za-z_][A-Za-z0-9_]*\\)=\\(.*\\)\\'")
|
|
|
|
(command (eshell-stringify eshell-last-command-name))
|
|
|
|
(args eshell-last-arguments))
|
|
|
|
;; local variable settings (such as 'CFLAGS=-O2 make') are handled
|
|
|
|
;; by making the whole command into a subcommand, and calling
|
|
|
|
;; setenv immediately before the command is invoked. This means
|
|
|
|
;; that 'BLAH=x cd blah' won't work exactly as expected, but that
|
|
|
|
;; is by no means a typical use of local environment variables.
|
|
|
|
(if (and command (string-match setvar command))
|
|
|
|
(throw
|
|
|
|
'eshell-replace-command
|
|
|
|
(list
|
|
|
|
'eshell-as-subcommand
|
|
|
|
(append
|
|
|
|
(list 'progn)
|
|
|
|
(let ((l (list t)))
|
|
|
|
(while (string-match setvar command)
|
|
|
|
(nconc
|
|
|
|
l (list
|
|
|
|
(list 'setenv (match-string 1 command)
|
|
|
|
(match-string 2 command)
|
|
|
|
(= (length (match-string 2 command)) 0))))
|
|
|
|
(setq command (eshell-stringify (car args))
|
|
|
|
args (cdr args)))
|
|
|
|
(cdr l))
|
|
|
|
(list (list 'eshell-named-command
|
|
|
|
command (list 'quote args)))))))))
|
|
|
|
|
|
|
|
(defun eshell-interpolate-variable ()
|
|
|
|
"Parse a variable interpolation.
|
|
|
|
This function is explicit for adding to `eshell-parse-argument-hook'."
|
|
|
|
(when (and (eq (char-after) ?$)
|
2000-08-29 00:47:45 +00:00
|
|
|
(/= (1+ (point)) (point-max)))
|
2000-06-23 05:24:10 +00:00
|
|
|
(forward-char)
|
|
|
|
(list 'eshell-escape-arg
|
|
|
|
(eshell-parse-variable))))
|
|
|
|
|
|
|
|
(defun eshell/define (var-alias definition)
|
2002-10-17 16:52:29 +00:00
|
|
|
"Define a VAR-ALIAS using DEFINITION."
|
2000-06-23 05:24:10 +00:00
|
|
|
(if (not definition)
|
|
|
|
(setq eshell-variable-aliases-list
|
|
|
|
(delq (assoc var-alias eshell-variable-aliases-list)
|
|
|
|
eshell-variable-aliases-list))
|
|
|
|
(let ((def (assoc var-alias eshell-variable-aliases-list))
|
|
|
|
(alias-def
|
|
|
|
(list var-alias
|
|
|
|
(list 'quote (if (= (length definition) 1)
|
|
|
|
(car definition)
|
|
|
|
definition)))))
|
|
|
|
(if def
|
|
|
|
(setq eshell-variable-aliases-list
|
|
|
|
(delq (assoc var-alias eshell-variable-aliases-list)
|
|
|
|
eshell-variable-aliases-list)))
|
|
|
|
(setq eshell-variable-aliases-list
|
|
|
|
(cons alias-def
|
|
|
|
eshell-variable-aliases-list))))
|
|
|
|
nil)
|
|
|
|
|
|
|
|
(defun eshell/export (&rest sets)
|
2005-06-14 11:33:54 +00:00
|
|
|
"This alias allows the `export' command to act as bash users expect."
|
2000-06-23 05:24:10 +00:00
|
|
|
(while sets
|
2000-08-29 00:47:45 +00:00
|
|
|
(if (and (stringp (car sets))
|
|
|
|
(string-match "^\\([^=]+\\)=\\(.*\\)" (car sets)))
|
2000-06-23 05:24:10 +00:00
|
|
|
(setenv (match-string 1 (car sets))
|
|
|
|
(match-string 2 (car sets))))
|
|
|
|
(setq sets (cdr sets))))
|
|
|
|
|
2000-09-01 22:48:12 +00:00
|
|
|
(defun pcomplete/eshell-mode/export ()
|
|
|
|
"Completion function for Eshell's `export'."
|
|
|
|
(while (pcomplete-here
|
|
|
|
(if eshell-complete-export-definition
|
|
|
|
process-environment
|
|
|
|
(eshell-envvar-names)))))
|
|
|
|
|
2000-08-29 00:47:45 +00:00
|
|
|
(defun eshell/unset (&rest args)
|
|
|
|
"Unset an environment variable."
|
|
|
|
(while args
|
|
|
|
(if (stringp (car args))
|
|
|
|
(setenv (car args) nil t))
|
|
|
|
(setq args (cdr args))))
|
|
|
|
|
2000-09-01 22:48:12 +00:00
|
|
|
(defun pcomplete/eshell-mode/unset ()
|
|
|
|
"Completion function for Eshell's `unset'."
|
|
|
|
(while (pcomplete-here (eshell-envvar-names))))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell/setq (&rest args)
|
|
|
|
"Allow command-ish use of `setq'."
|
|
|
|
(let (last-value)
|
|
|
|
(while args
|
|
|
|
(let ((sym (intern (car args)))
|
|
|
|
(val (cadr args)))
|
|
|
|
(setq last-value (set sym val)
|
|
|
|
args (cddr args))))
|
|
|
|
last-value))
|
|
|
|
|
|
|
|
(defun pcomplete/eshell-mode/setq ()
|
|
|
|
"Completion function for Eshell's `setq'."
|
|
|
|
(while (and (pcomplete-here (all-completions pcomplete-stub
|
|
|
|
obarray 'boundp))
|
|
|
|
(pcomplete-here))))
|
|
|
|
|
|
|
|
(defun eshell/env (&rest args)
|
2011-11-12 23:48:23 -08:00
|
|
|
"Implementation of `env' in Lisp."
|
2000-06-23 05:24:10 +00:00
|
|
|
(eshell-init-print-buffer)
|
|
|
|
(eshell-eval-using-options
|
|
|
|
"env" args
|
|
|
|
'((?h "help" nil nil "show this usage screen")
|
|
|
|
:external "env"
|
|
|
|
:usage "<no arguments>")
|
Make eshell-for obsolete (replaced by dolist)
* eshell/esh-util.el (eshell-for): Make it obsolete.
* eshell/em-alias.el (eshell/alias, eshell-alias-completions):
* eshell/em-dirs.el (eshell-save-some-last-dir):
* eshell/em-hist.el (eshell-save-some-history, eshell-hist-parse-modifier):
* eshell/em-ls.el (eshell-ls-dir, eshell-ls-files, eshell-ls-entries):
* eshell/em-unix.el (eshell/cat, eshell/du, eshell/su):
* eshell/esh-cmd.el (eshell-invoke-directly, eshell-do-eval, eshell/which):
* eshell/esh-ext.el (eshell-find-interpreter):
* eshell/esh-mode.el (eshell-mode):
* eshell/esh-module.el (eshell-unload-extension-modules):
* eshell/esh-proc.el (eshell-process-interact):
* eshell/esh-test.el (eshell-test):
* eshell/esh-util.el (eshell-flatten-list, eshell-winnow-list):
* eshell/esh-var.el (eshell/env, eshell-environment-variables)
(eshell-variables-list):
* eshell/eshell.el (eshell-unload-all-modules):
Replace eshell-for with dolist.
2011-03-04 19:53:41 -08:00
|
|
|
(dolist (setting (sort (eshell-environment-variables) 'string-lessp))
|
2000-06-23 05:24:10 +00:00
|
|
|
(eshell-buffered-print setting "\n"))
|
|
|
|
(eshell-flush)))
|
|
|
|
|
|
|
|
(defun eshell-insert-envvar (envvar-name)
|
|
|
|
"Insert ENVVAR-NAME into the current buffer at point."
|
|
|
|
(interactive
|
|
|
|
(list (read-envvar-name "Name of environment variable: " t)))
|
|
|
|
(insert-and-inherit "$" envvar-name))
|
|
|
|
|
|
|
|
(defun eshell-envvar-names (&optional environment)
|
|
|
|
"Return a list of currently visible environment variable names."
|
|
|
|
(mapcar (function
|
|
|
|
(lambda (x)
|
|
|
|
(substring x 0 (string-match "=" x))))
|
|
|
|
(or environment process-environment)))
|
|
|
|
|
|
|
|
(defun eshell-environment-variables ()
|
|
|
|
"Return a `process-environment', fully updated.
|
|
|
|
This involves setting any variable aliases which affect the
|
|
|
|
environment, as specified in `eshell-variable-aliases-list'."
|
|
|
|
(let ((process-environment (eshell-copy-environment)))
|
Make eshell-for obsolete (replaced by dolist)
* eshell/esh-util.el (eshell-for): Make it obsolete.
* eshell/em-alias.el (eshell/alias, eshell-alias-completions):
* eshell/em-dirs.el (eshell-save-some-last-dir):
* eshell/em-hist.el (eshell-save-some-history, eshell-hist-parse-modifier):
* eshell/em-ls.el (eshell-ls-dir, eshell-ls-files, eshell-ls-entries):
* eshell/em-unix.el (eshell/cat, eshell/du, eshell/su):
* eshell/esh-cmd.el (eshell-invoke-directly, eshell-do-eval, eshell/which):
* eshell/esh-ext.el (eshell-find-interpreter):
* eshell/esh-mode.el (eshell-mode):
* eshell/esh-module.el (eshell-unload-extension-modules):
* eshell/esh-proc.el (eshell-process-interact):
* eshell/esh-test.el (eshell-test):
* eshell/esh-util.el (eshell-flatten-list, eshell-winnow-list):
* eshell/esh-var.el (eshell/env, eshell-environment-variables)
(eshell-variables-list):
* eshell/eshell.el (eshell-unload-all-modules):
Replace eshell-for with dolist.
2011-03-04 19:53:41 -08:00
|
|
|
(dolist (var-alias eshell-variable-aliases-list)
|
2000-06-23 05:24:10 +00:00
|
|
|
(if (nth 2 var-alias)
|
|
|
|
(setenv (car var-alias)
|
|
|
|
(eshell-stringify
|
|
|
|
(or (eshell-get-variable (car var-alias)) "")))))
|
|
|
|
process-environment))
|
|
|
|
|
|
|
|
(defun eshell-parse-variable ()
|
|
|
|
"Parse the next variable reference at point.
|
|
|
|
The variable name could refer to either an environment variable, or a
|
|
|
|
Lisp variable. The priority order depends on the setting of
|
|
|
|
`eshell-prefer-lisp-variables'.
|
|
|
|
|
|
|
|
Its purpose is to call `eshell-parse-variable-ref', and then to
|
|
|
|
process any indices that come after the variable reference."
|
|
|
|
(let* ((get-len (when (eq (char-after) ?#)
|
|
|
|
(forward-char) t))
|
|
|
|
value indices)
|
|
|
|
(setq value (eshell-parse-variable-ref)
|
|
|
|
indices (and (not (eobp))
|
|
|
|
(eq (char-after) ?\[)
|
|
|
|
(eshell-parse-indices))
|
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
|
|
|
value `(let ((indices ',indices)) ,value))
|
2000-06-23 05:24:10 +00:00
|
|
|
(if get-len
|
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
|
|
|
`(length ,value)
|
2000-06-23 05:24:10 +00:00
|
|
|
value)))
|
|
|
|
|
|
|
|
(defun eshell-parse-variable-ref ()
|
|
|
|
"Eval a variable reference.
|
|
|
|
Returns a Lisp form which, if evaluated, will return the value of the
|
|
|
|
variable.
|
|
|
|
|
|
|
|
Possible options are:
|
|
|
|
|
|
|
|
NAME an environment or Lisp variable value
|
|
|
|
<LONG-NAME> disambiguates the length of the name
|
|
|
|
{COMMAND} result of command is variable's value
|
|
|
|
(LISP-FORM) result of Lisp form is variable's value"
|
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
|
|
|
(cond
|
|
|
|
((eq (char-after) ?{)
|
|
|
|
(let ((end (eshell-find-delimiter ?\{ ?\})))
|
|
|
|
(if (not end)
|
|
|
|
(throw 'eshell-incomplete ?\{)
|
|
|
|
(prog1
|
|
|
|
(list 'eshell-convert
|
|
|
|
(list 'eshell-command-to-value
|
|
|
|
(list 'eshell-as-subcommand
|
|
|
|
(eshell-parse-command
|
|
|
|
(cons (1+ (point)) end)))))
|
|
|
|
(goto-char (1+ end))))))
|
|
|
|
((memq (char-after) '(?\' ?\"))
|
|
|
|
(let ((name (if (eq (char-after) ?\')
|
|
|
|
(eshell-parse-literal-quote)
|
|
|
|
(eshell-parse-double-quote))))
|
|
|
|
(if name
|
2000-06-23 05:24:10 +00:00
|
|
|
(list 'eshell-get-variable (eval name) 'indices))))
|
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
|
|
|
((eq (char-after) ?\<)
|
|
|
|
(let ((end (eshell-find-delimiter ?\< ?\>)))
|
|
|
|
(if (not end)
|
|
|
|
(throw 'eshell-incomplete ?\<)
|
|
|
|
(let* ((temp (make-temp-file temporary-file-directory))
|
|
|
|
(cmd (concat (buffer-substring (1+ (point)) end)
|
|
|
|
" > " temp)))
|
|
|
|
(prog1
|
|
|
|
(list
|
|
|
|
'let (list (list 'eshell-current-handles
|
|
|
|
(list 'eshell-create-handles temp
|
|
|
|
(list 'quote 'overwrite))))
|
|
|
|
(list
|
|
|
|
'progn
|
|
|
|
(list 'eshell-as-subcommand
|
|
|
|
(eshell-parse-command cmd))
|
|
|
|
(list 'ignore
|
|
|
|
(list 'nconc 'eshell-this-command-hook
|
|
|
|
(list 'list
|
|
|
|
(list 'function
|
|
|
|
(list 'lambda nil
|
|
|
|
(list 'delete-file temp))))))
|
|
|
|
(list 'quote temp)))
|
|
|
|
(goto-char (1+ end)))))))
|
|
|
|
((eq (char-after) ?\()
|
|
|
|
(condition-case nil
|
|
|
|
(list 'eshell-command-to-value
|
|
|
|
(list 'eshell-lisp-command
|
|
|
|
(list 'quote (read (current-buffer)))))
|
|
|
|
(end-of-file
|
|
|
|
(throw 'eshell-incomplete ?\())))
|
|
|
|
((assoc (char-to-string (char-after))
|
|
|
|
eshell-variable-aliases-list)
|
|
|
|
(forward-char)
|
|
|
|
(list 'eshell-get-variable
|
|
|
|
(char-to-string (char-before)) 'indices))
|
|
|
|
((looking-at eshell-variable-name-regexp)
|
|
|
|
(prog1
|
|
|
|
(list 'eshell-get-variable (match-string 0) 'indices)
|
|
|
|
(goto-char (match-end 0))))
|
|
|
|
(t
|
|
|
|
(error "Invalid variable reference"))))
|
|
|
|
|
|
|
|
(defvar eshell-glob-function)
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-parse-indices ()
|
|
|
|
"Parse and return a list of list of indices."
|
|
|
|
(let (indices)
|
|
|
|
(while (eq (char-after) ?\[)
|
|
|
|
(let ((end (eshell-find-delimiter ?\[ ?\])))
|
|
|
|
(if (not end)
|
|
|
|
(throw 'eshell-incomplete ?\[)
|
|
|
|
(forward-char)
|
|
|
|
(let (eshell-glob-function)
|
|
|
|
(setq indices (cons (eshell-parse-arguments (point) end)
|
|
|
|
indices)))
|
|
|
|
(goto-char (1+ end)))))
|
|
|
|
(nreverse indices)))
|
|
|
|
|
|
|
|
(defun eshell-get-variable (name &optional indices)
|
|
|
|
"Get the value for the variable NAME."
|
|
|
|
(let* ((alias (assoc name eshell-variable-aliases-list))
|
|
|
|
(var (if alias
|
|
|
|
(cadr alias)
|
|
|
|
name)))
|
|
|
|
(if (and alias (functionp var))
|
|
|
|
(funcall var indices)
|
|
|
|
(eshell-apply-indices
|
|
|
|
(cond
|
|
|
|
((stringp var)
|
|
|
|
(let ((sym (intern-soft var)))
|
|
|
|
(if (and sym (boundp sym)
|
|
|
|
(or eshell-prefer-lisp-variables
|
2013-09-14 17:10:45 -07:00
|
|
|
(memq sym eshell--local-vars) ; bug#15372
|
2000-06-23 05:24:10 +00:00
|
|
|
(not (getenv var))))
|
|
|
|
(symbol-value sym)
|
|
|
|
(getenv var))))
|
|
|
|
((symbolp var)
|
|
|
|
(symbol-value var))
|
|
|
|
(t
|
|
|
|
(error "Unknown variable `%s'" (eshell-stringify var))))
|
|
|
|
indices))))
|
|
|
|
|
|
|
|
(defun eshell-apply-indices (value indices)
|
|
|
|
"Apply to VALUE all of the given INDICES, returning the sub-result.
|
|
|
|
The format of INDICES is:
|
|
|
|
|
|
|
|
((INT-OR-NAME-OR-OTHER INT-OR-NAME INT-OR-NAME ...)
|
|
|
|
...)
|
|
|
|
|
|
|
|
Each member of INDICES represents a level of nesting. If the first
|
|
|
|
member of a sublist is not an integer or name, and the value it's
|
|
|
|
reference is a string, that will be used as the regexp with which is
|
|
|
|
to divide the string into sub-parts. The default is whitespace.
|
|
|
|
Otherwise, each INT-OR-NAME refers to an element of the list value.
|
|
|
|
Integers imply a direct index, and names, an associate lookup using
|
|
|
|
`assoc'.
|
|
|
|
|
|
|
|
For example, to retrieve the second element of a user's record in
|
|
|
|
'/etc/passwd', the variable reference would look like:
|
|
|
|
|
2016-05-07 18:40:10 -07:00
|
|
|
${grep johnw /etc/passwd}[: 2]"
|
2000-06-23 05:24:10 +00:00
|
|
|
(while indices
|
|
|
|
(let ((refs (car indices)))
|
|
|
|
(when (stringp value)
|
|
|
|
(let (separator)
|
|
|
|
(if (not (or (not (stringp (caar indices)))
|
|
|
|
(string-match
|
|
|
|
(concat "^" eshell-variable-name-regexp "$")
|
|
|
|
(caar indices))))
|
|
|
|
(setq separator (caar indices)
|
|
|
|
refs (cdr refs)))
|
|
|
|
(setq value
|
|
|
|
(mapcar 'eshell-convert
|
|
|
|
(split-string value separator)))))
|
|
|
|
(cond
|
|
|
|
((< (length refs) 0)
|
2005-03-25 08:33:09 +00:00
|
|
|
(error "Invalid array variable index: %s"
|
2000-06-23 05:24:10 +00:00
|
|
|
(eshell-stringify refs)))
|
|
|
|
((= (length refs) 1)
|
|
|
|
(setq value (eshell-index-value value (car refs))))
|
|
|
|
(t
|
|
|
|
(let ((new-value (list t)))
|
|
|
|
(while refs
|
|
|
|
(nconc new-value
|
|
|
|
(list (eshell-index-value value
|
|
|
|
(car refs))))
|
|
|
|
(setq refs (cdr refs)))
|
|
|
|
(setq value (cdr new-value))))))
|
|
|
|
(setq indices (cdr indices)))
|
|
|
|
value)
|
|
|
|
|
|
|
|
(defun eshell-index-value (value index)
|
|
|
|
"Reference VALUE using the given INDEX."
|
2017-06-09 19:40:38 -04:00
|
|
|
(when (and (stringp index) (get-text-property 0 'number index))
|
|
|
|
(setq index (string-to-number index)))
|
2000-06-23 05:24:10 +00:00
|
|
|
(if (stringp index)
|
|
|
|
(cdr (assoc index value))
|
|
|
|
(cond
|
|
|
|
((ring-p value)
|
|
|
|
(if (> index (ring-length value))
|
|
|
|
(error "Index exceeds length of ring")
|
|
|
|
(ring-ref value index)))
|
|
|
|
((listp value)
|
|
|
|
(if (> index (length value))
|
|
|
|
(error "Index exceeds length of list")
|
|
|
|
(nth index value)))
|
|
|
|
((vectorp value)
|
|
|
|
(if (> index (length value))
|
|
|
|
(error "Index exceeds length of vector")
|
|
|
|
(aref value index)))
|
|
|
|
(t
|
|
|
|
(error "Invalid data type for indexing")))))
|
|
|
|
|
|
|
|
;;;_* Variable name completion
|
|
|
|
|
|
|
|
(defun eshell-complete-variable-reference ()
|
|
|
|
"If there is a variable reference, complete it."
|
|
|
|
(let ((arg (pcomplete-actual-arg)) index)
|
|
|
|
(when (setq index
|
|
|
|
(string-match
|
|
|
|
(concat "\\$\\(" eshell-variable-name-regexp
|
|
|
|
"\\)?\\'") arg))
|
|
|
|
(setq pcomplete-stub (substring arg (1+ index)))
|
|
|
|
(throw 'pcomplete-completions (eshell-variables-list)))))
|
|
|
|
|
|
|
|
(defun eshell-variables-list ()
|
|
|
|
"Generate list of applicable variables."
|
|
|
|
(let ((argname pcomplete-stub)
|
|
|
|
completions)
|
Make eshell-for obsolete (replaced by dolist)
* eshell/esh-util.el (eshell-for): Make it obsolete.
* eshell/em-alias.el (eshell/alias, eshell-alias-completions):
* eshell/em-dirs.el (eshell-save-some-last-dir):
* eshell/em-hist.el (eshell-save-some-history, eshell-hist-parse-modifier):
* eshell/em-ls.el (eshell-ls-dir, eshell-ls-files, eshell-ls-entries):
* eshell/em-unix.el (eshell/cat, eshell/du, eshell/su):
* eshell/esh-cmd.el (eshell-invoke-directly, eshell-do-eval, eshell/which):
* eshell/esh-ext.el (eshell-find-interpreter):
* eshell/esh-mode.el (eshell-mode):
* eshell/esh-module.el (eshell-unload-extension-modules):
* eshell/esh-proc.el (eshell-process-interact):
* eshell/esh-test.el (eshell-test):
* eshell/esh-util.el (eshell-flatten-list, eshell-winnow-list):
* eshell/esh-var.el (eshell/env, eshell-environment-variables)
(eshell-variables-list):
* eshell/eshell.el (eshell-unload-all-modules):
Replace eshell-for with dolist.
2011-03-04 19:53:41 -08:00
|
|
|
(dolist (alias eshell-variable-aliases-list)
|
2000-06-23 05:24:10 +00:00
|
|
|
(if (string-match (concat "^" argname) (car alias))
|
|
|
|
(setq completions (cons (car alias) completions))))
|
|
|
|
(sort
|
|
|
|
(append
|
|
|
|
(mapcar
|
|
|
|
(function
|
|
|
|
(lambda (varname)
|
|
|
|
(let ((value (eshell-get-variable varname)))
|
|
|
|
(if (and value
|
|
|
|
(stringp value)
|
|
|
|
(file-directory-p value))
|
2005-05-31 00:14:26 +00:00
|
|
|
(concat varname "/")
|
2000-06-23 05:24:10 +00:00
|
|
|
varname))))
|
|
|
|
(eshell-envvar-names (eshell-environment-variables)))
|
|
|
|
(all-completions argname obarray 'boundp)
|
|
|
|
completions)
|
|
|
|
'string-lessp)))
|
|
|
|
|
|
|
|
(defun eshell-complete-variable-assignment ()
|
|
|
|
"If there is a variable assignment, allow completion of entries."
|
|
|
|
(let ((arg (pcomplete-actual-arg)) pos)
|
|
|
|
(when (string-match (concat "\\`" eshell-variable-name-regexp "=") arg)
|
|
|
|
(setq pos (match-end 0))
|
|
|
|
(if (string-match "\\(:\\)[^:]*\\'" arg)
|
|
|
|
(setq pos (match-end 1)))
|
|
|
|
(setq pcomplete-stub (substring arg pos))
|
|
|
|
(throw 'pcomplete-completions (pcomplete-entries)))))
|
|
|
|
|
|
|
|
;;; esh-var.el ends here
|