* auth-source.el (auth-sources):

[gnus] / lisp / gnus-cite.el

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 22e97cd..57fc281 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -1,6 +1,6 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus
 
-;; Copyright (C) 1995-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2015 Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
 
@@ -786,12 +786,12 @@ See also the documentation for `gnus-article-highlight-citation'."
 (defun gnus-cite-delete-overlays ()
   (dolist (overlay gnus-cite-overlay-list)
     (ignore-errors
-      (when (or (not (gnus-overlay-end overlay))
-               (and (>= (gnus-overlay-end overlay) (point-min))
-                    (<= (gnus-overlay-end overlay) (point-max))))
+      (when (or (not (overlay-end overlay))
+               (and (>= (overlay-end overlay) (point-min))
+                    (<= (overlay-end overlay) (point-max))))
        (setq gnus-cite-overlay-list (delete overlay gnus-cite-overlay-list))
        (ignore-errors
-         (gnus-delete-overlay overlay))))))
+         (delete-overlay overlay))))))
 
 (defun gnus-cite-parse-wrapper ()
   ;; Wrap chopped gnus-cite-parse.
@@ -1096,10 +1096,10 @@ See also the documentation for `gnus-article-highlight-citation'."
        (skip-chars-backward " \t")
        (setq to (point))
        (when (< from to)
-         (push (setq overlay (gnus-make-overlay from to))
+         (push (setq overlay (make-overlay from to nil t))
                gnus-cite-overlay-list)
-         (gnus-overlay-put overlay 'evaporate t)
-         (gnus-overlay-put overlay 'face face))))))
+         (overlay-put overlay 'evaporate t)
+         (overlay-put overlay 'face face))))))
 
 (defun gnus-cite-toggle (prefix)
   (with-current-buffer gnus-article-buffer
@@ -1204,7 +1204,8 @@ When enabled, it automatically turns on `font-lock-mode'."
   nil ;; init-value
   "" ;; lighter
   nil ;; keymap
-  (when (eq major-mode 'message-mode)
+  (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)))
@@ -1233,8 +1234,10 @@ When enabled, it automatically turns on `font-lock-mode'."
                font-lock-keywords nil))
       (setq font-lock-set-defaults nil))
     (font-lock-set-defaults)
-    (cond ((symbol-value 'font-lock-mode)
-          (font-lock-fontify-buffer))
+    (cond (font-lock-mode
+           (if (fboundp 'font-lock-flush)
+               (font-lock-flush)
+             (font-lock-fontify-buffer)))
          (gnus-message-citation-mode
           (font-lock-mode 1)))))