[gnus git] branch master updated: m0-7-190-g74c3c92 =2= Fix thread marking on dummy roots ; (mml2015-epg-key-image-to-string): Protect against bugging out on ttys.

       via  74c3c92f78597749c0ff9a5911c0a42f83ba46dc (commit)
       via  be70cb1fb5dfa0296facac78b05b62726214b484 (commit)
      from  a827b33e3db35b1a13dadedebe1f1b76847f7f14 (commit)


- Log -----------------------------------------------------------------
commit 74c3c92f78597749c0ff9a5911c0a42f83ba46dc
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Aug 1 18:04:06 2013 +0200

    Fix thread marking on dummy roots
    
    * gnus-uu.el (gnus-uu-mark-thread, gnus-uu-unmark-thread): Work with
    dummy roots, too.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d9d456..d7ed5bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-01  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* gnus-uu.el (gnus-uu-mark-thread, gnus-uu-unmark-thread): Work with
+	dummy roots, too.
+
 2013-08-01  David Edmondson  <[email protected]>
 
 	* mml2015.el (mml2015-epg-key-image-to-string): Protect against bugging
diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index c50dcde..16ed4f1 100644
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -640,7 +640,7 @@ When called interactively, prompt for REGEXP."
     (let ((level (gnus-summary-thread-level)))
       (while (and (gnus-summary-set-process-mark
 		   (gnus-summary-article-number))
-		  (zerop (gnus-summary-next-subject 1 nil t))
+		  (zerop (forward-line 1))
 		  (> (gnus-summary-thread-level) level)))))
   (gnus-summary-position-point))
 
@@ -650,7 +650,7 @@ When called interactively, prompt for REGEXP."
   (let ((level (gnus-summary-thread-level)))
     (while (and (gnus-summary-remove-process-mark
 		 (gnus-summary-article-number))
-		(zerop (gnus-summary-next-subject 1))
+		(zerop (forward-line 1))
 		(> (gnus-summary-thread-level) level))))
   (gnus-summary-position-point))
 

commit be70cb1fb5dfa0296facac78b05b62726214b484
Author: David Edmondson <[email protected]>
Date:   Thu Aug 1 16:27:17 2013 +0200

    (mml2015-epg-key-image-to-string): Protect against bugging out on ttys.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35dd9a8..8d9d456 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-01  David Edmondson  <[email protected]>
+
+	* mml2015.el (mml2015-epg-key-image-to-string): Protect against bugging
+	out on ttys.
+
 2013-08-01  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* gnus-start.el (gnus-dribble-save): Only save the dribble file if it's
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 2c2187a..3efa5c2 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -885,17 +885,19 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
 
 (defun mml2015-epg-key-image-to-string (key-id)
   "Return a string with the image of a key, if any"
-  (let* ((result "")
-         (key-image (mml2015-epg-key-image key-id)))
-    (when key-image
-      (setq result "  ")
+  (let ((key-image (mml2015-epg-key-image key-id)))
+    (if (not key-image)
+	""
+      (condition-case error
+	  (let ((result "  "))
       (put-text-property
        1 2 'display
        (gnus-rescale-image key-image
 			   (cons mml2015-maximum-key-image-dimension
 				 mml2015-maximum-key-image-dimension))
-       result))
-    result))
+	     result)
+	    result)
+	(error "")))))
 
 (defun mml2015-epg-signature-to-string (signature)
   (concat (epg-signature-to-string signature)

-----------------------------------------------------------------------
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  |   10 ++++++++++
 lisp/gnus-uu.el |    4 ++--
 lisp/mml2015.el |   24 +++++++++++++-----------
 3 files changed, 25 insertions(+), 13 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