Merge from origin/emacs-26

6af509e Replace the obsolete process-kill-without-query in documentation
4df0d15 ; Tiny fix for recent doc change

5 files changed, 8 insertions, 8 deletions

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 499be26004d..42a52279832 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1676,7 +1676,7 @@ line truncation.  @xref{Split Window}, for the variable
 @dfn{word wrap}.  Here, each long logical line is divided into two or
 more screen lines, like in ordinary line continuation.  However, Emacs
 attempts to wrap the line at word boundaries near the right window
-edge.  (If line's direction is right-to-left, it is wrapped at the
+edge.  (If the line's direction is right-to-left, it is wrapped at the
 left window edge instead.)  This makes the text easier to read, as
 wrapping does not occur in the middle of words.
 
diff --git a/lisp/comint.el b/lisp/comint.el
index 3163afeff40..838662a59a2 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -454,8 +454,8 @@ This is run before the process is cranked up."
   "Hook run each time a process is exec'd by `comint-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 Comint mode buffer (e.g.,
-`(process-kill-without-query)').  In contrast, the `comint-mode-hook' is only
-executed once when the buffer is created."
+`set-process-query-on-exit-flag').  In contrast, `comint-mode-hook' is only
+executed once, when the buffer is created."
   :type 'hook
   :group 'comint)
 
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."
   "Called each time a process is exec'd by `eshell-gather-process-output'.
 It is passed one argument, which is the process that was just started.
 It is useful for things that must be done each time a process is
-executed in an eshell mode buffer (e.g., `process-kill-without-query').
-In contrast, `eshell-mode-hook' is only executed once when the buffer
+executed in an eshell mode buffer (e.g., `set-process-query-on-exit-flag').
+In contrast, `eshell-mode-hook' is only executed once, when the buffer
 is created."
   :type 'hook
   :group 'eshell-proc)
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index b1e0bf24aa8..c3650afa9a7 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -3633,7 +3633,7 @@ so return the size on the remote host exactly. See RFC 3659."
 ;; 			     newname))
 ;; 	res)
 ;;     (set-process-sentinel proc 'ange-ftp-copy-file-locally-sentinel)
-;;     (process-kill-without-query proc)
+;;     (set-process-query-on-exit-flag proc nil)
 ;;     (with-current-buffer (process-buffer proc)
 ;;       (set (make-local-variable 'copy-cont) cont))))
 ;;
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)