diff options
| author | Noam Postavsky | 2017-09-29 21:00:10 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2017-09-30 20:01:33 -0400 |
| commit | ba9139c501ed8220980e898f127e293e8f263ea1 (patch) | |
| tree | e37da419afa420a660c37cf67ca5fd2a705cacd2 /lisp | |
| parent | 43fac3beae75a38cf758ec94039c0d7a4edc9399 (diff) | |
| download | emacs-ba9139c501ed8220980e898f127e293e8f263ea1.tar.gz emacs-ba9139c501ed8220980e898f127e293e8f263ea1.zip | |
Revert "Don't lose arguments to eshell aliases (Bug#27954)"
It broke the established argument handling methods provided by eshell
aliases (Bug#28568).
* doc/misc/eshell.texi (Aliases): Fix example, call out use of
arguments in aliases.
* lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias): Ignore
ARGS.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/eshell/em-alias.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el index f951efa65d6..742234574f3 100644 --- a/lisp/eshell/em-alias.el +++ b/lisp/eshell/em-alias.el | |||
| @@ -214,8 +214,8 @@ file named by `eshell-aliases-file'.") | |||
| 214 | 214 | ||
| 215 | (defvar eshell-prevent-alias-expansion nil) | 215 | (defvar eshell-prevent-alias-expansion nil) |
| 216 | 216 | ||
| 217 | (defun eshell-maybe-replace-by-alias (command args) | 217 | (defun eshell-maybe-replace-by-alias (command _args) |
| 218 | "If COMMAND has an alias definition, call that instead using ARGS." | 218 | "Call COMMAND's alias definition, if it exists." |
| 219 | (unless (and eshell-prevent-alias-expansion | 219 | (unless (and eshell-prevent-alias-expansion |
| 220 | (member command eshell-prevent-alias-expansion)) | 220 | (member command eshell-prevent-alias-expansion)) |
| 221 | (let ((alias (eshell-lookup-alias command))) | 221 | (let ((alias (eshell-lookup-alias command))) |
| @@ -225,7 +225,7 @@ file named by `eshell-aliases-file'.") | |||
| 225 | (eshell-command-arguments ',eshell-last-arguments) | 225 | (eshell-command-arguments ',eshell-last-arguments) |
| 226 | (eshell-prevent-alias-expansion | 226 | (eshell-prevent-alias-expansion |
| 227 | ',(cons command eshell-prevent-alias-expansion))) | 227 | ',(cons command eshell-prevent-alias-expansion))) |
| 228 | ,(eshell-parse-command (nth 1 alias) args))))))) | 228 | ,(eshell-parse-command (nth 1 alias)))))))) |
| 229 | 229 | ||
| 230 | (defun eshell-alias-completions (name) | 230 | (defun eshell-alias-completions (name) |
| 231 | "Find all possible completions for NAME. | 231 | "Find all possible completions for NAME. |