[gnus git] branch master updated: n0-17-420-g0e6db3e =1= gnus-sum.el (gnus-summary-show-article): Don't load shr unconditionally.

       via  0e6db3e47aef42e1a115abb251b640174c2d2533 (commit)
      from  d1732c5a92e1fbbeb24c560140ba15ce666695be (commit)


- Log -----------------------------------------------------------------
commit 0e6db3e47aef42e1a115abb251b640174c2d2533
Author: Katsumi Yamaoka <[email protected]>
Date:   Thu Dec 8 06:21:35 2011 +0000

    gnus-sum.el (gnus-summary-show-article): Don't load shr unconditionally.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8e264a..c14d2fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-08  Katsumi Yamaoka  <[email protected]>
+
+	* gnus-sum.el (gnus-summary-show-article): Don't load shr
+	unconditionally.
+
 2011-12-07  Katsumi Yamaoka  <[email protected]>
 
 	* message.el (message-pop-to-buffer): Use pop-to-buffer instead of
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 10d1b46..17ccae9 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -9611,9 +9611,12 @@ C-u g', show the raw article."
 	(when (gnus-summary-goto-subject (cdr gnus-article-current) nil t)
 	  (gnus-summary-update-secondary-mark (cdr gnus-article-current))))))
    ((not arg)
+    ;; Select the article the normal way.
+    (if (eq mm-text-html-renderer 'shr)
+	(progn
     (require 'shr)
     (let ((shr-ignore-cache t))
-      ;; Select the article the normal way.
+	    (gnus-summary-select-article nil 'force)))
       (gnus-summary-select-article nil 'force)))
    ((equal arg '(16))
     ;; C-u C-u g

-----------------------------------------------------------------------
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   |    5 +++++
 lisp/gnus-sum.el |    9 ++++++---
 2 files changed, 11 insertions(+), 3 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