Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / gnus-int.el

diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 4f8f17f18f35a49e3d9b154d0059889ac549fdd0..93545ff39bc0d7070ba0d96ac2989176bcc86c30 100644 (file)
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -1,6 +1,6 @@
 ;;; gnus-int.el --- backend interface functions for Gnus
 
-;; Copyright (C) 1996-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -164,7 +164,7 @@ If CONFIRM is non-nil, the user will be asked for an NNTP server."
        (gnus-open-server gnus-select-method)
        gnus-batch-mode
        (gnus-y-or-n-p
-       (gnus-format-message
+       (format-message
         "%s (%s) open error: `%s'.  Continue? "
         (car gnus-select-method) (cadr gnus-select-method)
         (gnus-status-message gnus-select-method)))
@@ -777,8 +777,7 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
       (message-options-set-recipient)
       (save-restriction
        (message-narrow-to-head)
-       (let ((mail-parse-charset message-default-charset))
-         (mail-encode-encoded-word-buffer)))
+       (mail-encode-encoded-word-buffer))
       (message-encode-message-body)))
   (let ((gnus-command-method (or gnus-command-method
                                 (gnus-find-method-for-group group)))
@@ -800,8 +799,7 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
       (message-options-set-recipient)
       (save-restriction
        (message-narrow-to-head)
-       (let ((mail-parse-charset message-default-charset))
-         (mail-encode-encoded-word-buffer)))
+       (mail-encode-encoded-word-buffer))
       (message-encode-message-body)))
   (let* ((func (car (gnus-group-name-to-method group)))
          (result (funcall (intern (format "%s-request-replace-article" func))