diff options
| author | Gnus developers <ding@gnus.org> | 2011-03-30 14:59:42 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-03-30 14:59:42 +0000 |
| commit | a5954fa5c84101c99857ea65196ef9050138119f (patch) | |
| tree | 269698f118526c4bdcd123d379cc31ab03a111b4 /lisp/gnus/gssapi.el | |
| parent | 888adce96c1a551c975718bd8ad540525b1f408c (diff) | |
| download | emacs-a5954fa5c84101c99857ea65196ef9050138119f.tar.gz emacs-a5954fa5c84101c99857ea65196ef9050138119f.tar.bz2 emacs-a5954fa5c84101c99857ea65196ef9050138119f.zip | |
Merge Gnus' changes.
gnus.texi (Listing Groups): Document gnus-group-list-ticked.
gssapi.el (open-gssapi-stream): Remove the last mentions of the IMAP stuff.
gnus-score.el (gnus-score-string): Fix calling convention of `gnus-simplify-buffer-fuzzy' after last patches.
gnus-sum.el (gnus-update-marks): Don't send any marks updates to the server for articles we didn't get any headers for. This is a sanity check.
nnimap.el (nnimap-open-connection-1): Is the login responds with a new CAPABILITY, use it.
gnus-agent.el (gnus-agent-fetch-headers): Don't message if we're not downloading anything.
gnus.el (gnus-splash-svg-color-symbols): Removed superfluous `and'.
gnus.el (gnus-group-startup-message): Prefer svg file and replace colors.
(gnus-splash-svg-color-symbols): New function.
gnus-sum.el (gnus-simplify-buffer-fuzzy): Take the regexp explicitly instead of using the global gnus-simplify-subject-fuzzy-regexp.
(gnus-simplify-subject-fuzzy): Use the local gnus-simplify-subject-fuzzy-regex instead of the global one. This makes using this variable in group parameters work.
gnus-registry.el (gnus-registry-unfollowed-groups): Add "archive:sent" to the unfollowed group regex (for the recent Gnus archive:sent-YYYY-MM-DD groups).
(gnus-registry-split-fancy-with-parent): Bail out early in sender tracking if there are more than `gnus-registry-max-track-groups' matches.
message.el (message--yank-original-internal): New function to do the insertion cleanly inside eval in `message-yank-original'.
(message-yank-original): Use it.
Diffstat (limited to 'lisp/gnus/gssapi.el')
| -rw-r--r-- | lisp/gnus/gssapi.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/gnus/gssapi.el b/lisp/gnus/gssapi.el index 3765fb84ee8..e96c23b14ac 100644 --- a/lisp/gnus/gssapi.el +++ b/lisp/gnus/gssapi.el @@ -33,14 +33,14 @@ "--authentication-id %l") "imtest -m gssapi -u %l -p %p %s") "List of strings containing commands for GSSAPI (krb5) authentication. -%s is replaced with server hostname, %p with port to connect to, and -%l with the value of `imap-default-user'. The program should accept -IMAP commands on stdin and return responses to stdout. Each entry in -the list is tried until a successful connection is made." +%s is replaced with server hostname, %p with port to connect to, +and %l with the user name. The program should accept commands on +stdin and return responses to stdout. Each entry in the list is +tried until a successful connection is made." :group 'network :type '(repeat string)) -(defun open-gssapi-stream (name buffer server port) +(defun open-gssapi-stream (name buffer server port user) (let ((cmds gssapi-program) cmd done) (with-current-buffer buffer @@ -57,7 +57,7 @@ the list is tried until a successful connection is made." (format-spec-make ?s server ?p (number-to-string port) - ?l imap-default-user)))) + ?l user)))) response) (when process (while (and (memq (process-status process) '(open run)) @@ -92,7 +92,7 @@ the list is tried until a successful connection is made." (accept-process-output process 1) (sit-for 1)) (erase-buffer) - (message "GSSAPI IMAP connection: %s" (or response "failed")) + (message "GSSAPI connection: %s" (or response "failed")) (if (and response (let ((case-fold-search nil)) (not (string-match "failed" response)))) (setq done process) |