Merge from origin/emacs-25

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

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 527735fb0a33e602788f84b7a4325ef8140def64..8cabe01168b67861bb3732462ce1c9a79460ae8b 100644 (file)
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1135,8 +1135,8 @@ See the variable `gnus-user-agent'."
            (when (memq 'gnus gnus-user-agent)
              (concat "Gnus/"
                      (replace-regexp-in-string
-                      (format "%1.8f" (gnus-continuum-version gnus-version))
-                      "0+\\'" "")
+                      "0+\\'" ""
+                      (format "%1.8f" (gnus-continuum-version gnus-version)))
                      " (" gnus-version ")")))
           (emacs-v (gnus-emacs-version)))
       (concat gnus-v (when (and gnus-v emacs-v) " ")
@@ -1342,7 +1342,7 @@ For the \"inline\" alternatives, also see the variable
   (gnus-inews-insert-gcc)
   (let ((gcc (mapcar
              (lambda (group)
-               (mm-encode-coding-string
+               (encode-coding-string
                 group
                 (gnus-group-name-charset (gnus-inews-group-method group)
                                          group)))
@@ -1359,7 +1359,7 @@ For the \"inline\" alternatives, also see the variable
             (insert "Gcc: \"" gnus-newsgroup-name "\"\n"))
            ((stringp self)
             (insert "Gcc: "
-                    (mm-encode-coding-string
+                    (encode-coding-string
                      (if (string-match " " self)
                          (concat "\"" self "\"")
                        self)
@@ -1398,7 +1398,7 @@ For the \"inline\" alternatives, also see the variable
        tem)
     (dolist (style styles)
       (when (stringp (cadr style))
-       (setcdr style (list (mm-decode-coding-string (cadr style) 'utf-8)))))
+       (setcdr style (list (decode-coding-string (cadr style) 'utf-8)))))
     (dolist (style (if styles
                       (append gnus-posting-styles (list (cons ".*" styles)))
                     gnus-posting-styles))
@@ -1491,7 +1491,7 @@ See `gnus-summary-mail-forward' for ARG."
        (message-goto-subject)
        (re-search-forward " *$")
        (replace-match " (crosspost notification)" t t)
-       (gnus-deactivate-mark)
+       (deactivate-mark)
        (when (gnus-y-or-n-p "Send this complaint? ")
          (message-send-and-exit))))))
 
@@ -1637,7 +1637,7 @@ this is a reply."
          ;; Copy the article over to some group(s).
          (while (setq group (pop groups))
            (setq method (gnus-inews-group-method group)
-                 group (mm-encode-coding-string
+                 group (encode-coding-string
                         group
                         (gnus-group-name-charset method group)))
            (unless (gnus-check-server method)
@@ -1658,8 +1658,7 @@ this is a reply."
              (run-hooks 'gnus-gcc-post-body-encode-hook)
              (save-restriction
                (message-narrow-to-headers)
-               (let* ((mail-parse-charset message-default-charset)
-                      (newsgroups-field (save-restriction
+               (let* ((newsgroups-field (save-restriction
                                           (message-narrow-to-headers-or-head)
                                           (message-fetch-field "Newsgroups")))
                       (followup-field (save-restriction
@@ -1840,8 +1839,8 @@ this is a reply."
          (when tmp-style
            (dolist (style tmp-style)
              (when (stringp (cadr style))
-               (setcdr style (list (mm-decode-coding-string (cadr style)
-                                                            'utf-8)))))
+               (setcdr style (list (decode-coding-string (cadr style)
+                                                         'utf-8)))))
            (setq styles (append styles (list (cons ".*" tmp-style)))))))
       ;; Go through all styles and look for matches.
       (dolist (style styles)
@@ -1904,10 +1903,10 @@ this is a reply."
                  (cond
                   ((stringp value)
                    (if (and matched-string
-                            (gnus-string-match-p "\\\\[&[:digit:]]" value)
+                            (string-match-p "\\\\[&[:digit:]]" value)
                             (match-beginning 1))
-                       (gnus-match-substitute-replacement value nil nil
-                                                          matched-string)
+                       (match-substitute-replacement value nil nil
+                                                     matched-string)
                      value))
                   ((or (symbolp value)
                        (functionp value))