diff options
| author | Gnus developers <ding@gnus.org> | 2011-03-29 13:23:38 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-03-29 13:23:38 +0000 |
| commit | b62f8267c3356c0f8d5357d148726a82bf37b371 (patch) | |
| tree | 5d937630d9619a8dd364bdca20bc073bc4a237b7 /lisp/net/imap.el | |
| parent | ea62283460e5aae0f3e5dc68f38d035d5f17f540 (diff) | |
| download | emacs-b62f8267c3356c0f8d5357d148726a82bf37b371.tar.gz emacs-b62f8267c3356c0f8d5357d148726a82bf37b371.tar.bz2 emacs-b62f8267c3356c0f8d5357d148726a82bf37b371.zip | |
Merge changes made in Gnus trunk.
mm-view.el (mm-display-inline-fontify): Use `set-normal-mode' with local variables disabled rather than `normal-mode'.
imap.el (imap-shell-open, imap-process-connection-type): Use imap-process-connection-type for 'shell' streams as well as Kerberos, SSL, other subprocesses.
Diffstat (limited to 'lisp/net/imap.el')
| -rw-r--r-- | lisp/net/imap.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/imap.el b/lisp/net/imap.el index 6d80b97fd23..f4af03f100f 100644 --- a/lisp/net/imap.el +++ b/lisp/net/imap.el @@ -211,7 +211,7 @@ until a successful connection is made." :type '(repeat string)) (defcustom imap-process-connection-type nil - "*Value for `process-connection-type' to use for Kerberos4, GSSAPI and SSL. + "*Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell, and SSL. The `process-connection-type' variable controls the type of device used to communicate with subprocesses. Values are nil to use a pipe, or t or `pty' to use a pty. The value has no effect if the @@ -770,6 +770,7 @@ sure of changing the value of `foo'." (let* ((port (or port imap-default-port)) (coding-system-for-read imap-coding-system-for-read) (coding-system-for-write imap-coding-system-for-write) + (process-connection-type imap-process-connection-type) (process (start-process name buffer shell-file-name shell-command-switch (format-spec |