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 502a3be355502e107c0c539e29a239b5b5fa63cd..4f05d2ee9d519c62555beb9614ce39f8bd427e19 100644 (file)
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -24,9 +24,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(eval-when-compile
-  (when (featurep 'xemacs)
-    (require 'easy-mmode))) ; for `define-minor-mode'
 
 (require 'gnus)
 (require 'gnus-range)
@@ -530,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)
@@ -1121,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))))
@@ -1194,9 +1190,7 @@ Returns nil if there is no such line before LIMIT, t otherwise."
 (defvar font-lock-keywords)
 (defvar font-lock-set-defaults)
 
-(eval-and-compile
-  (unless (featurep 'xemacs)
-    (autoload 'font-lock-set-defaults "font-lock")))
+(autoload 'font-lock-set-defaults "font-lock")
 
 (define-minor-mode gnus-message-citation-mode
   "Minor mode providing more font-lock support for nested citations.
@@ -1206,9 +1200,7 @@ When enabled, it automatically turns on `font-lock-mode'."
   nil ;; keymap
   (when (eq major-mode 'message-mode)   ;FIXME: Use derived-mode-p.
     ;; FIXME: Use font-lock-add-keywords!
-    (let ((defaults (car (if (featurep 'xemacs)
-                            (get 'message-mode 'font-lock-defaults)
-                          font-lock-defaults)))
+    (let ((defaults (car font-lock-defaults))
          default keywords)
       (while defaults
        (setq default (if (consp defaults)
@@ -1227,19 +1219,11 @@ When enabled, it automatically turns on `font-lock-mode'."
                         gnus-message-citation-keywords))
          (kill-local-variable default))))
     ;; Force `font-lock-set-defaults' to update `font-lock-keywords'.
-    (if (featurep 'xemacs)
-       (progn
-         (require 'font-lock)
-         (setq font-lock-defaults-computed nil
-               font-lock-keywords nil))
-      (setq font-lock-set-defaults nil))
+    (setq font-lock-set-defaults nil)
     (font-lock-set-defaults)
-    (cond (font-lock-mode
-           (if (fboundp 'font-lock-flush)
-               (font-lock-flush)
-             (font-lock-fontify-buffer)))
-         (gnus-message-citation-mode
-          (font-lock-mode 1)))))
+    (if font-lock-mode
+       (font-lock-flush)
+      (gnus-message-citation-mode (font-lock-mode 1)))))
 
 (defun turn-on-gnus-message-citation-mode ()
   "Turn on `gnus-message-citation-mode'."
@@ -1248,8 +1232,6 @@ When enabled, it automatically turns on `font-lock-mode'."
   "Turn off `gnus-message-citation-mode'."
   (gnus-message-citation-mode -1))
 
-(gnus-ems-redefine)
-
 (provide 'gnus-cite)
 
 ;; Local Variables: