Re: [PATCH] minibuffer issue with eshell-command

[Thierry Volpiatto <thierry.volpiatto@gmail.com>]

Thierry Volpiatto <thierry.volpiatto@gmail.com> writes:

> Thierry Volpiatto <thierry.volpiatto@gmail.com> writes:
>
>> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>>
>>>>> When eshell-command start, it set eshell-mode in all minibuffers:
>>>>> ;(add-hook 'minibuffer-setup-hook 'eshell-mode)
>>>>> So when running another minibuffer, while eshell-command is started,
>>>>> it enable eshell-mode in this one, which is wrong.
>>>>> This patch fix this:
>>>
>>>> Any objections to push this on trunk?
>>>
>>> That looks OK, except that I think the add-hooks should be moved to the
>>> setup-hook function where they can be made to only apply locally (and
>>> I guess at that point you can get rid of the remove-hooks).
>> Right.
>> I have already commited this, i will modify tomorrow.
> I don't see the post of this morning to Leo, so i resend here.
>
> diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
> index 08bb30d..c33c2cc 100644
> --- a/lisp/eshell/eshell.el
> +++ b/lisp/eshell/eshell.el
> @@ -344,16 +344,16 @@ With prefix ARG, insert output into the current buffer at point."
>    (require 'esh-cmd)
>    (unless arg
>      (setq arg current-prefix-arg))
> -  (unwind-protect
> -      (let ((eshell-non-interactive-p t))
> -        ;; Enable `eshell-mode' only in this minibuffer.
> -        (minibuffer-with-setup-hook 'eshell-mode
> -          (add-hook 'minibuffer-exit-hook 'eshell-add-command-to-history)
> -          (add-hook 'eshell-mode-hook 'eshell-return-exits-minibuffer)
> -          (unless command
> -            (setq command (read-from-minibuffer "Emacs shell command: ")))))
> -    (remove-hook 'eshell-mode-hook 'eshell-return-exits-minibuffer)
> -    (remove-hook 'minibuffer-exit-hook 'eshell-add-command-to-history))
> +  (let ((eshell-non-interactive-p t))
> +    ;; Enable `eshell-mode' only in this minibuffer.
> +    (minibuffer-with-setup-hook #'(lambda ()
> +                                    (eshell-mode)
> +                                    (eshell-return-exits-minibuffer))
> +      (unwind-protect
> +           (unless command
> +             (setq command (read-from-minibuffer "Emacs shell command: ")))
> +        (when command
> +          (eshell-add-input-to-history command)))))
>    (unless command
>      (error "No command specified!"))
>    ;; redirection into the current buffer is achieved by adding an
>
> Have a look please.
Ok, if no more comments, i will push tomorrow.

-- 
 𝕋𝕙𝕚𝕖𝕣𝕣𝕪
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997