Merge commit

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8501aee..8df87b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * 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-02-28  Glenn Morris  <rgm@gnu.org>
 
        * gmm-utils.el, gnus-agent.el, gnus-score.el, messagexmas.el,

diff --git a/lisp/tls.el b/lisp/tls.el
index 9b9eb6f..d232095 100644 (file)
--- a/lisp/tls.el
+++ b/lisp/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