From: Miles Bader Date: Sat, 4 Nov 2006 13:22:12 +0000 (+0000) Subject: Merge from gnus--rel--5.10 X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=5bf5bb45c7c87041531d4434b07000d02b66755b;p=gnus Merge from gnus--rel--5.10 Patches applied: * emacs--devo--0 (patch 487, 489, 495, 497) - Merge from gnus--rel--5.10 - Update from CVS * gnus--rel--5.10 (patch 157-163) - Update from CVS - Merge from emacs--devo--0 2006-11-03 Juanma Barranquero * lisp/gnus-diary.el (gnus-diary-delay-format-function): * lisp/nndiary.el (nndiary-reminders): * lisp/nnsoup.el (nnsoup-always-save): Use "non-nil" in docstrings. 2006-10-29 Reiner Steib * lisp/mm-util.el (mm-codepage-iso-8859-list, mm-codepage-ibm-list): New variables. (mm-setup-codepage-iso-8859, mm-setup-codepage-ibm): New functions. (mm-charset-synonym-alist): Move some entries to mm-codepage-iso-8859-list. (mm-charset-synonym-alist, mm-charset-override-alist): Add iso-8859-8/windows-1255 and iso-8859-9/windows-1254. Revision: emacs@sv.gnu.org/gnus--devo--0--patch-232 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d999cad4..913f00213 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-11-03 Juanma Barranquero + + * gnus-diary.el (gnus-diary-delay-format-function): + * nndiary.el (nndiary-reminders): + * nnsoup.el (nnsoup-always-save): Use "non-nil" in docstrings. + 2006-11-01 Reiner Steib * gnus-art.el (article-hide-boring-headers): Fetch date from @@ -8,6 +14,16 @@ * html2text.el (html2text-format-tags): Avoid infloop on open tags. +2006-10-29 Reiner Steib + + * mm-util.el (mm-codepage-iso-8859-list, mm-codepage-ibm-list): + New variables. + (mm-setup-codepage-iso-8859, mm-setup-codepage-ibm): New functions. + (mm-charset-synonym-alist): Move some entries to + mm-codepage-iso-8859-list. + (mm-charset-synonym-alist, mm-charset-override-alist): Add + iso-8859-8/windows-1255 and iso-8859-9/windows-1254. + 2006-10-29 Katsumi Yamaoka * gnus-sum.el (gnus-set-mode-line): Quote % in group name. diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el index 4dc10501e..86a9cb12a 100644 --- a/lisp/gnus-diary.el +++ b/lisp/gnus-diary.el @@ -66,7 +66,7 @@ Please refer to `format-time-string' for information on possible values." (defcustom gnus-diary-delay-format-function 'gnus-diary-delay-format-english "*Function called to format a diary delay string. -It is passed two arguments. The first one is non nil if the delay is in +It is passed two arguments. The first one is non-nil if the delay is in the past. The second one is of the form ((NUM . UNIT) ...) where NUM is an integer and UNIT is one of 'year 'month 'week 'day 'hour or 'minute. It should return strings like \"In 2 months, 3 weeks\", \"3 hours, diff --git a/lisp/nndiary.el b/lisp/nndiary.el index 1fa968448..a05cc6bf6 100644 --- a/lisp/nndiary.el +++ b/lisp/nndiary.el @@ -144,7 +144,7 @@ not 'century, sorry). NOTE: the units of measure actually express dates, not durations: if you use 'week, messages will pop up on Sundays at 00:00 (or Mondays if -`nndiary-week-starts-on-monday' is non nil) and *not* 7 days before the +`nndiary-week-starts-on-monday' is non-nil) and *not* 7 days before the appointement, if you use 'month, messages will pop up on the first day of each months, at 00:00 and so on. diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el index 306834304..76b7c4213 100644 --- a/lisp/nnsoup.el +++ b/lisp/nnsoup.el @@ -75,7 +75,7 @@ The SOUP packet file name will be inserted at the %s.") "*Regular expression matching SOUP packets in `nnsoup-packet-directory'.") (defvoo nnsoup-always-save t - "If non nil commit the reply buffer on each message send. + "If non-nil commit the reply buffer on each message send. This is necessary if using message mode outside Gnus with nnsoup as a backend for the messages.")