Merge from origin/emacs-25

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

diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index 57f463f14c2c0fb89dba206848413f3b2319bd07..4f05d2ee9d519c62555beb9614ce39f8bd427e19 100644 (file)
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -527,7 +527,6 @@ longer than the frame width."
          (inhibit-point-motion-hooks t)
          (marks (gnus-dissect-cited-text))
          (adaptive-fill-mode nil)
-         (filladapt-mode nil)
          (fill-column (if width (prefix-numeric-value width) fill-column)))
       (save-restriction
        (while (cdr marks)
@@ -1118,7 +1117,7 @@ See also the documentation for `gnus-article-highlight-citation'."
              ((assq number gnus-cite-attribution-alist))
              (t
               (gnus-add-wash-type 'cite)
-              (gnus-add-text-properties
+              (add-text-properties
                (point) (progn (forward-line 1) (point))
                (nconc (list 'article-type 'cite)
                       gnus-hidden-properties))))