From 8b8059decd84744f886aed505b856a4052a0a99e Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 8 Dec 2011 06:22:03 +0000 Subject: [PATCH] gnus-sum.el (gnus-summary-show-article): Don't load shr unconditionally. --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/gnus-sum.el | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index bdc7313e57a..e8d0fb25bb5 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2011-12-08 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-show-article): Don't load shr + unconditionally. + 2011-12-07 Katsumi Yamaoka * message.el (message-pop-to-buffer): Use pop-to-buffer instead of diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 10d1b467c37..17ccae986e9 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/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) - (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 -- 2.39.2