summaryrefslogtreecommitdiff
path: root/lisp/net/tls.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2010-09-26 14:35:50 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2010-09-26 14:35:50 +0000
commit2696d88f195c0888432f03fb455fdcf273c295c2 (patch)
tree34fc731d72e77f3ab9247315c3ee6a1af7b54d24 /lisp/net/tls.el
parent1821a7b49194ddf558746de5cf67bdc9217e9ebd (diff)
downloademacs-2696d88f195c0888432f03fb455fdcf273c295c2.tar.gz
Merge changes made in Gnus trunk.
gnus-picon.el (gnus-picon-create-glyph): Set the background XPM colour explicitly. message.el (message-cite-prefix-regexp): Remove } from the cite prefix. gnus-win.el (gnus-window-to-buffer-helper, gnus-all-windows-visible-p): Function needn't be a symbol. mail-source.el (mail-source-value): Function needn't be a symbol. tls.el (open-tls-stream): Don't query killing process. gnus-win.el: Revert previous patch, since it made Gnus backtrace. nnimap.el: Look up IMAP credentials based on both the virtual and physical server names. mail-source.el (mail-source-value): Revert previous patch.
Diffstat (limited to 'lisp/net/tls.el')
-rw-r--r--lisp/net/tls.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 821daba6f6b..d4fa8c2e73c 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -238,6 +238,10 @@ 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