From 2e0515202201e83d1845918760c888805164d369 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 26 Dec 2012 13:58:54 +0000 Subject: [PATCH] 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). --- lisp/gnus/ChangeLog | 9 +++++++++ lisp/gnus/gnus-cite.el | 22 ++++------------------ lisp/gnus/gnus-util.el | 2 +- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index cf92e6cc9f4..c873c6f6704 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,12 @@ +2012-12-26 Lars Ingebrigtsen + + * 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 * mml2015.el (mml2015-epg-signature-to-string): New function. 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." diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 1c22bdfd2c1..705a9e0debf 100644 --- 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) -- 2.39.5