[gnus git] branch master updated: =2= (mm-preferred-alternative-precedence): Discourage showing empty parts. ; Don't try to update marks and stuff if the backend didn't return the article number.

       via  d9418f8743d26df6253803ccb2ff8cdc88e8934f (commit)
       via  287936ed2b9b79a70720c962b27d6b5f81cd6fb3 (commit)
      from  52a457a8462d2932558d484f4378b533676dfaab (commit)


- Log -----------------------------------------------------------------
commit d9418f8743d26df6253803ccb2ff8cdc88e8934f
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Tue Jan 11 20:20:56 2011 +0100

    (mm-preferred-alternative-precedence): Discourage showing empty parts.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f01c905..668350a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-11  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* mm-decode.el (mm-preferred-alternative-precedence): Discourage
+	showing empty parts.
+
 	* gnus-int.el (gnus-request-accept-article): Don't try to update marks
 	and stuff if the backend didn't return the article number.  This fixes
 	an Exchange-related nnimap bug.
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 216ed66..ab3b378 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1,7 +1,7 @@
 ;;; mm-decode.el --- Functions for decoding MIME things
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[email protected]>
 ;;	MORIOKA Tomohiko <[email protected]>
@@ -1367,13 +1367,18 @@ Use CMD as the process."
 
 (defun mm-preferred-alternative-precedence (handles)
   "Return the precedence based on HANDLES and `mm-discouraged-alternatives'."
-  (let ((seq (nreverse (mapcar #'mm-handle-media-type
-			       handles))))
+  (setq handles (reverse handles))
     (dolist (disc (reverse mm-discouraged-alternatives))
-      (dolist (elem (copy-sequence seq))
-	(when (string-match disc elem)
-	  (setq seq (nconc (delete elem seq) (list elem))))))
-    seq))
+    (dolist (handle (copy-sequence handles))
+      (when (string-match disc (mm-handle-media-type elem))
+	(setq handles (nconc (delete handle handles) (list handle))))))
+  ;; Remove empty parts.
+  (dolist (handle (copy-sequence handles))
+    (unless (with-current-buffer (mm-handle-buffer handle)
+	      (goto-char (point-min))
+	      (re-search-forward "[^ \t\n]" nil t))
+      (setq handles (nconc (delete handle handles) (list handle)))))
+  (mapcar #'mm-handle-media-type handles))
 
 (defun mm-get-content-id (id)
   "Return the handle(s) referred to by ID."

commit 287936ed2b9b79a70720c962b27d6b5f81cd6fb3
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Tue Jan 11 20:03:55 2011 +0100

    Don't try to update marks and stuff if the backend didn't return the article number.
    
    This fixes an Exchange-related nnimap bug.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5cc1419..f01c905 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-01-11  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* gnus-int.el (gnus-request-accept-article): Don't try to update marks
+	and stuff if the backend didn't return the article number.  This fixes
+	an Exchange-related nnimap bug.
+
 	* gnus-sum.el (gnus-summary-next-article): Remove hack to reselect
 	group window, because it does the wrong thing when a separate frame
 	displays the group buffer.
diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 71a9aa9..b805167 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -1,7 +1,7 @@
 ;;; gnus-int.el --- backend interface functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[email protected]>
 ;; Keywords: news
@@ -711,7 +711,9 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
 	  (if (stringp group) (gnus-group-real-name group) group)
 	  (cadr gnus-command-method)
 	  last)))
-    (when (and gnus-agent (gnus-agent-method-p gnus-command-method))
+    (when (and gnus-agent
+	       (gnus-agent-method-p gnus-command-method)
+	       (cdr result))
       (gnus-agent-regenerate-group group (list (cdr result))))
     result))
 

-----------------------------------------------------------------------
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    |    7 +++++++
 lisp/gnus-int.el  |    6 ++++--
 lisp/mm-decode.el |   21 +++++++++++++--------
 3 files changed, 24 insertions(+), 10 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