[gnus git] branch master updated: m0-5-219-gcadb861 =2= Make summary movement with hidden threads more predictable ; Make `gnus-article-hide-citation-maybe' leave buttons to mark hidden text

       via  cadb861eea26bc60d9235e2eed912907511999eb (commit)
       via  2b1d13e859e388e081a1a723c96f9838dbb20cf0 (commit)
      from  ac49eb59b510c3ca7dc8ca6fa1306bf0ffc3cdec (commit)


- Log -----------------------------------------------------------------
commit cadb861eea26bc60d9235e2eed912907511999eb
Author: Lars Ingebrigtsen <[email protected]>
Date:   Wed Dec 26 14:46:49 2012 +0100

    Make summary movement with hidden threads more predictable
    
    * gnus-util.el (gnus-goto-colon): Move to the beginning of the visual
    lines.  This makes summary commands with hidden threads work more
    reliably.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e746685..12b180f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2012-12-26  Lars Ingebrigtsen  <[email protected]>
 
+	* 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-compat.el b/lisp/gnus-compat.el
index 3241cd1..f62a394 100644
--- a/lisp/gnus-compat.el
+++ b/lisp/gnus-compat.el
@@ -122,6 +122,13 @@ TRASH is ignored."
 		       (t
 			(list face oldval)))))))))
 
+(unless (fboundp 'move-beginning-of-line)
+  (defun move-beginning-of-line (arg)
+    (interactive "p")
+    (unless (= arg 1)
+      (forward-line arg))
+    (beginning-of-line)))
+
 (provide 'gnus-compat)
 
 ;; gnus-compat.el ends here
diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 1c22bdf..705a9e0 100644
--- a/lisp/gnus-util.el
+++ b/lisp/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)

commit 2b1d13e859e388e081a1a723c96f9838dbb20cf0
Author: Lars Ingebrigtsen <[email protected]>
Date:   Wed Dec 26 14:40:25 2012 +0100

    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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-26  Lars Ingebrigtsen  <[email protected]>
+
+	* gnus-cite.el (gnus-article-hide-citation-maybe): Leave an expansion
+	button to mark the hidden citations (bug#9395).
+
 2012-12-25  Leo Liu  <[email protected]>
 
 	* 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
--- 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
-	    (setq hidden (+ hidden (length (cdr (assoc (cdar atts)
+	    (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."

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog      |    9 +++++++++
 lisp/gnus-cite.el   |   22 ++++------------------
 lisp/gnus-compat.el |    7 +++++++
 lisp/gnus-util.el   |    2 +-
 4 files changed, 21 insertions(+), 19 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project