[Emacs-diffs] /srv/bzr/emacs/trunk r111337: Merge changes made in Gnus master

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 111337
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2012-12-26 13:58:54 +0000
message:
  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).
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-cite.el
  lisp/gnus/gnus-util.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-12-26 04:20:21 +0000
+++ b/lisp/gnus/ChangeLog       2012-12-26 13:58:54 +0000
@@ -1,3 +1,12 @@
+2012-12-26  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mml2015.el (mml2015-epg-signature-to-string): New function.

=== modified file 'lisp/gnus/gnus-cite.el'
--- a/lisp/gnus/gnus-cite.el    2012-07-24 22:17:17 +0000
+++ b/lisp/gnus/gnus-cite.el    2012-12-26 13:58:54 +0000
@@ -745,28 +745,14 @@
          (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."

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2012-12-25 22:12:59 +0000
+++ b/lisp/gnus/gnus-util.el    2012-12-26 13:58:54 +0000
@@ -225,7 +225,7 @@
 
 
 (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)