X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c71a0d48f3c880248a7f7f25e92ddbcbad5ef0e7..01fcc3a532872b29784a4d888ab9cc1aef0eed01:/lisp/gnus/gnus-cite.el

diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index d205437b81..3840f33687 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -1,6 +1,6 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus
 
-;; Copyright (C) 1995-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2013 Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
 
@@ -509,6 +509,7 @@ Lines matching `gnus-cite-attribution-suffix' and perhaps
 	  (if (and (equal (cdadr m) "")
 		   (equal (cdar m) (cdaddr m))
 		   (goto-char (caadr m))
+		   (looking-at "[ \t]*$")
 		   (forward-line 1)
 		   (= (point) (caaddr m)))
 	      (setcdr m (cdddr m))
@@ -744,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."
@@ -1163,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.
 
@@ -1224,13 +1199,8 @@ Returns nil if there is no such line before LIMIT, t otherwise."
     (autoload 'font-lock-set-defaults "font-lock")))
 
 (define-minor-mode gnus-message-citation-mode
-  "Toggle `gnus-message-citation-mode' in current buffer.
-This buffer local minor mode provides additional font-lock support for
-nested citations.
-With prefix ARG, turn `gnus-message-citation-mode' on if and only if ARG
-is positive.
-Automatically turn `font-lock-mode' on when `gnus-message-citation-mode'
-is turned on."
+  "Minor mode providing more font-lock support for nested citations.
+When enabled, it automatically turns on `font-lock-mode'."
   nil ;; init-value
   "" ;; lighter
   nil ;; keymap