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).

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cf92e6cc9f48de5a5661002889a0bdb816f5d024..c873c6f67040b84a0d6c9ff76a8fccce5e39a36f 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-26  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * 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).
+
 2012-12-26  Daiki Ueno  <ueno@gnu.org>
 
        * mml2015.el (mml2015-epg-signature-to-string): New function.

diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index d107dfad32e3c8efc373de07b7fdbd6f993d55e2..bab589ab71f8bf3910eb3c2d6649740c13f3fb06 100644 (file)
--- 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."

diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 1c22bdfd2c1189c40abc948b00a17baa027b9867..705a9e0debf90bd76f01ed1f440db1691ecae8f7 100644 (file)
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -225,7 +225,7 @@ is slower."
 
 
 (defun gnus-goto-colon ()
-  (beginning-of-line)
+  (move-beginning-of-line 1)
   (let ((eol (point-at-eol)))
     (goto-char (or (text-property-any (point) eol 'gnus-position t)
                   (search-forward ":" eol t)