diff options
| author | Miles Bader <miles@gnu.org> | 2004-10-26 22:33:43 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-10-26 22:33:43 +0000 |
| commit | 8671340582b5553c8810e66455f52cfd89076bdd (patch) | |
| tree | 2e359b008f78c570022ee8ee7a25cfe3be728ceb /lisp/gnus/gnus-start.el | |
| parent | f3df10330613251c2aee9d0bd60651039bd71dd4 (diff) | |
| download | emacs-8671340582b5553c8810e66455f52cfd89076bdd.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-640
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-59
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-60
Update from CVS
2004-10-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/html2text.el (html2text-buffer-head): Removed. Use `goto-char'
instead.
2004-10-24 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc): Fixed numeric
comparison on string.
Diffstat (limited to 'lisp/gnus/gnus-start.el')
| -rw-r--r-- | lisp/gnus/gnus-start.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index c6445b460ff..971124ba831 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -2225,7 +2225,8 @@ If FORCE is non-nil, the .newsrc file is read." (defun gnus-convert-old-newsrc () "Convert old newsrc formats into the current format, if needed." (let ((fcv (and gnus-newsrc-file-version - (gnus-continuum-version gnus-newsrc-file-version)))) + (gnus-continuum-version gnus-newsrc-file-version))) + (gcv (gnus-continuum-version))) (when fcv ;; A newsrc file was loaded. (let (prompt-displayed @@ -2259,7 +2260,7 @@ 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)) - (<= (caar converters) gnus-version)) + (<= (caar converters) gcv)) (let* ((converter-spec (pop converters)) (convert-to (nth 1 converter-spec)) (load-from (nth 2 converter-spec)) |