summaryrefslogtreecommitdiff
path: root/lisp/gnus/shr.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2012-06-10 22:16:03 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2012-06-10 22:16:03 +0000
commitb4543a2894f8d74cb01e4b353f8d6ebb5ae7bf3b (patch)
treebd5bcac1b83dd4ee894a93adcd4a3bc8e6ee7108 /lisp/gnus/shr.el
parent166bc0c84e48bc9874abc2b215047a0705d83c1d (diff)
downloademacs-b4543a2894f8d74cb01e4b353f8d6ebb5ae7bf3b.tar.gz
emacs-b4543a2894f8d74cb01e4b353f8d6ebb5ae7bf3b.tar.bz2
emacs-b4543a2894f8d74cb01e4b353f8d6ebb5ae7bf3b.zip
Merge changes made in No Gnus
2012-06-10 Toke Hoiland-Jorgensen <toke@toke.dk> (tiny change) * nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time' is an integer to avoid later problems. 2012-06-10 Lars Magne Ingebrigtsen <larsi@gnus.org> * shr.el: Add a iso-8859-1 cookie to make stuff work under other locales.
Diffstat (limited to 'lisp/gnus/shr.el')
-rw-r--r--lisp/gnus/shr.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index c2040a9b8cf..42118298734 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -1393,4 +1393,8 @@ ones, in case fg and bg are nil."
(provide 'shr)
+;; Local Variables:
+;; coding: iso-8859-1
+;; End:
+
;;; shr.el ends here