diff options
| author | Miles Bader <miles@gnu.org> | 2004-10-21 23:10:28 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-10-21 23:10:28 +0000 |
| commit | d5ddd795bdab373fe62ccfd099c270fd97da0964 (patch) | |
| tree | 1b17d9d413fdbdeaaa082831b7f5be042707f82c /lisp/gnus/gnus-start.el | |
| parent | 13376c78309524643382d9d3697a086fc495e861 (diff) | |
| download | emacs-d5ddd795bdab373fe62ccfd099c270fd97da0964.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-57
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-58
Update from CVS
2004-10-21 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Inhibit font-lock when
running the major-mode function.
2004-10-21 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc): Two of the converters
have been backported to 'Gnus v5.11' from 'No Gnus v0.2'. Added a
boolean check to not apply converters that apply to future
versions of gnus.
Diffstat (limited to 'lisp/gnus/gnus-start.el')
| -rw-r--r-- | lisp/gnus/gnus-start.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 67d86fef02a..c6445b460ff 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -2247,9 +2247,9 @@ If FORCE is non-nil, the .newsrc file is read." gnus-convert-old-ticks) ("Oort Gnus v0.08" "legacy-gnus-agent" gnus-agent-convert-to-compressed-agentview) - ("No Gnus v0.2" "legacy-gnus-agent" + ("Gnus v5.11" "legacy-gnus-agent" gnus-agent-unlist-expire-days) - ("No Gnus v0.2" "legacy-gnus-agent" + ("Gnus v5.11" "legacy-gnus-agent" gnus-agent-unhook-expire-days))) #'car-less-than-car))) ;; Skip converters older than the file version @@ -2258,7 +2258,8 @@ If FORCE is non-nil, the .newsrc file is read." ;; Perform converters to bring older version up to date. (when (and converters (< fcv (caar converters))) - (while (and converters (< fcv (caar converters))) + (while (and converters (< fcv (caar converters)) + (<= (caar converters) gnus-version)) (let* ((converter-spec (pop converters)) (convert-to (nth 1 converter-spec)) (load-from (nth 2 converter-spec)) |