Commit e2642250 authored by Miles Bader's avatar Miles Bader

Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
   Update from CVS

2004-11-01  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-msg.el (gnus-summary-resend-default-address): Add :version.

   * lisp/gnus/tls.el (tls-process-connection-type, tls-success)
   (tls-certtool-program): Add :version.

   * lisp/gnus/starttls.el (starttls-gnutls-program, starttls-use-gnutls)
   (starttls-extra-arguments, starttls-process-connection-type)
   (starttls-connect, starttls-failure, starttls-success):

   * lisp/gnus/spam-stat.el (spam-stat): Add :version.

   * lisp/gnus/sieve.el (sieve): Add :version.

   * lisp/gnus/sha1.el (sha1): Added :version.
   (sha1-use-external): Removed redundant version.

   * lisp/gnus/nnmail.el (nnmail-split-fancy-with-parent-ignore-groups)
   (nnmail-cache-ignore-groups, nnmail-spool-hook)
   (nnmail-split-fancy-match-partial-words)
   (nnmail-split-lowercase-expanded):

   * lisp/gnus/nndiary.el (nndiary): Add :version.

   * lisp/gnus/mml2015.el (mml2015-unabbrev-trust-alist): Add :version.

   * lisp/gnus/mml-sec.el (mml-default-sign-method)
   (mml-default-encrypt-method, mml-signencrypt-style-alist): Add
   :version.

   * lisp/gnus/mm-uu.el (mm-uu-diff-groups-regexp): Add :version.

   * lisp/gnus/mm-url.el (mm-url-use-external, mm-url-program)
   (mm-url-arguments): Add :version.

   * lisp/gnus/mm-decode.el (mm-inline-text-html-with-w3m-keymap)
   (mm-attachment-file-modes, mm-decrypt-option)
   (mm-w3m-safe-url-regexp): Add :version.

   * lisp/gnus/message.el (message-cite-prefix-regexp)
   (message-sendmail-envelope-from, message-minibuffer-local-map)
   (message-user-fqdn, message-completion-alist): Add :version.

   * lisp/gnus/gnus-win.el (gnus-configure-windows-hook)
   (gnus-use-frames-on-any-display): Add :version.

   * lisp/gnus/gnus-art.el (gnus-article-address-banner-alist)
   (gnus-treat-unsplit-urls, gnus-treat-unfold-headers)
   (gnus-treat-from-picon, gnus-treat-mail-picon)
   (gnus-treat-x-pgp-sig): Add :version.

   * lisp/gnus/gnus-sum.el (gnus-spam-mark, gnus-recent-mark)
   (gnus-undownloaded-mark, gnus-summary-article-move-hook)
   (gnus-summary-article-delete-hook)
   (gnus-summary-display-while-building): Add :version.

   * lisp/gnus/gnus-start.el (gnus-subscribe-newsgroup-hooks)
   (gnus-get-top-new-news-hook):Add :version.

   * lisp/gnus/gnus-srvr.el (gnus-server-agent-face, gnus-server-opened-face)
   (gnus-server-closed-face, gnus-server-denied-face): Add :version.

   * lisp/gnus/gnus-registry.el (gnus-registry): Add :version.

   * lisp/gnus/gnus-spec.el (gnus-use-correct-string-widths)
   (gnus-make-format-preserve-properties): Add :version.

   * lisp/gnus/gnus.el (gnus-group-charter-alist)
   (gnus-group-fetch-control-use-browse-url)
   (gnus-install-group-spam-parameters): Add :version.

   * lisp/gnus/gnus-diary.el (gnus-diary): Add :version.

   * lisp/gnus/gnus-delay.el (gnus-delay): Add :version.

   * lisp/gnus/gnus-cite.el (gnus-cite-unsightly-citation-regexp)
   (gnus-cite-ignore-quoted-from, gnus-cite-attribution-face)
   (gnus-cite-blank-line-after-header, gnus-article-boring-faces):
   Add :version.

   * lisp/gnus/gnus-agent.el (gnus-agent-max-fetch-size)
   (gnus-agent-enable-expiration, gnus-agent-queue-mail)
   (gnus-agent-prompt-send-queue): Add :version.

   * lisp/gnus/deuglify.el (gnus-outlook-deuglify): Add :version.

   * lisp/gnus/html2text.el: Beautify code. Improve doc strings. Some checkdoc
   cleanup.
   (html2text-get-attr, html2text-fix-paragraph): Simplify code.
   (html2text-format-tag-list): Added "strong" and "em".  From
   "Alfred M. Szmidt" <ams@kemisten.nu> (tiny change).
parent 1b25dccd
2004-11-01 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-msg.el (gnus-summary-resend-default-address): Add :version.
* tls.el (tls-process-connection-type, tls-success)
(tls-certtool-program): Add :version.
* starttls.el (starttls-gnutls-program, starttls-use-gnutls)
(starttls-extra-arguments, starttls-process-connection-type)
(starttls-connect, starttls-failure, starttls-success):
* spam-stat.el (spam-stat): Add :version.
* sieve.el (sieve): Add :version.
* sha1.el (sha1): Added :version.
(sha1-use-external): Removed redundant version.
* nnmail.el (nnmail-split-fancy-with-parent-ignore-groups)
(nnmail-cache-ignore-groups, nnmail-spool-hook)
(nnmail-split-fancy-match-partial-words)
(nnmail-split-lowercase-expanded):
* nndiary.el (nndiary): Add :version.
* mml2015.el (mml2015-unabbrev-trust-alist): Add :version.
* mml-sec.el (mml-default-sign-method)
(mml-default-encrypt-method, mml-signencrypt-style-alist): Add
:version.
* mm-uu.el (mm-uu-diff-groups-regexp): Add :version.
* mm-url.el (mm-url-use-external, mm-url-program)
(mm-url-arguments): Add :version.
* mm-decode.el (mm-inline-text-html-with-w3m-keymap)
(mm-attachment-file-modes, mm-decrypt-option)
(mm-w3m-safe-url-regexp): Add :version.
* message.el (message-cite-prefix-regexp)
(message-sendmail-envelope-from, message-minibuffer-local-map)
(message-user-fqdn, message-completion-alist): Add :version.
* gnus-win.el (gnus-configure-windows-hook)
(gnus-use-frames-on-any-display): Add :version.
* gnus-art.el (gnus-article-address-banner-alist)
(gnus-treat-unsplit-urls, gnus-treat-unfold-headers)
(gnus-treat-from-picon, gnus-treat-mail-picon)
(gnus-treat-x-pgp-sig): Add :version.
* gnus-sum.el (gnus-spam-mark, gnus-recent-mark)
(gnus-undownloaded-mark, gnus-summary-article-move-hook)
(gnus-summary-article-delete-hook)
(gnus-summary-display-while-building): Add :version.
* gnus-start.el (gnus-subscribe-newsgroup-hooks)
(gnus-get-top-new-news-hook):Add :version.
* gnus-srvr.el (gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face): Add :version.
* gnus-registry.el (gnus-registry): Add :version.
* gnus-spec.el (gnus-use-correct-string-widths)
(gnus-make-format-preserve-properties): Add :version.
* gnus.el (gnus-group-charter-alist)
(gnus-group-fetch-control-use-browse-url)
(gnus-install-group-spam-parameters): Add :version.
* gnus-diary.el (gnus-diary): Add :version.
* gnus-delay.el (gnus-delay): Add :version.
* gnus-cite.el (gnus-cite-unsightly-citation-regexp)
(gnus-cite-ignore-quoted-from, gnus-cite-attribution-face)
(gnus-cite-blank-line-after-header, gnus-article-boring-faces):
Add :version.
* gnus-agent.el (gnus-agent-max-fetch-size)
(gnus-agent-enable-expiration, gnus-agent-queue-mail)
(gnus-agent-prompt-send-queue): Add :version.
* deuglify.el (gnus-outlook-deuglify): Add :version.
* html2text.el: Beautify code. Improve doc strings. Some checkdoc
cleanup.
(html2text-get-attr, html2text-fix-paragraph): Simplify code.
(html2text-format-tag-list): Added "strong" and "em". From
"Alfred M. Szmidt" <ams@kemisten.nu> (tiny change).
2004-10-29 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-msg.el (gnus-configure-posting-styles): Work with empty
......
......@@ -230,7 +230,8 @@
;;; User Customizable Variables:
(defgroup gnus-outlook-deuglify nil
"Deuglify articles generated by broken user agents like MS Outlook (Express).")
"Deuglify articles generated by broken user agents like MS Outlook (Express)."
:version "21.4")
;;;###autoload
(defcustom gnus-outlook-deuglify-unwrap-min 45
......
......@@ -160,6 +160,7 @@ read articles as they would just be downloaded again."
"Chunk size for `gnus-agent-fetch-session'.
The function will split its article fetches into chunks smaller than
this limit."
:version "21.4"
:group 'gnus-agent
:type 'integer)
......@@ -170,6 +171,7 @@ contents from a group's local storage. This value may be overridden
to disable expiration in specific categories, topics, and groups. Of
course, you could change gnus-agent-enable-expiration to DISABLE then
enable expiration per categories, topics, and groups."
:version "21.4"
:group 'gnus-agent
:type '(radio (const :format "Enable " ENABLE)
(const :format "Disable " DISABLE)))
......@@ -195,6 +197,7 @@ See Info node `(gnus)Server Buffer'."
"Whether and when outgoing mail should be queued by the agent.
When `always', always queue outgoing mail. When nil, never
queue. Otherwise, queue if and only if unplugged."
:version "21.4"
:group 'gnus-agent
:type '(radio (const :format "Always" always)
(const :format "Never" nil)
......@@ -203,6 +206,7 @@ queue. Otherwise, queue if and only if unplugged."
(defcustom gnus-agent-prompt-send-queue nil
"If non-nil, `gnus-group-send-queue' will prompt if called when
unplugged."
:version "21.4"
:group 'gnus-agent
:type 'boolean)
......
......@@ -318,6 +318,7 @@ advertisements. For example:
(symbol :tag "Item in `gnus-article-banner-alist'" none)
regexp
(const :tag "None" nil))))
:version "21.4"
:group 'gnus-article-washing)
(defcustom gnus-emphasis-alist
......@@ -920,6 +921,7 @@ See Info node `(gnus)Customizing Articles' for details."
"Remove newlines from within URLs.
Valid values are nil, t, `head', `last', an integer or a predicate.
See Info node `(gnus)Customizing Articles' for details."
:version "21.4"
:group 'gnus-article-treat
:link '(custom-manual "(gnus)Customizing Articles")
:type gnus-article-treat-custom)
......@@ -1124,6 +1126,7 @@ See Info node `(gnus)Customizing Articles' for details."
"Unfold folded header lines.
Valid values are nil, t, `head', `last', an integer or a predicate.
See Info node `(gnus)Customizing Articles' for details."
:version "21.4"
:group 'gnus-article-treat
:link '(custom-manual "(gnus)Customizing Articles")
:type gnus-article-treat-custom)
......@@ -1238,6 +1241,7 @@ See Info node `(gnus)Customizing Articles' and Info node
Valid values are nil, t, `head', `last', an integer or a predicate.
See Info node `(gnus)Customizing Articles' and Info node
`(gnus)Picons' for details."
:version "21.4"
:group 'gnus-article-treat
:group 'gnus-picon
:link '(custom-manual "(gnus)Customizing Articles")
......@@ -1253,6 +1257,7 @@ See Info node `(gnus)Customizing Articles' and Info node
Valid values are nil, t, `head', `last', an integer or a predicate.
See Info node `(gnus)Customizing Articles' and Info node
`(gnus)Picons' for details."
:version "21.4"
:group 'gnus-article-treat
:group 'gnus-picon
:link '(custom-manual "(gnus)Customizing Articles")
......@@ -1338,6 +1343,7 @@ See Info node `(gnus)Customizing Articles' for details."
To automatically treat X-PGP-Sig, set it to head.
Valid values are nil, t, `head', `last', an integer or a predicate.
See Info node `(gnus)Customizing Articles' for details."
:version "21.4"
:group 'gnus-article-treat
:group 'mime-security
:link '(custom-manual "(gnus)Customizing Articles")
......
......@@ -124,6 +124,7 @@ The text matching the first grouping will be used as a button."
(defcustom gnus-cite-unsightly-citation-regexp
"^-----Original Message-----\nFrom: \\(.+\n\\)+\n"
"Regexp matching Microsoft-type rest-of-message citations."
:version "21.4"
:group 'gnus-cite
:type 'regexp)
......@@ -131,6 +132,7 @@ The text matching the first grouping will be used as a button."
"Non-nil means don't regard lines beginning with \">From \" as cited text.
Those lines may have been quoted by MTAs in order not to mix up with
the envelope From line."
:version "21.4"
:group 'gnus-cite
:type 'boolean)
......@@ -141,6 +143,7 @@ the envelope From line."
(defcustom gnus-cite-attribution-face 'gnus-cite-attribution-face
"Face used for attribution lines.
It is merged with the face for the cited text belonging to the attribution."
:version "21.4"
:group 'gnus-cite
:type 'face)
......@@ -278,7 +281,6 @@ This should make it easier to see who wrote what."
(defcustom gnus-cite-blank-line-after-header t
"If non-nil, put a blank line between the citation header and the button."
:version "21.4"
:group 'gnus-cite
:type 'boolean)
......@@ -290,7 +292,6 @@ This should make it easier to see who wrote what."
If an article has more pages below the one you are looking at, but
nothing on those pages is a word of at least three letters that is not
in a boring face, then the pages will be skipped."
:version "21.4"
:type '(repeat face)
:group 'gnus-article-hiding)
......
......@@ -41,6 +41,7 @@
;;;###autoload
(defgroup gnus-delay nil
"Arrange for sending postings later."
:version "21.4"
:group 'gnus)
(defcustom gnus-delay-group "delayed"
......
......@@ -102,7 +102,8 @@
(require 'gnus-art)
(defgroup gnus-diary nil
"Utilities on top of the nndiary backend for Gnus.")
"Utilities on top of the nndiary backend for Gnus."
:version "21.4")
(defcustom gnus-diary-summary-line-format "%U%R%z %uD: %(%s%) (%ud)\n"
"*Summary line format for nndiary groups."
......
......@@ -281,6 +281,7 @@ If nil, Gnus will never ask for confirmation if replying to mail."
"If non-nil, Gnus tries to suggest a default address to resend to.
If nil, the address field will always be empty after invoking
`gnus-summary-resend-message'."
:version "21.4"
:group 'gnus-message
:type 'boolean)
......
......@@ -66,6 +66,7 @@
(defgroup gnus-registry nil
"The Gnus registry."
:version "21.4"
:group 'gnus)
(defvar gnus-registry-hashtb nil
......
......@@ -32,12 +32,14 @@
(defcustom gnus-use-correct-string-widths (featurep 'xemacs)
"*If non-nil, use correct functions for dealing with wide characters."
:version "21.4"
:group 'gnus-format
:type 'boolean)
(defcustom gnus-make-format-preserve-properties (featurep 'xemacs)
"*If non-nil, use a replacement `format' function which preserves
text properties. This is only needed on XEmacs, as FSF Emacs does this anyway."
:version "21.4"
:group 'gnus-format
:type 'boolean)
......
......@@ -205,21 +205,25 @@ If nil, a faster, but more primitive, buffer is used instead."
(defcustom gnus-server-agent-face 'gnus-server-agent-face
"Face name to use on AGENTIZED servers."
:version "21.4"
:group 'gnus-server-visual
:type 'face)
(defcustom gnus-server-opened-face 'gnus-server-opened-face
"Face name to use on OPENED servers."
:version "21.4"
:group 'gnus-server-visual
:type 'face)
(defcustom gnus-server-closed-face 'gnus-server-closed-face
"Face name to use on CLOSED servers."
:version "21.4"
:group 'gnus-server-visual
:type 'face)
(defcustom gnus-server-denied-face 'gnus-server-denied-face
"Face name to use on DENIED servers."
:version "21.4"
:group 'gnus-server-visual
:type 'face)
......
......@@ -299,6 +299,7 @@ claim them."
(defcustom gnus-subscribe-newsgroup-hooks nil
"*Hooks run after you subscribe to a new group.
The hooks will be called with new group's name as argument."
:version "21.4"
:group 'gnus-group-new
:type 'hook)
......@@ -405,6 +406,7 @@ This hook is called as the first thing when Gnus is started."
(defcustom gnus-get-top-new-news-hook nil
"A hook run just before Gnus checks for new news globally."
:version "21.4"
:group 'gnus-group-new
:type 'hook)
......
......@@ -469,6 +469,7 @@ this variable specifies group names."
(defcustom gnus-spam-mark ?$
"*Mark used for spam articles."
:version "21.4"
:group 'gnus-summary-marks
:type 'character)
......@@ -505,6 +506,7 @@ this variable specifies group names."
(defcustom gnus-recent-mark ?N
"*Mark used for articles that are recent."
:version "21.4"
:group 'gnus-summary-marks
:type 'character)
......@@ -552,6 +554,7 @@ this variable specifies group names."
(defcustom gnus-undownloaded-mark ?-
"*Mark used for articles that weren't downloaded."
:version "21.4"
:group 'gnus-summary-marks
:type 'character)
......@@ -890,16 +893,19 @@ automatically when it is selected."
(defcustom gnus-summary-article-move-hook nil
"*A hook called after an article is moved, copied, respooled, or crossposted."
:version "21.4"
:group 'gnus-summary
:type 'hook)
(defcustom gnus-summary-article-delete-hook nil
"*A hook called after an article is deleted."
:version "21.4"
:group 'gnus-summary
:type 'hook)
(defcustom gnus-summary-article-expire-hook nil
"*A hook called after an article is expired."
:version "21.4"
:group 'gnus-summary
:type 'hook)
......@@ -9178,6 +9184,7 @@ If nil, use to the current newsgroup method."
"If non-nil, show and update the summary buffer as it's being built.
If the value is t, update the buffer after every line is inserted. If
the value is an integer (N), update the display every N lines."
:version "21.4"
:group 'gnus-thread
:type '(choice (const :tag "off" nil)
number
......
......@@ -62,6 +62,7 @@
"*If non-nil, frames on all displays will be considered useable by Gnus.
When nil, only frames on the same display as the selected frame will be
used to display Gnus windows."
:version "21.4"
:group 'gnus-windows
:type 'boolean)
......@@ -198,6 +199,7 @@ See the Gnus manual for an explanation of the syntax used.")
(defcustom gnus-configure-windows-hook nil
"*A hook called when configuring windows."
:version "21.4"
:group 'gnus-windows
:type 'hook)
......
......@@ -1314,6 +1314,7 @@ If the default site is too slow, try one of these:
(gnus-replace-in-string name "\\." "-") "-charter.html")))
"*An alist of (HIERARCHY . FORM) pairs used to construct the URL of a charter.
When FORM is evaluated `name' is bound to the name of the group."
:version "21.4"
:group 'gnus-group-various
:type '(repeat (cons (string :tag "Hierarchy") (sexp :tag "Form"))))
......@@ -1321,6 +1322,7 @@ When FORM is evaluated `name' is bound to the name of the group."
"*Non-nil means that control messages are displayed using `browse-url'.
Otherwise they are fetched with ange-ftp and displayed in an ephemeral
group."
:version "21.4"
:group 'gnus-group-various
:type 'boolean)
......@@ -1788,6 +1790,7 @@ total number of articles in the group.")
(defcustom gnus-install-group-spam-parameters t
"*Disable the group parameters for spam detection.
Enable if `G c' in XEmacs is giving you trouble, and make sure to submit a bug report."
:version "21.4"
:type 'boolean
:group 'gnus-start)
......
......@@ -24,11 +24,11 @@
;; These functions provide a simple way to wash/clean html infected
;; mails. Definitely do not work in all cases, but some improvement
;; in readability is generally obtained. Formatting is only done in
;; in readability is generally obtained. Formatting is only done in
;; the buffer, so the next time you enter the article it will be
;; "re-htmlized".
;;
;; The main function is "html2text"
;; The main function is `html2text'.
;;; Code:
......@@ -47,9 +47,9 @@
"The map of entity to text.
This is an alist were each element is a dotted pair consisting of an
old string, and a replacement string. This replacement is done by the
function \"html2text-substitute\" which basically performs a
replace-string operation for every element in the list. This is
old string, and a replacement string. This replacement is done by the
function `html2text-substitute' which basically performs a
`replace-string' operation for every element in the list. This is
completely verbatim - without any use of REGEXP.")
(defvar html2text-remove-tag-list
......@@ -57,11 +57,11 @@ completely verbatim - without any use of REGEXP.")
"A list of removable tags.
This is a list of tags which should be removed, without any
formatting. Observe that if you the tags in the list are presented
*without* any \"<\" or \">\". All occurences of a tag appearing in
this list are removed, irrespective of whether it is a closing or
opening tag, or if the tag has additional attributes. The actual
deletion is done by the function \"html2text-remove-tags\".
formatting. Note that tags in the list are presented *without*
any \"<\" or \">\". All occurences of a tag appearing in this
list are removed, irrespective of whether it is a closing or
opening tag, or if the tag has additional attributes. The
deletion is done by the function `html2text-remove-tags'.
For instance the text:
......@@ -75,8 +75,10 @@ If this list contains the element \"font\".")
(defvar html2text-format-tag-list
'(("b" . html2text-clean-bold)
("strong" . html2text-clean-bold)
("u" . html2text-clean-underline)
("i" . html2text-clean-italic)
("em" . html2text-clean-italic)
("blockquote" . html2text-clean-blockquote)
("a" . html2text-clean-anchor)
("ul" . html2text-clean-ul)
......@@ -86,7 +88,7 @@ If this list contains the element \"font\".")
"An alist of tags and processing functions.
This is an alist where each dotted pair consists of a tag, and then
the name of a function to be called when this tag is found. The
the name of a function to be called when this tag is found. The
function is called with the arguments p1, p2, p3 and p4. These are
demontrated below:
......@@ -117,17 +119,15 @@ formatting, and then moved afterward.")
;;
(defun html2text-replace-string (from-string to-string p1 p2)
(goto-char p1)
(defun html2text-replace-string (from-string to-string min max)
"Replace FROM-STRING with TO-STRING in region from MIN to MAX."
(goto-char min)
(let ((delta (- (string-width to-string) (string-width from-string)))
(change 0))
(while (search-forward from-string p2 t)
(while (search-forward from-string max t)
(replace-match to-string)
(setq change (+ change delta))
)
change
)
)
(setq change (+ change delta)))
change))
;;
;; </Utility functions>
......@@ -140,9 +140,9 @@ formatting, and then moved afterward.")
;; <Functions related to attributes> i.e. <font size=+3>
;;
(defun html2text-attr-value (attr-list attr)
(nth 1 (assoc attr attr-list))
)
(defun html2text-attr-value (list attribute)
"Get value of ATTRIBUTE from LIST."
(nth 1 (assoc attribute list)))
(defun html2text-get-attr (p1 p2 tag)
(goto-char p1)
......@@ -161,14 +161,10 @@ formatting, and then moved afterward.")
((string-match "[^ ]=[^ ]" prev)
(let ((attr (nth 0 (split-string prev "=")))
(value (nth 1 (split-string prev "="))))
(setq attr-list (cons (list attr value) attr-list))
)
)
(setq attr-list (cons (list attr value) attr-list))))
;; size= 3
((string-match "[^ ]=\\'" prev)
(setq attr-list (cons (list (substring prev 0 -1) this) attr-list))
)
)
(setq attr-list (cons (list (substring prev 0 -1) this) attr-list))))
(while (< index (length tmp-list))
(cond
......@@ -176,29 +172,20 @@ formatting, and then moved afterward.")
((string-match "[^ ]=[^ ]" this)
(let ((attr (nth 0 (split-string this "=")))
(value (nth 1 (split-string this "="))))
(setq attr-list (cons (list attr value) attr-list))
)
)
(setq attr-list (cons (list attr value) attr-list))))
;; size =3
((string-match "\\`=[^ ]" this)
(setq attr-list (cons (list prev (substring this 1)) attr-list)))
;; size= 3
((string-match "[^ ]=\\'" this)
(setq attr-list (cons (list (substring this 0 -1) next) attr-list))
)
(setq attr-list (cons (list (substring this 0 -1) next) attr-list)))
;; size = 3
((string= "=" this)
(setq attr-list (cons (list prev next) attr-list))
)
)
(setq attr-list (cons (list prev next) attr-list))))
(setq index (1+ index))
(setq prev this)
(setq this next)
(setq next (nth (1+ index) tmp-list))
)
(setq next (nth (1+ index) tmp-list)))
;;
;; Tags with no accompanying "=" i.e. value=nil
;;
......@@ -207,41 +194,25 @@ formatting, and then moved afterward.")
(setq next (nth 2 tmp-list))
(setq index 1)
(if (not (string-match "=" prev))
(progn
(if (not (string= (substring this 0 1) "="))
(setq attr-list (cons (list prev nil) attr-list))
)
)
)
(when (and (not (string-match "=" prev))
(not (string= (substring this 0 1) "=")))
(setq attr-list (cons (list prev nil) attr-list)))
(while (< index (1- (length tmp-list)))
(if (not (string-match "=" this))
(if (not (or (string= (substring next 0 1) "=")
(string= (substring prev -1) "=")))
(setq attr-list (cons (list this nil) attr-list))
)
)
(when (and (not (string-match "=" this))
(not (or (string= (substring next 0 1) "=")
(string= (substring prev -1) "="))))
(setq attr-list (cons (list this nil) attr-list)))
(setq index (1+ index))
(setq prev this)
(setq this next)
(setq next (nth (1+ index) tmp-list))
)
(if this
(progn
(if (not (string-match "=" this))
(progn
(if (not (string= (substring prev -1) "="))
(setq attr-list (cons (list this nil) attr-list))
)
)
)
)
)
attr-list ;; return - value
)
)
(setq next (nth (1+ index) tmp-list)))
(when (and this
(not (string-match "=" this))
(not (string= (substring prev -1) "=")))
(setq attr-list (cons (list this nil) attr-list)))
;; return - value
attr-list))
;;
;; </Functions related to attributes>
......@@ -266,10 +237,7 @@ formatting, and then moved afterward.")
(cond
((string= list-type "ul") (insert " o "))
((string= list-type "ol") (insert (format " %s: " item-nr)))
(t (insert " x ")))
)
)
)
(t (insert " x "))))))
(defun html2text-clean-dtdd (p1 p2)
(goto-char p1)
......@@ -308,60 +276,50 @@ formatting, and then moved afterward.")
(html2text-delete-single-tag p1 p2)
(goto-char p1)
(newline 1)