# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1098830023 0
# Node ID 6a65cb24e1be5b7c1eec0ebfeab70c0c8cebcc25
# Parent  395139acfd03ce77fa74ddeb0bdec9160e0e963c
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.

diff -r 395139acfd03 -r 6a65cb24e1be lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Oct 26 21:53:34 2004 +0000
+++ b/lisp/gnus/ChangeLog	Tue Oct 26 22:33:43 2004 +0000
@@ -1,3 +1,13 @@
+2004-10-25  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* html2text.el (html2text-buffer-head): Removed.  Use `goto-char'
+	instead.
+
+2004-10-24  Kevin Greiner  <kevin.greiner@compsol.cc>
+
+	* gnus-start.el (gnus-convert-old-newsrc): Fixed numeric
+	comparison on string.
+
 2004-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-view.el (mm-display-inline-fontify): Inhibit font-lock when
diff -r 395139acfd03 -r 6a65cb24e1be lisp/gnus/gnus-start.el
--- a/lisp/gnus/gnus-start.el	Tue Oct 26 21:53:34 2004 +0000
+++ b/lisp/gnus/gnus-start.el	Tue Oct 26 22:33:43 2004 +0000
@@ -2225,7 +2225,8 @@
 (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 @@
         ;; 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))
diff -r 395139acfd03 -r 6a65cb24e1be lisp/gnus/html2text.el
--- a/lisp/gnus/html2text.el	Tue Oct 26 21:53:34 2004 +0000
+++ b/lisp/gnus/html2text.el	Tue Oct 26 22:33:43 2004 +0000
@@ -116,12 +116,6 @@
 ;; <Utility functions>
 ;;
 
-(defun html2text-buffer-head ()
-  (if (string= mode-name "Article")
-      (beginning-of-buffer)
-    (beginning-of-buffer)
-    )
-  )
 
 (defun html2text-replace-string (from-string to-string p1 p2)
   (goto-char p1)
@@ -432,11 +426,11 @@
   "This _tries_ to fix up the paragraphs - this is done in quite a ad-hook
 fashion, quite close to pure guess-work. It does work in some cases though."
   (interactive)
-  (html2text-buffer-head)
+  (goto-char (point-min))
   (replace-regexp "^<br>$" "")
   ;; Removing lonely <br> on a single line, if they are left intact we
   ;; dont have any paragraphs at all.
-  (html2text-buffer-head)
+  (goto-char (point-min))
   (while (not (eobp))
     (let ((p1 (point)))
       (forward-paragraph 1)
@@ -462,7 +456,7 @@
 See the documentation for that variable."
   (interactive)
   (dolist (tag tag-list)
-    (html2text-buffer-head)
+    (goto-char (point-min))
     (while (re-search-forward (format "\\(</?%s[^>]*>\\)" tag) (point-max) t)
       (delete-region (match-beginning 0) (match-end 0)))))
 
@@ -472,7 +466,7 @@
   (dolist (tag-and-function html2text-format-tag-list)
     (let ((tag      (car tag-and-function))
 	  (function (cdr tag-and-function)))
-      (html2text-buffer-head)
+      (goto-char (point-min))
       (while (re-search-forward (format "\\(<%s\\( [^>]*\\)?>\\)" tag)
 				(point-max) t)
 	(let ((p1)
@@ -497,7 +491,7 @@
   "See the variable \"html2text-replace-list\" for documentation"
   (interactive)
   (dolist (e html2text-replace-list)
-    (html2text-buffer-head)
+    (goto-char (point-min))
     (let ((old-string (car e))
 	  (new-string (cdr e)))
       (html2text-replace-string old-string new-string (point-min) (point-max))
@@ -511,7 +505,7 @@
   (dolist (tag-and-function html2text-format-single-element-list)
     (let ((tag      (car tag-and-function))
 	  (function (cdr tag-and-function)))
-      (html2text-buffer-head)
+      (goto-char (point-min))
       (while (re-search-forward (format "\\(<%s\\( [^>]*\\)?>\\)" tag)
 				(point-max) t)
 	(let ((p1)