diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-10 18:30:54 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-10 18:30:54 -0800 |
commit | 767780169b095b15d6be32ac5be1aba00f1ccbc2 (patch) | |
tree | 8deacf576ac3b627ce4894253310a48bee3b2b24 /lisp/net/ange-ftp.el | |
parent | 60c4cf6311b84ed7ec007702a0cdd7881f9f647c (diff) | |
parent | 6af509ec672f8b32076007bf17ad8cf45668f4cd (diff) | |
download | emacs-767780169b095b15d6be32ac5be1aba00f1ccbc2.tar.gz emacs-767780169b095b15d6be32ac5be1aba00f1ccbc2.tar.bz2 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/net/ange-ftp.el')
-rw-r--r-- | lisp/net/ange-ftp.el | 2 |
1 files changed, 1 insertions, 1 deletions
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)))) ;; |