summaryrefslogtreecommitdiff
path: root/lisp/term.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-03-10 18:30:54 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-03-10 18:30:54 -0800
commit767780169b095b15d6be32ac5be1aba00f1ccbc2 (patch)
tree8deacf576ac3b627ce4894253310a48bee3b2b24 /lisp/term.el
parent60c4cf6311b84ed7ec007702a0cdd7881f9f647c (diff)
parent6af509ec672f8b32076007bf17ad8cf45668f4cd (diff)
downloademacs-767780169b095b15d6be32ac5be1aba00f1ccbc2.tar.gz
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/term.el')
-rw-r--r--lisp/term.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/term.el b/lisp/term.el
index cf7699abc94..93da33ea5b0 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -598,8 +598,8 @@ This is run before the process is cranked up."
"Called each time a process is exec'd by `term-exec'.
This is called after the process is cranked up. It is useful for things that
must be done each time a process is executed in a term mode buffer (e.g.,
-`process-kill-without-query'). In contrast, `term-mode-hook' is only
-executed once when the buffer is created."
+`set-process-query-on-exit-flag'). In contrast, `term-mode-hook' is only
+executed once, when the buffer is created."
:type 'hook
:group 'term)