summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-html.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2011-07-19 22:19:06 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-07-19 22:19:06 +0000
commitae97e6451dc1d2b7454e39953f202a63ed54a2ae (patch)
tree7d117800fce9a27095953e8a4ead1e734f796230 /lisp/gnus/gnus-html.el
parent92e15d10a641b7877b91436ab215acb9d9c16f22 (diff)
downloademacs-ae97e6451dc1d2b7454e39953f202a63ed54a2ae.tar.gz
emacs-ae97e6451dc1d2b7454e39953f202a63ed54a2ae.tar.bz2
emacs-ae97e6451dc1d2b7454e39953f202a63ed54a2ae.zip
Merge changes made in Gnus trunk.
gnus-group.el (gnus-group-read-ephemeral-group): Make sure we don't enter invalid buffer configurations into the quit form (bug#9107). (gnus-group-tool-bar-gnome): Replace connect/disconnect with unplugged/plugged. gnus-sum.el (gnus-summary-refer-thread): When inserting new headers, keep track of which ones are unread (bug#9061). gnus.el (gnus-refer-article-method): Allow entering any sexp (bug#9055). gnus-art.el (gnus-article-show-images): Allow working if using w3m (bug#9041). gnus-html.el (mm-util): Require (bug#9073). gnus-sum.el (gnus-delete-duplicate-headers): New function. (gnus-summary-refer-thread): Use it to remove duplicates in the un-threaded view (bug#9053). (gnus-summary-insert-subject): Document USE-OLD-HEADER (bug#9070). nnir.el (nnir-read-server-parm): Use default value from global variable. Without this the default search engine parameters aren't used at all. message.el (message-unique-id): Don't use the undocumented return value from (random t) (bug#9118).
Diffstat (limited to 'lisp/gnus/gnus-html.el')
-rw-r--r--lisp/gnus/gnus-html.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 6ca3c8b7945..d3da6aab1b7 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -38,6 +38,7 @@
(require 'url-cache)
(require 'xml)
(require 'browse-url)
+(require 'mm-util)
(eval-and-compile (unless (featurep 'xemacs) (require 'help-fns)))
(defcustom gnus-html-image-cache-ttl (days-to-time 7)