diff options
| author | Alan Mackenzie | 2022-01-22 11:02:50 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2022-01-22 11:02:50 +0000 |
| commit | 14d64a8adcc866deecd758b898e8ef2d836b354a (patch) | |
| tree | 83cff9669e266f8e283ccb8cd7518e909240f1e1 /lisp/eshell/em-script.el | |
| parent | bdd9b5b8a0d37dd09ee530c1dab3a44bee09e0f8 (diff) | |
| parent | ebe334cdc234de2897263aed4c05ac7088c11857 (diff) | |
| download | emacs-scratch/correct-warning-pos.tar.gz emacs-scratch/correct-warning-pos.zip | |
Merge branch 'master' into scratch/correct-warning-posscratch/correct-warning-pos
Diffstat (limited to 'lisp/eshell/em-script.el')
| -rw-r--r-- | lisp/eshell/em-script.el | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el index e8459513f39..e0bcd8b099f 100644 --- a/lisp/eshell/em-script.el +++ b/lisp/eshell/em-script.el | |||
| @@ -113,27 +113,13 @@ Comments begin with `#'." | |||
| 113 | 113 | ||
| 114 | (defun eshell/source (&rest args) | 114 | (defun eshell/source (&rest args) |
| 115 | "Source a file in a subshell environment." | 115 | "Source a file in a subshell environment." |
| 116 | (eshell-eval-using-options | 116 | (eshell-source-file (car args) (cdr args) t)) |
| 117 | "source" args | ||
| 118 | '((?h "help" nil nil "show this usage screen") | ||
| 119 | :show-usage | ||
| 120 | :usage "FILE [ARGS] | ||
| 121 | Invoke the Eshell commands in FILE in a subshell, binding ARGS to $1, | ||
| 122 | $2, etc.") | ||
| 123 | (eshell-source-file (car args) (cdr args) t))) | ||
| 124 | 117 | ||
| 125 | (put 'eshell/source 'eshell-no-numeric-conversions t) | 118 | (put 'eshell/source 'eshell-no-numeric-conversions t) |
| 126 | 119 | ||
| 127 | (defun eshell/. (&rest args) | 120 | (defun eshell/. (&rest args) |
| 128 | "Source a file in the current environment." | 121 | "Source a file in the current environment." |
| 129 | (eshell-eval-using-options | 122 | (eshell-source-file (car args) (cdr args))) |
| 130 | "." args | ||
| 131 | '((?h "help" nil nil "show this usage screen") | ||
| 132 | :show-usage | ||
| 133 | :usage "FILE [ARGS] | ||
| 134 | Invoke the Eshell commands in FILE within the current shell | ||
| 135 | environment, binding ARGS to $1, $2, etc.") | ||
| 136 | (eshell-source-file (car args) (cdr args)))) | ||
| 137 | 123 | ||
| 138 | (put 'eshell/. 'eshell-no-numeric-conversions t) | 124 | (put 'eshell/. 'eshell-no-numeric-conversions t) |
| 139 | 125 | ||