* nntp.el (nntp-wait-for): Return the success code.

[gnus] / lisp / gnus-int.el

diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 271cb64..bd16df5 100644 (file)
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -70,8 +70,7 @@ If CONFIRM is non-nil, the user will be asked for an NNTP server."
                           (list 'nnmh-directory
                                 (file-name-as-directory
                                  (expand-file-name
-                                  (concat "~/" (substring
-                                                gnus-nntp-server 1)))))
+                                  (substring gnus-nntp-server 1) "~/")))
                           (list 'nnmh-get-new-mail nil)))
                    (t
                     (list 'nntp gnus-nntp-server)))))
@@ -125,7 +124,10 @@ If it is down, start it up (again)."
                        (format " on %s" (nth 1 method)))))
       (gnus-run-hooks 'gnus-open-server-hook)
       (prog1
-         (gnus-open-server method)
+         (condition-case ()
+             (gnus-open-server method)
+           (quit (message "Quit gnus-check-server")
+                 nil))
        (unless silent
          (message ""))))))
 
@@ -459,6 +461,7 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
     (insert "\n"))
   (unless no-encode
     (let ((message-options message-options))
+      (message-options-set-recipient)
       (save-restriction
        (message-narrow-to-head)
        (let ((mail-parse-charset message-default-charset))
@@ -474,6 +477,7 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
 (defun gnus-request-replace-article (article group buffer &optional no-encode)
   (unless no-encode
     (let ((message-options message-options))
+      (message-options-set-recipient)
       (save-restriction
        (message-narrow-to-head)
        (let ((mail-parse-charset message-default-charset))