
* 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.
147 lines
4.7 KiB
EmacsLisp
147 lines
4.7 KiB
EmacsLisp
;;; em-script.el --- Eshell script files
|
|
|
|
;; Copyright (C) 1999-2012 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:
|
|
|
|
(require 'eshell)
|
|
(require 'esh-opt)
|
|
|
|
;;;###autoload
|
|
(progn
|
|
(defgroup eshell-script nil
|
|
"This module allows for the execution of files containing Eshell
|
|
commands, as a script file."
|
|
:tag "Running script files."
|
|
:group 'eshell-module))
|
|
|
|
;;; User Variables:
|
|
|
|
(defcustom eshell-script-load-hook nil
|
|
"A list of functions to call when loading `eshell-script'."
|
|
:version "24.1" ; removed eshell-script-initialize
|
|
:type 'hook
|
|
:group 'eshell-script)
|
|
|
|
(defcustom eshell-login-script (expand-file-name "login" eshell-directory-name)
|
|
"If non-nil, a file to invoke when starting up Eshell interactively.
|
|
This file should be a file containing Eshell commands, where comment
|
|
lines begin with '#'."
|
|
:type 'file
|
|
:group 'eshell-script)
|
|
|
|
(defcustom eshell-rc-script (expand-file-name "profile" eshell-directory-name)
|
|
"If non-nil, a file to invoke whenever Eshell is started.
|
|
This includes when running `eshell-command'."
|
|
:type 'file
|
|
:group 'eshell-script)
|
|
|
|
;;; Functions:
|
|
|
|
(defun eshell-script-initialize ()
|
|
"Initialize the script parsing code."
|
|
(make-local-variable 'eshell-interpreter-alist)
|
|
(setq eshell-interpreter-alist
|
|
(cons '((lambda (file)
|
|
(string= (file-name-nondirectory file)
|
|
"eshell")) . eshell/source)
|
|
eshell-interpreter-alist))
|
|
(make-local-variable 'eshell-complex-commands)
|
|
(setq eshell-complex-commands
|
|
(append '("source" ".") eshell-complex-commands))
|
|
;; these two variables are changed through usage, but we don't want
|
|
;; to ruin it for other modules
|
|
(let (eshell-inside-quote-regexp
|
|
eshell-outside-quote-regexp)
|
|
(and (not eshell-non-interactive-p)
|
|
eshell-login-script
|
|
(file-readable-p eshell-login-script)
|
|
(eshell-do-eval
|
|
(list 'eshell-commands
|
|
(catch 'eshell-replace-command
|
|
(eshell-source-file eshell-login-script))) t))
|
|
(and eshell-rc-script
|
|
(file-readable-p eshell-rc-script)
|
|
(eshell-do-eval
|
|
(list 'eshell-commands
|
|
(catch 'eshell-replace-command
|
|
(eshell-source-file eshell-rc-script))) t))))
|
|
|
|
(defun eshell-source-file (file &optional args subcommand-p)
|
|
"Execute a series of Eshell commands in FILE, passing ARGS.
|
|
Comments begin with '#'."
|
|
(interactive "f")
|
|
(let ((orig (point))
|
|
(here (point-max))
|
|
(inhibit-point-motion-hooks t))
|
|
(goto-char (point-max))
|
|
(with-silent-modifications
|
|
;; FIXME: Why not use a temporary buffer and avoid this
|
|
;; "insert&delete" business? --Stef
|
|
(insert-file-contents file)
|
|
(goto-char (point-max))
|
|
(throw 'eshell-replace-command
|
|
(prog1
|
|
(list 'let
|
|
(list (list 'eshell-command-name (list 'quote file))
|
|
(list 'eshell-command-arguments
|
|
(list 'quote args)))
|
|
(let ((cmd (eshell-parse-command (cons here (point)))))
|
|
(if subcommand-p
|
|
(setq cmd (list 'eshell-as-subcommand cmd)))
|
|
cmd))
|
|
(delete-region here (point))
|
|
(goto-char orig))))))
|
|
|
|
(defun eshell/source (&rest args)
|
|
"Source a file in a subshell environment."
|
|
(eshell-eval-using-options
|
|
"source" args
|
|
'((?h "help" nil nil "show this usage screen")
|
|
:show-usage
|
|
:usage "FILE [ARGS]
|
|
Invoke the Eshell commands in FILE in a subshell, binding ARGS to $1,
|
|
$2, etc.")
|
|
(eshell-source-file (car args) (cdr args) t)))
|
|
|
|
(put 'eshell/source 'eshell-no-numeric-conversions t)
|
|
|
|
(defun eshell/. (&rest args)
|
|
"Source a file in the current environment."
|
|
(eshell-eval-using-options
|
|
"." args
|
|
'((?h "help" nil nil "show this usage screen")
|
|
:show-usage
|
|
:usage "FILE [ARGS]
|
|
Invoke the Eshell commands in FILE within the current shell
|
|
environment, binding ARGS to $1, $2, etc.")
|
|
(eshell-source-file (car args) (cdr args))))
|
|
|
|
(put 'eshell/. 'eshell-no-numeric-conversions t)
|
|
|
|
(provide 'em-script)
|
|
|
|
;; Local Variables:
|
|
;; generated-autoload-file: "esh-groups.el"
|
|
;; End:
|
|
|
|
;;; em-script.el ends here
|