Make `gnus-article-hide-citation-maybe' leave buttons to mark hidden text

* gnus-cite.el (gnus-article-hide-citation-maybe): Leave an expansion
button to mark the hidden citations (bug#9395).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4bef403..e746685 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-26  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-cite.el (gnus-article-hide-citation-maybe): Leave an expansion
+       button to mark the hidden citations (bug#9395).
+

 2012-12-25  Leo Liu  <sdl.web@gmail.com>
 
        * plstore.el (plstore-passphrase-callback-function): Fix error when
 2012-12-25  Leo Liu  <sdl.web@gmail.com>
 
        * plstore.el (plstore-passphrase-callback-function): Fix error when

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index d107dfa..bab589a 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/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
          (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)))
                  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."
 
 (defun gnus-article-hide-citation-in-followups ()
   "Hide cited text in non-root articles."