net/tls.el (open-tls-stream): Don't set the dont-query-on-exit flag.

2 files changed, 4 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9c12a2e861..e4b07c53373 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,10 @@
         when doing the prompting for `sendmail-query-once' before sending
         in Message buffers (bug#10897).
 
+        * net/tls.el (open-tls-stream): Don't set the dont-query-on-exit flag.
+        This is inconsistent with all the other stream functions, which leave
+        the setting up to the higher levels (if so wanted) (bug#10931).
+
 2012-03-02  Alan Mackenzie  <acm@muc.de>
 
         Depessimize the handling of very large macros.
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 9b9eb6f8f2e..d232095444b 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -237,10 +237,6 @@ Fourth arg PORT is an integer specifying a port to connect to."
           (setq process (start-process
                          name buffer shell-file-name shell-command-switch
                          formatted-cmd))
-          (funcall (if (fboundp 'set-process-query-on-exit-flag)
-                       'set-process-query-on-exit-flag
-                     'process-kill-without-query)
-                   process nil)
           (while (and process
                       (memq (process-status process) '(open run))
                       (progn