diff options
| author | Paul Eggert | 2018-03-10 18:30:54 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-03-10 18:30:54 -0800 |
| commit | 767780169b095b15d6be32ac5be1aba00f1ccbc2 (patch) | |
| tree | 8deacf576ac3b627ce4894253310a48bee3b2b24 /lisp/eshell | |
| parent | 60c4cf6311b84ed7ec007702a0cdd7881f9f647c (diff) | |
| parent | 6af509ec672f8b32076007bf17ad8cf45668f4cd (diff) | |
| download | emacs-767780169b095b15d6be32ac5be1aba00f1ccbc2.tar.gz emacs-767780169b095b15d6be32ac5be1aba00f1ccbc2.zip | |
Merge from origin/emacs-26
6af509e Replace the obsolete process-kill-without-query in documentation
4df0d15 ; Tiny fix for recent doc change
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/esh-proc.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index f1380852b3b..b3bd7a72456 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el | |||
| @@ -87,8 +87,8 @@ variable's value to take effect." | |||
| 87 | "Called each time a process is exec'd by `eshell-gather-process-output'. | 87 | "Called each time a process is exec'd by `eshell-gather-process-output'. |
| 88 | It is passed one argument, which is the process that was just started. | 88 | It is passed one argument, which is the process that was just started. |
| 89 | It is useful for things that must be done each time a process is | 89 | It is useful for things that must be done each time a process is |
| 90 | executed in an eshell mode buffer (e.g., `process-kill-without-query'). | 90 | executed in an eshell mode buffer (e.g., `set-process-query-on-exit-flag'). |
| 91 | In contrast, `eshell-mode-hook' is only executed once when the buffer | 91 | In contrast, `eshell-mode-hook' is only executed once, when the buffer |
| 92 | is created." | 92 | is created." |
| 93 | :type 'hook | 93 | :type 'hook |
| 94 | :group 'eshell-proc) | 94 | :group 'eshell-proc) |