diff options
| author | Alan Mackenzie | 2017-02-12 10:59:03 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2017-02-12 10:59:03 +0000 |
| commit | f4d5b687150810129b7a1d5b006e31ccf82b691b (patch) | |
| tree | 4229b13800349032697daae3904dc3773e6b7a80 /lisp/gnus/nnimap.el | |
| parent | d5514332d4a6092673ce1f78fadcae0c57f7be64 (diff) | |
| parent | 148100d98319499f0ac6f57b8be08cbd14884a5c (diff) | |
| download | emacs-comment-cache.tar.gz emacs-comment-cache.zip | |
Merge branch 'master' into comment-cachecomment-cache
Diffstat (limited to 'lisp/gnus/nnimap.el')
| -rw-r--r-- | lisp/gnus/nnimap.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 700e86a0c57..2943c8dc7d2 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el | |||
| @@ -67,7 +67,11 @@ back on `network'.") | |||
| 67 | (if (listp imap-shell-program) | 67 | (if (listp imap-shell-program) |
| 68 | (car imap-shell-program) | 68 | (car imap-shell-program) |
| 69 | imap-shell-program) | 69 | imap-shell-program) |
| 70 | "ssh %s imapd")) | 70 | "ssh %s imapd") |
| 71 | "What command to execute to connect to an IMAP server. | ||
| 72 | This will only be used if the connection type is `shell'. See | ||
| 73 | the `open-network-stream' documentation for an explanation of | ||
| 74 | the format.") | ||
| 71 | 75 | ||
| 72 | (defvoo nnimap-inbox nil | 76 | (defvoo nnimap-inbox nil |
| 73 | "The mail box where incoming mail arrives and should be split out of. | 77 | "The mail box where incoming mail arrives and should be split out of. |