diff options
| author | Miles Bader <miles@gnu.org> | 2005-06-01 05:07:06 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-06-01 05:07:06 +0000 |
| commit | e79f2f79f2219c9832b0624d63c00607be0dfbd0 (patch) | |
| tree | 1efb832f72164360c28cbcb53a6113e5fc560821 /lisp/gnus/html2text.el | |
| parent | c75adb74d13a931bad817aeb8173fcbd04f79b9f (diff) | |
| download | emacs-e79f2f79f2219c9832b0624d63c00607be0dfbd0.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-345
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 77-78)
- Update from CVS
2005-05-31 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (article-display-x-face): Replace
process-kill-without-query by gnus-set-process-query-on-exit-flag.
* lisp/gnus/gnus-group.el: Bind gnus-cache-active-hashtb when compiling.
* lisp/gnus/gnus-util.el (gnus-set-process-query-on-exit-flag): Alias to
set-process-query-on-exit-flag or process-kill-without-query.
* lisp/gnus/html2text.el (html2text-fix-paragraphs): Use `while - re-search'
loop instead of replace-regexp.
* lisp/gnus/imap.el (imap-ssl-open): Use set-process-query-on-exit-flag
instead of process-kill-without-query if it is available.
* lisp/gnus/mm-util.el (mm-insert-file-contents): Bind find-file-hook
instead of find-file-hooks if it is available.
* lisp/gnus/mml1991.el: Bind pgg-default-user-id when compiling.
* lisp/gnus/mml2015.el: Bind pgg-default-user-id when compiling.
* lisp/gnus/nndraft.el (nndraft-request-associate-buffer): Use
write-contents-functions instead of write-contents-hooks if it is
available.
* lisp/gnus/nnheader.el (nnheader-find-file-noselect): Bind find-file-hook
instead of find-file-hooks if it is available.
* lisp/gnus/nntp.el (nntp-open-connection): Replace
process-kill-without-query by gnus-set-process-query-on-exit-flag.
(nntp-open-ssl-stream): Ditto.
(nntp-open-tls-stream): Ditto.
* lisp/gnus/pgg.el: Don't bind itimer vars; don't autoload itimer functions.
(pgg-run-at-time-1): New macro.
(pgg-run-at-time): Use it.
* lisp/gnus/starttls.el (starttls-set-process-query-on-exit-flag): Alias to
set-process-query-on-exit-flag or process-kill-without-query.
(starttls-open-stream-gnutls): Use it instead of
process-kill-without-query.
(starttls-open-stream): Ditto.
2005-05-31 Simon Josefsson <jas@extundo.com>
* lisp/gnus/imap.el (imap-ssl-open): Use imap-process-connection-type,
instead of hard coding to nil.
2005-05-31 Kevin Greiner <kgreiner@xpediantsolutions.com>
* lisp/gnus/gnus-group.el (): Require gnus-sum and autoload functions to
resolve warnings when gnus-group.el compiled alone.
Diffstat (limited to 'lisp/gnus/html2text.el')
| -rw-r--r-- | lisp/gnus/html2text.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el index ef05af9bae6..81d8f5d8cc3 100644 --- a/lisp/gnus/html2text.el +++ b/lisp/gnus/html2text.el @@ -1,5 +1,5 @@ ;;; html2text.el --- a simple html to plain text converter -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Joakim Hove <hove@phys.ntnu.no> @@ -374,7 +374,8 @@ formatting, and then moved afterward.") fashion, quite close to pure guess-work. It does work in some cases though." (interactive) (goto-char (point-min)) - (replace-regexp "^<br>$" "") + (while (re-search-forward "^<br>$" nil t) + (delete-region (match-beginning 0) (match-end 0))) ;; Removing lonely <br> on a single line, if they are left intact we ;; dont have any paragraphs at all. (goto-char (point-min)) |