Don't use 'eshell-eval-using-options' for 'eshell/source' or 'eshell/.'
This makes 'source' and '.' in Eshell more compatible with regular shells, which just treat the first argument as the file to source and all subsequent arguments as arguments to that file. * lisp/eshell/em-script.el (eshell/source, eshell/.): Don't use 'eshell-eval-using-options'. * etc/NEWS: Announce the change (bug#53293)
This commit is contained in:
parent
90de226e21
commit
1228ec3e1d
2 changed files with 7 additions and 16 deletions
5
etc/NEWS
5
etc/NEWS
|
@ -104,6 +104,11 @@ files that were compiled with an old EIEIO (Emacs<25).
|
|||
** 'C-x 8 .' has been moved to 'C-x 8 . .'.
|
||||
This is to open up the 'C-x 8 .' map to bind further characters there.
|
||||
|
||||
---
|
||||
** 'source' and '.' in Eshell no longer accept the '--help' option.
|
||||
This is for compatibility with the shell versions of these commands,
|
||||
which don't handle options like '--help' in any special way.
|
||||
|
||||
|
||||
* Changes in Emacs 29.1
|
||||
|
||||
|
|
|
@ -113,27 +113,13 @@ Comments begin with `#'."
|
|||
|
||||
(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)))
|
||||
(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))))
|
||||
(eshell-source-file (car args) (cdr args)))
|
||||
|
||||
(put 'eshell/. 'eshell-no-numeric-conversions t)
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue