projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(shr-put-color-1): Don't overwrite old colors.
[gnus]
/
lisp
/
html2text.el
diff --git
a/lisp/html2text.el
b/lisp/html2text.el
index
de9cf64
..
6411eb6
100644
(file)
--- a/
lisp/html2text.el
+++ b/
lisp/html2text.el
@@
-1,25
+1,23
@@
;;; html2text.el --- a simple html to plain text converter
;;; html2text.el --- a simple html to plain text converter
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006
, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
;; Author: Joakim Hove <hove@phys.ntnu.no>
;; This file is part of GNU Emacs.
;; Author: Joakim Hove <hove@phys.ntnu.no>
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-385,10
+383,10
@@
formatting, and then moved afterward.")
(setq refill-start (point))
(goto-char p2)
(re-search-backward ".+[^<][^b][^r][^>]$" refill-start t)
(setq refill-start (point))
(goto-char p2)
(re-search-backward ".+[^<][^b][^r][^>]$" refill-start t)
- (
next
-line 1)
+ (
forward
-line 1)
(end-of-line)
;; refill-stop should ideally be adjusted to
(end-of-line)
;; refill-stop should ideally be adjusted to
- ;; accomodate the "<br>" strings which are removed
+ ;; accom
m
odate the "<br>" strings which are removed
;; between refill-start and refill-stop. Can simply
;; be returned from my-replace-string
(setq refill-stop (+ (point)
;; between refill-start and refill-stop. Can simply
;; be returned from my-replace-string
(setq refill-stop (+ (point)
@@
-456,7
+454,9
@@
See the documentation for that variable."
(p3) (p4))
(search-backward "<" (point-min) t)
(setq p1 (point))
(p3) (p4))
(search-backward "<" (point-min) t)
(setq p1 (point))
- (search-forward (format "</%s>" tag) (point-max) t)
+ (unless (search-forward (format "</%s>" tag) (point-max) t)
+ (goto-char p2)
+ (insert (format "</%s>" tag)))
(setq p4 (point))
(search-backward "</" (point-min) t)
(setq p3 (point))
(setq p4 (point))
(search-backward "</" (point-min) t)
(setq p3 (point))
@@
-508,5
+508,5
@@
See the documentation for that variable."
;; </Interactive functions>
;;
(provide 'html2text)
;; </Interactive functions>
;;
(provide 'html2text)
-;;; arch-tag: e9e57b79-35d4-4de1-a647-e7e01fe56d1e
+
;;; html2text.el ends here
;;; html2text.el ends here