projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(gnus-article-display-xface)
[gnus]
/
lisp
/
nntp.el
diff --git
a/lisp/nntp.el
b/lisp/nntp.el
index
62e8de2
..
a128219
100644
(file)
--- a/
lisp/nntp.el
+++ b/
lisp/nntp.el
@@
-352,7
+352,10
@@
noticing asynchronous data.")
(error
(nnheader-report 'nntp "Couldn't open connection to %s: %s"
address err))
(error
(nnheader-report 'nntp "Couldn't open connection to %s: %s"
address err))
- (quit nil)))))
+ (quit
+ (message "Quit retrieving data from nntp")
+ (signal 'quit nil)
+ nil)))))
(defsubst nntp-send-command (wait-for &rest strings)
"Send STRINGS to server and wait until WAIT-FOR returns."
(defsubst nntp-send-command (wait-for &rest strings)
"Send STRINGS to server and wait until WAIT-FOR returns."
@@
-800,8
+803,9
@@
If SEND-IF-FORCE, only send authinfo to the server if the
(or passwd
nntp-authinfo-password
(setq nntp-authinfo-password
(or passwd
nntp-authinfo-password
(setq nntp-authinfo-password
- (mail-source-read-passwd (format "NNTP (%s@%s) password: "
- user nntp-address))))))))))
+ (mail-source-read-passwd
+ (format "NNTP (%s@%s) password: "
+ user nntp-address))))))))))
(defun nntp-send-nosy-authinfo ()
"Send the AUTHINFO to the nntp server."
(defun nntp-send-nosy-authinfo ()
"Send the AUTHINFO to the nntp server."
@@
-873,7
+877,10
@@
password contained in '~/.nntp-authinfo'."
(coding-system-for-write nntp-coding-system-for-write))
(funcall nntp-open-connection-function pbuffer))
(error nil)
(coding-system-for-write nntp-coding-system-for-write))
(funcall nntp-open-connection-function pbuffer))
(error nil)
- (quit nil))))
+ (quit
+ (message "Quit opening connection")
+ (signal 'quit nil)
+ nil))))
(when timer
(nnheader-cancel-timer timer))
(when (and (buffer-name pbuffer)
(when timer
(nnheader-cancel-timer timer))
(when (and (buffer-name pbuffer)
@@
-982,7
+989,7
@@
password contained in '~/.nntp-authinfo'."
(if (memq (following-char) '(?4 ?5))
;; wants credentials?
(if (looking-at "480")
(if (memq (following-char) '(?4 ?5))
;; wants credentials?
(if (looking-at "480")
- (nntp-handle-authinfo
nntp-process-to-buffer
)
+ (nntp-handle-authinfo
process
)
;; report error message.
(nntp-snarf-error-message)
(nntp-do-callback nil))
;; report error message.
(nntp-snarf-error-message)
(nntp-do-callback nil))