Merge changes made in Gnus master

gnus-util.el (gnus-goto-colon): Move to the beginning of the visual
  lines.  This makes summary commands with hidden threads work more
  reliably.
gnus-cite.el (gnus-article-hide-citation-maybe): Leave an expansion
  button to mark the hidden citations (bug#9395).

1 files changed, 4 insertions, 18 deletions

diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index d107dfad32e..bab589ab71f 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -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."