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

[gnus] / lisp / gnus-cite.el

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 6bcba71..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-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2015 Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
 
@@ -745,28 +745,14 @@ See also the documentation for `gnus-article-highlight-citation'."
          (gnus-article-search-signature)
          (setq total (count-lines start (point)))
          (while atts
-           (setq hidden (+ hidden (length (cdr (assoc (cdar atts)
-                                                      gnus-cite-prefix-alist))))
+           (setq hidden (+ hidden (length
+                                   (cdr (assoc (cdar atts)
+                                               gnus-cite-prefix-alist))))
                  atts (cdr atts)))
          (when (or force
                    (and (> (* 100 hidden) (* gnus-cite-hide-percentage total))
                         (> hidden gnus-cite-hide-absolute)))
-           (gnus-add-wash-type 'cite)
-           (setq atts gnus-cite-attribution-alist)
-           (while atts
-             (setq total (cdr (assoc (cdar atts) gnus-cite-prefix-alist))
-                   atts (cdr atts))
-             (while total
-               (setq hidden (car total)
-                     total (cdr total))
-               (goto-char (point-min))
-               (forward-line (1- hidden))
-               (unless (assq hidden gnus-cite-attribution-alist)
-                 (gnus-add-text-properties
-                  (point) (progn (forward-line 1) (point))
-                  (nconc (list 'article-type 'cite)
-                         gnus-hidden-properties)))))))))
-    (gnus-set-mode-line 'article)))
+           (gnus-article-hide-citation)))))))
 
 (defun gnus-article-hide-citation-in-followups ()
   "Hide cited text in non-root articles."
@@ -800,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.
@@ -1110,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
@@ -1164,18 +1150,6 @@ See also the documentation for `gnus-article-highlight-citation'."
     (while vars
       (make-local-variable (pop vars)))))
 
-(defun gnus-cited-line-p ()
-  "Say whether the current line is a cited line."
-  (save-excursion
-    (beginning-of-line)
-    (let ((found nil))
-      (dolist (prefix (mapcar 'car gnus-cite-prefix-alist))
-       (when (string= (buffer-substring (point) (+ (length prefix) (point)))
-                      prefix)
-         (setq found t)))
-      found)))
-
-
 ;; Highlighting of different citation levels in message-mode.
 ;; - message-cite-prefix will be overridden if this is enabled.
 
@@ -1230,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)))
@@ -1259,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)))))
 
@@ -1276,7 +1253,7 @@ When enabled, it automatically turns on `font-lock-mode'."
 (provide 'gnus-cite)
 
 ;; Local Variables:
-;; coding: iso-8859-1
+;; coding: utf-8
 ;; End:
 
 ;;; gnus-cite.el ends here