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

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.
parent f3df1033
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
......
......@@ -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))
......
......@@ -116,12 +116,6 @@ formatting, and then moved afterward.")
;; <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 @@ formatting, and then moved afterward.")
"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 @@ fashion, quite close to pure guess-work. It does work in some cases though."
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 @@ See the documentation for that variable."
(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 documentation for that variable."
"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 @@ See the documentation for that variable."
(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)
......
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