[Emacs-diffs] /srv/bzr/emacs/trunk r106637: gnus-sum.el (gnus-summary-show-article): Don't load shr unconditionally.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106637
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-12-08 06:22:03 +0000
message:
  gnus-sum.el (gnus-summary-show-article): Don't load shr unconditionally.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-12-07 06:07:53 +0000
+++ b/lisp/gnus/ChangeLog       2011-12-08 06:22:03 +0000
@@ -1,3 +1,8 @@
+2011-12-08  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-sum.el (gnus-summary-show-article): Don't load shr
+       unconditionally.
+
 2011-12-07  Katsumi Yamaoka  <address@hidden>
 
        * message.el (message-pop-to-buffer): Use pop-to-buffer instead of

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-12-06 01:30:54 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-12-08 06:22:03 +0000
@@ -9611,9 +9611,12 @@
        (when (gnus-summary-goto-subject (cdr gnus-article-current) nil t)
          (gnus-summary-update-secondary-mark (cdr gnus-article-current))))))
    ((not arg)
-    (require 'shr)
-    (let ((shr-ignore-cache t))
-      ;; Select the article the normal way.
+    ;; Select the article the normal way.
+    (if (eq mm-text-html-renderer 'shr)
+       (progn
+         (require 'shr)
+         (let ((shr-ignore-cache t))
+           (gnus-summary-select-article nil 'force)))
       (gnus-summary-select-article nil 'force)))
    ((equal arg '(16))
     ;; C-u C-u g