Merge from origin/emacs-25

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

diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 1a12a0fc3731724643d9b25638a7bc7b9961880d..14059ac566be8c2940566e5e826078378d987604 100644 (file)
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -1431,7 +1431,7 @@ If FORMAT, also format the current score file."
                (and (file-exists-p file)
                     (not (file-writable-p file))))
            ()
-         (setq score (setcdr entry (gnus-delete-alist 'touched score)))
+         (setq score (setcdr entry (assq-delete-all 'touched score)))
          (erase-buffer)
          (let (emacs-lisp-mode-hook)
            (if (and (not gnus-adaptive-pretty-print)
@@ -1727,7 +1727,7 @@ score in `gnus-newsgroup-scored' by SCORE."
   nil)
 
 (defun gnus-score-decode-text-parts ()
-  (gmm-labels
+  (cl-labels
       ((mm-text-parts
        (handle)
        (cond ((stringp (car handle))
@@ -1751,7 +1751,7 @@ score in `gnus-newsgroup-scored' by SCORE."
            (mm-display-inline handle)
            (goto-char (point-max))))))
 
-    (let (;(mm-text-html-renderer 'w3m-standalone)
+    (let (                   ;(mm-text-html-renderer 'w3m-standalone)
          (handles (mm-dissect-buffer t)))
       (save-excursion
        (article-goto-body)