Commit f3f01d5d authored by Miles Bader's avatar Miles Bader
Browse files

Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-517

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 105)

   - Update from CVS

2005-08-22  Karl Chen  <quarl@cs.berkeley.edu>  (tiny change)

   * lisp/gnus/gnus-art.el (gnus-treatment-function-alist): Move date-lapsed to
   the end of the date treatments.

2005-08-15  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/pgg.el (url-insert-file-contents): Don't autoload it, Emacs has
   it in url-handlers.el and XEmacs in url.el.  Reported by Luca
   Capello and Romain Francoise.
   (pgg-fetch-key-function): Removed, not used?
   (pgg-insert-url-with-w3): Require url, to get
   url-insert-file-contents regardless of where it is defined.

2005-08-08  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/pgg.el: Autoload url-insert-file-contents instead of loading
   w3/url.
   (pgg-insert-url-with-w3): Don't load url here.

2005-08-19  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/emacs-mime.texi (time-date): Fix description of safe-date-to-time.

2005-08-18  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/emacs-mime.texi (Handles): Remove duplicate item.
   (Encoding Customization): Fix the default value for
   mm-coding-system-priorities.
   (Charset Translation): Emacs doesn't use mm-mime-mule-charset-alist.
   (Basic Functions): Fix reference.

2005-08-09  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Charsets): Fj hierarchy uses iso-2022-jp.
parent 41796d09
2005-08-22 Karl Chen <quarl@cs.berkeley.edu> (tiny change)
* gnus-art.el (gnus-treatment-function-alist): Move date-lapsed to
the end of the date treatments.
2005-08-15 Simon Josefsson <jas@extundo.com>
* pgg.el (url-insert-file-contents): Don't autoload it, Emacs has
it in url-handlers.el and XEmacs in url.el. Reported by Luca
Capello and Romain Francoise.
(pgg-fetch-key-function): Removed, not used?
(pgg-insert-url-with-w3): Require url, to get
url-insert-file-contents regardless of where it is defined.
2005-08-08 Simon Josefsson <jas@extundo.com>
* pgg.el: Autoload url-insert-file-contents instead of loading
w3/url.
(pgg-insert-url-with-w3): Don't load url here.
2005-08-05 Daiki Ueno <ueno@unixuser.org>
* mml2015.el (mml2015-pgg-sign): Make sure micalg is correct.
......
......@@ -1481,10 +1481,10 @@ This requires GNU Libidn, and by default only enabled if it is found."
(gnus-treat-date-ut gnus-article-date-ut)
(gnus-treat-date-local gnus-article-date-local)
(gnus-treat-date-english gnus-article-date-english)
(gnus-treat-date-lapsed gnus-article-date-lapsed)
(gnus-treat-date-original gnus-article-date-original)
(gnus-treat-date-user-defined gnus-article-date-user)
(gnus-treat-date-iso8601 gnus-article-date-iso8601)
(gnus-treat-date-lapsed gnus-article-date-lapsed)
(gnus-treat-display-x-face gnus-article-display-x-face)
(gnus-treat-display-face gnus-article-display-face)
(gnus-treat-hide-headers gnus-article-maybe-hide-headers)
......
......@@ -35,20 +35,10 @@
;; Don't merge these two `eval-when-compile's.
(eval-when-compile
(require 'cl))
;; Fixme: This would be better done with an autoload for
;; `url-insert-file-contents', and the url stuff rationalized.
;; (`locate-library' can say whether the url code is available.)
(eval-when-compile
(ignore-errors
(require 'w3)
(require 'url)))
;;; @ utility functions
;;;
(defvar pgg-fetch-key-function (if (fboundp 'url-insert-file-contents)
(function pgg-fetch-key-with-w3)))
(defun pgg-invoke (func scheme &rest args)
(progn
(require (intern (format "pgg-%s" scheme)))
......
2005-08-19 Katsumi Yamaoka <yamaoka@jpl.org>
* emacs-mime.texi (time-date): Fix description of safe-date-to-time.
2005-08-18 Katsumi Yamaoka <yamaoka@jpl.org>
* emacs-mime.texi (Handles): Remove duplicate item.
(Encoding Customization): Fix the default value for
mm-coding-system-priorities.
(Charset Translation): Emacs doesn't use mm-mime-mule-charset-alist.
(Basic Functions): Fix reference.
2005-08-09 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus.texi (Charsets): Fj hierarchy uses iso-2022-jp.
2005-08-22 Juri Linkov <juri@jurta.org>
* display.texi (Standard Faces): Merge the text from
......
......@@ -9,8 +9,8 @@
@copying
This file documents the Emacs MIME interface functionality.
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
......@@ -213,10 +213,6 @@ Set the undisplayer object.
@findex mm-handle-disposition
Return the parsed @code{Content-Disposition} of the part.
@item mm-handle-disposition
@findex mm-handle-disposition
Return the description of the part.
@item mm-get-content-id
Returns the handle(s) referred to by @code{Content-ID}.
......@@ -813,7 +809,9 @@ by using the @code{encoding} @acronym{MML} tag (@pxref{MML Definition}).
@item mm-coding-system-priorities
@vindex mm-coding-system-priorities
Prioritize coding systems to use for outgoing messages. The default
is @code{nil}, which means to use the defaults in Emacs. It is a list of
is @code{nil}, which means to use the defaults in Emacs, but is
@code{(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)} when
running Emacs in the Japanese language environment. It is a list of
coding system symbols (aliases of coding systems are also allowed, use
@kbd{M-x describe-coding-system} to make sure you are specifying correct
coding system names). For example, if you have configured Emacs
......@@ -880,8 +878,9 @@ used, of course.
@vindex mm-mime-mule-charset-alist
Things are slightly more complicated when running Emacs with @sc{mule}
support. In this case, a list of the @sc{mule} charsets used in the
part is obtained, and the @sc{mule} charsets are translated to @acronym{MIME}
charsets by consulting the variable @code{mm-mime-mule-charset-alist}.
part is obtained, and the @sc{mule} charsets are translated to
@acronym{MIME} charsets by consulting the table provided by Emacs itself
or the variable @code{mm-mime-mule-charset-alist} for XEmacs.
If this results in a single @acronym{MIME} charset, this is used to encode
the part. But if the resulting list of @acronym{MIME} charsets contains more
than one element, two things can happen: If it is possible to encode the
......@@ -1168,7 +1167,7 @@ in the subsequent sections.
This chapter describes the basic, ground-level functions for parsing and
handling. Covered here is parsing @code{From} lines, removing comments
from header lines, decoding encoded words, parsing date headers and so
on. High-level functionality is dealt with in the next chapter
on. High-level functionality is dealt with in the first chapter
(@pxref{Decoding and Viewing}).
@menu
......@@ -1504,7 +1503,7 @@ Take a time and return the number of days that represents.
@item safe-date-to-time
Take a date and return a time. If the date is not syntactically valid,
return a ``zero'' date.
return a ``zero'' time.
@item time-less-p
Take two times and say whether the first time is less (i. e., earlier)
......
......@@ -9406,7 +9406,7 @@ newsreaders and mailers that do not understand or use @acronym{MIME}, and
just send out messages without saying what character sets they use. To
help a bit with this, some local news hierarchies have policies that say
what character set is the default. For instance, the @samp{fj}
hierarchy uses @code{iso-2022-jp-2}.
hierarchy uses @code{iso-2022-jp}.
 
@vindex gnus-group-charset-alist
This knowledge is encoded in the @code{gnus-group-charset-alist}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment