2004-09-04 13:13:48 +00:00
|
|
|
|
;;; deuglify.el --- deuglify broken Outlook (Express) articles
|
|
|
|
|
|
|
2008-01-07 01:26:07 +00:00
|
|
|
|
;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
2006-12-17 06:50:19 +00:00
|
|
|
|
;; Free Software Foundation, Inc.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
|
;; Author: Raymond Scholz <rscholz@zonix.de>
|
|
|
|
|
|
;; Thomas Steffen (unwrapping algorithm,
|
|
|
|
|
|
;; based on an idea of Stefan Monnier)
|
|
|
|
|
|
;; Keywords: mail, news
|
|
|
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
2008-05-06 03:56:49 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:56:49 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
|
;; (at your option) any later version.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2008-05-06 03:56:49 +00:00
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:56:49 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
|
|
;; This file enables Gnus to repair broken citations produced by
|
|
|
|
|
|
;; common user agents like MS Outlook (Express). It may repair
|
|
|
|
|
|
;; articles of other user agents too.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Outlook sometimes wraps cited lines before sending a message as
|
|
|
|
|
|
;; seen in this example:
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Example #1
|
|
|
|
|
|
;; ----------
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; John Doe wrote:
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; > This sentence no verb. This sentence no verb. This sentence
|
|
|
|
|
|
;; no
|
|
|
|
|
|
;; > verb. This sentence no verb. This sentence no verb. This
|
|
|
|
|
|
;; > sentence no verb.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; The function `gnus-article-outlook-unwrap-lines' tries to recognize those
|
|
|
|
|
|
;; erroneously wrapped lines and will unwrap them. I.e. putting the
|
|
|
|
|
|
;; wrapped parts ("no" in this example) back where they belong (at the
|
|
|
|
|
|
;; end of the cited line above).
|
|
|
|
|
|
;;
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Note that some people not only use broken user agents but also
|
|
|
|
|
|
;; practice a bad citation style by omitting blank lines between the
|
|
|
|
|
|
;; cited text and their own text.
|
|
|
|
|
|
;:
|
|
|
|
|
|
;; Example #2
|
|
|
|
|
|
;; ----------
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; John Doe wrote:
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; > This sentence no verb. This sentence no verb. This sentence no
|
|
|
|
|
|
;; You forgot in all your sentences.
|
|
|
|
|
|
;; > verb. This sentence no verb. This sentence no verb. This
|
|
|
|
|
|
;; > sentence no verb.
|
|
|
|
|
|
;;
|
2008-02-05 12:07:11 +00:00
|
|
|
|
;; Unwrapping "You forgot in all your sentences." would be invalid as
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; this part wasn't intended to be cited text.
|
|
|
|
|
|
;; `gnus-article-outlook-unwrap-lines' will only unwrap lines if the resulting
|
|
|
|
|
|
;; citation line will be of a certain maximum length. You can control
|
|
|
|
|
|
;; this by adjusting `gnus-outlook-deuglify-unwrap-max'. Also
|
|
|
|
|
|
;; unwrapping will only be done if the line above the (possibly)
|
|
|
|
|
|
;; wrapped line has a minimum length of `gnus-outlook-deuglify-unwrap-min'.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Furthermore no unwrapping will be undertaken if the last character
|
|
|
|
|
|
;; is one of the chars specified in
|
|
|
|
|
|
;; `gnus-outlook-deuglify-unwrap-stop-chars'. Setting this to ".?!"
|
|
|
|
|
|
;; inhibits unwrapping if the cited line ends with a full stop,
|
|
|
|
|
|
;; question mark or exclamation mark. Note that this variable
|
|
|
|
|
|
;; defaults to `nil', triggering a few false positives but generally
|
|
|
|
|
|
;; giving you better results.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Unwrapping works on every level of citation. Thus you will be able
|
|
|
|
|
|
;; repair broken citations of broken user agents citing broken
|
|
|
|
|
|
;; citations of broken user agents citing broken citations...
|
|
|
|
|
|
;;
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Citations are commonly introduced with an attribution line
|
|
|
|
|
|
;; indicating who wrote the cited text. Outlook adds superfluous
|
|
|
|
|
|
;; information that can be found in the header of the message to this
|
|
|
|
|
|
;; line and often wraps it.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; If that weren't enough, lots of people write their own text above
|
|
|
|
|
|
;; the cited text and cite the complete original article below.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Example #3
|
|
|
|
|
|
;; ----------
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Hey, John. There's no in all your sentences!
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; John Doe <john.doe@some.domain> wrote in message
|
|
|
|
|
|
;; news:a87usw8$dklsssa$2@some.news.server...
|
|
|
|
|
|
;; > This sentence no verb. This sentence no verb. This sentence
|
|
|
|
|
|
;; no
|
|
|
|
|
|
;; > verb. This sentence no verb. This sentence no verb. This
|
|
|
|
|
|
;; > sentence no verb.
|
|
|
|
|
|
;; >
|
|
|
|
|
|
;; > Bye, John
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Repairing the attribution line will be done by function
|
|
|
|
|
|
;; `gnus-article-outlook-repair-attribution which calls other function that
|
|
|
|
|
|
;; try to recognize and repair broken attribution lines. See variable
|
|
|
|
|
|
;; `gnus-outlook-deuglify-attrib-cut-regexp' for stuff that should be
|
|
|
|
|
|
;; cut off from the beginning of an attribution line and variable
|
|
|
|
|
|
;; `gnus-outlook-deuglify-attrib-verb-regexp' for the verbs that are
|
|
|
|
|
|
;; required to be found in an attribution line. These function return
|
|
|
|
|
|
;; the point where the repaired attribution line starts.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Rearranging the article so that the cited text appears above the
|
|
|
|
|
|
;; new text will be done by function
|
|
|
|
|
|
;; `gnus-article-outlook-rearrange-citation'. This function calls
|
|
|
|
|
|
;; `gnus-article-outlook-repair-attribution to find and repair an attribution
|
|
|
|
|
|
;; line.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Well, and that's what the message will look like after applying
|
|
|
|
|
|
;; deuglification:
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Example #3 (deuglified)
|
|
|
|
|
|
;; -----------------------
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; John Doe <john.doe@some.domain> wrote:
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; > This sentence no verb. This sentence no verb. This sentence no
|
|
|
|
|
|
;; > verb. This sentence no verb. This sentence no verb. This
|
|
|
|
|
|
;; > sentence no verb.
|
|
|
|
|
|
;; >
|
|
|
|
|
|
;; > Bye, John
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Hey, John. There's no in all your sentences!
|
|
|
|
|
|
;;
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
2005-02-09 15:50:47 +00:00
|
|
|
|
;;
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; Usage
|
|
|
|
|
|
;; -----
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Press `W k' in the Summary Buffer.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Non recommended usage :-)
|
|
|
|
|
|
;; ---------------------
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; To automatically invoke deuglification on every article you read,
|
|
|
|
|
|
;; put something like that in your .gnus:
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; (add-hook 'gnus-article-decode-hook 'gnus-article-outlook-unwrap-lines)
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; or _one_ of the following lines:
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; ;; repair broken attribution lines
|
|
|
|
|
|
;; (add-hook 'gnus-article-decode-hook 'gnus-article-outlook-repair-attribution)
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; ;; repair broken attribution lines and citations
|
|
|
|
|
|
;; (add-hook 'gnus-article-decode-hook 'gnus-article-outlook-rearrange-citation)
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Note that there always may be some false positives, so I suggest
|
|
|
|
|
|
;; using the manual invocation. After deuglification you may want to
|
|
|
|
|
|
;; refill the whole article using `W w'.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Limitations
|
|
|
|
|
|
;; -----------
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; As I said before there may (or will) be a few false positives on
|
|
|
|
|
|
;; unwrapping cited lines with `gnus-article-outlook-unwrap-lines'.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; `gnus-article-outlook-repair-attribution will only fix the first
|
|
|
|
|
|
;; attribution line found in the article. Furthermore it fixed to
|
|
|
|
|
|
;; certain kinds of attributions. And there may be horribly many
|
|
|
|
|
|
;; false positives, vanishing lines and so on -- so don't trust your
|
|
|
|
|
|
;; eyes. Again I recommend manual invocation.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; `gnus-article-outlook-rearrange-citation' carries all the limitations of
|
|
|
|
|
|
;; `gnus-article-outlook-repair-attribution.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; See ChangeLog for other changes.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Revision 1.5 2002/01/27 14:39:17 rscholz
|
|
|
|
|
|
;; * New variable `gnus-outlook-deuglify-no-wrap-chars' to inhibit
|
|
|
|
|
|
;; unwrapping if one these chars is first in the possibly wrapped line.
|
|
|
|
|
|
;; * Improved rearranging of the article.
|
|
|
|
|
|
;; * New function `gnus-outlook-repair-attribution-block' for repairing
|
|
|
|
|
|
;; those big "Original Message (following some headers)" attributions.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Revision 1.4 2002/01/03 14:05:00 rscholz
|
|
|
|
|
|
;; Renamed `gnus-outlook-deuglify-article' to
|
|
|
|
|
|
;; `gnus-article-outlook-deuglify-article'.
|
|
|
|
|
|
;; Made it easier to deuglify the article while being in Gnus' Article
|
|
|
|
|
|
;; Edit Mode. (suggested by Phil Nitschke)
|
|
|
|
|
|
;;
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Revision 1.3 2002/01/02 23:35:54 rscholz
|
|
|
|
|
|
;; Fix a bug that caused succeeding long attribution lines to be
|
|
|
|
|
|
;; unwrapped. Minor doc fixes and regular expression tuning.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Revision 1.2 2001/12/30 20:14:34 rscholz
|
|
|
|
|
|
;; Clean up source.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Revision 1.1 2001/12/30 20:13:32 rscholz
|
|
|
|
|
|
;; Initial revision
|
|
|
|
|
|
;;
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
|
|
(require 'gnus-art)
|
|
|
|
|
|
(require 'gnus-sum)
|
|
|
|
|
|
|
|
|
|
|
|
(defconst gnus-outlook-deuglify-version "1.5 Gnus version"
|
|
|
|
|
|
"Version of gnus-outlook-deuglify.")
|
|
|
|
|
|
|
|
|
|
|
|
;;; User Customizable Variables:
|
|
|
|
|
|
|
|
|
|
|
|
(defgroup gnus-outlook-deuglify nil
|
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).
2004-11-01 23:06:36 +00:00
|
|
|
|
"Deuglify articles generated by broken user agents like MS Outlook (Express)."
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-324
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 70)
- Update from CVS
2005-05-17 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock): Change the parent group to news.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify): Add :group.
* lisp/gnus/dig.el (dig): Add :group.
* lisp/gnus/gnus-art.el (gnus-inhibit-mime-unbuttonizing): Add :group.
* lisp/gnus/gnus-cite.el (gnus-cite-attribution-face): Add :group.
(gnus-cite-face-1, gnus-cite-face-2, gnus-cite-face-3): Ditto.
(gnus-cite-face-4, gnus-cite-face-5, gnus-cite-face-6): Ditto.
(gnus-cite-face-7, gnus-cite-face-8, gnus-cite-face-9): Ditto.
(gnus-cite-face-10, gnus-cite-face-11): Ditto.
* lisp/gnus/gnus-diary.el (gnus-diary): Add :group.
* lisp/gnus/gnus.el (gnus-group-news-1-face): Add :group.
(gnus-group-news-1-empty-face): Ditto.
(gnus-group-news-2-face, gnus-group-news-2-empty-face): Ditto.
(gnus-group-news-3-face, gnus-group-news-3-empty-face): Ditto.
(gnus-group-news-4-face, gnus-group-news-4-empty-face): Ditto.
(gnus-group-news-5-face, gnus-group-news-5-empty-face): Ditto.
(gnus-group-news-6-face, gnus-group-news-6-empty-face): Ditto.
(gnus-group-news-low-face, gnus-group-news-low-empty-face): Ditto.
(gnus-group-mail-1-face, gnus-group-mail-1-empty-face): Ditto.
(gnus-group-mail-2-face, gnus-group-mail-2-empty-face): Ditto.
(gnus-group-mail-3-face, gnus-group-mail-3-empty-face): Ditto.
(gnus-group-mail-low-face, gnus-group-mail-low-empty-face): Ditto.
(gnus-summary-selected-face, gnus-summary-cancelled-face): Ditto.
(gnus-summary-high-ticked-face): Ditto.
(gnus-summary-low-ticked-face): Ditto.
(gnus-summary-normal-ticked-face): Ditto.
(gnus-summary-high-ancient-face): Ditto.
(gnus-summary-low-ancient-face): Ditto.
(gnus-summary-normal-ancient-face): Ditto.
(gnus-summary-high-undownloaded-face): Ditto.
(gnus-summary-low-undownloaded-face): Ditto.
(gnus-summary-normal-undownloaded-face): Ditto.
(gnus-summary-high-unread-face): Ditto.
(gnus-summary-low-unread-face): Ditto.
(gnus-summary-normal-unread-face): Ditto.
(gnus-summary-high-read-face, gnus-summary-low-read-face): Diito
(gnus-summary-normal-read-face, gnus-splash-face): Ditto.
* lisp/gnus/message.el (message-minibuffer-local-map): Add :group.
* lisp/gnus/sieve-manage.el (sieve-manage-log): Add :group.
(sieve-manage-default-user): Diito.
(sieve-manage-server-eol, sieve-manage-client-eol): Ditto.
(sieve-manage-streams, sieve-manage-stream-alist): Ditto.
(sieve-manage-authenticators): Ditto.
(sieve-manage-authenticator-alist): Ditto
(sieve-manage-default-port): Ditto.
* lisp/gnus/sieve-mode.el (sieve-control-commands-face): Add :group.
(sieve-action-commands-face): Ditto.
(sieve-test-commands-face): Ditto.
(sieve-tagged-arguments-face): Ditto.
* lisp/gnus/smime.el (smime): Add :group.
* lisp/gnus/spam-report.el (spam-report): Add :group.
* lisp/gnus/spam.el (spam, spam-face): Add :group.
2005-05-26 15:03:29 +00:00
|
|
|
|
:version "22.1"
|
|
|
|
|
|
:group 'gnus)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
|
(defcustom gnus-outlook-deuglify-unwrap-min 45
|
|
|
|
|
|
"Minimum length of the cited line above the (possibly) wrapped line."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'integer
|
|
|
|
|
|
:group 'gnus-outlook-deuglify)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom gnus-outlook-deuglify-unwrap-max 95
|
|
|
|
|
|
"Maximum length of the cited line after unwrapping."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'integer
|
|
|
|
|
|
:group 'gnus-outlook-deuglify)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom gnus-outlook-deuglify-cite-marks ">|#%"
|
|
|
|
|
|
"Characters that indicate cited lines."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'string
|
|
|
|
|
|
:group 'gnus-outlook-deuglify)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom gnus-outlook-deuglify-unwrap-stop-chars nil ;; ".?!" or nil
|
|
|
|
|
|
"Characters that inhibit unwrapping if they are the last one on the cited line above the possible wrapped line."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type '(radio (const :format "None " nil)
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
|
(string :value ".?!"))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:group 'gnus-outlook-deuglify)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom gnus-outlook-deuglify-no-wrap-chars "`"
|
|
|
|
|
|
"Characters that inhibit unwrapping if they are the first one in the possibly wrapped line."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'string
|
|
|
|
|
|
:group 'gnus-outlook-deuglify)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom gnus-outlook-deuglify-attrib-cut-regexp
|
|
|
|
|
|
"\\(On \\|Am \\)?\\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\|Sun\\),[^,]+, "
|
|
|
|
|
|
"Regular expression matching the beginning of an attribution line that should be cut off."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'string
|
|
|
|
|
|
:group 'gnus-outlook-deuglify)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom gnus-outlook-deuglify-attrib-verb-regexp
|
|
|
|
|
|
"wrote\\|writes\\|says\\|schrieb\\|schreibt\\|meinte\\|skrev\\|a <20>crit\\|schreef\\|escribi<62>"
|
|
|
|
|
|
"Regular expression matching the verb used in an attribution line."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'string
|
|
|
|
|
|
:group 'gnus-outlook-deuglify)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom gnus-outlook-deuglify-attrib-end-regexp
|
|
|
|
|
|
": *\\|\\.\\.\\."
|
|
|
|
|
|
"Regular expression matching the end of an attribution line."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'string
|
|
|
|
|
|
:group 'gnus-outlook-deuglify)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom gnus-outlook-display-hook nil
|
|
|
|
|
|
"A hook called after an deuglified article has been prepared.
|
|
|
|
|
|
It is run after `gnus-article-prepare-hook'."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'hook
|
|
|
|
|
|
:group 'gnus-outlook-deuglify)
|
|
|
|
|
|
|
|
|
|
|
|
;; Functions
|
|
|
|
|
|
|
|
|
|
|
|
(defun gnus-outlook-display-article-buffer ()
|
|
|
|
|
|
"Redisplay current buffer or article buffer."
|
|
|
|
|
|
(with-current-buffer (or gnus-article-buffer (current-buffer))
|
|
|
|
|
|
;; "Emulate" `gnus-article-prepare-display' without calling
|
|
|
|
|
|
;; it. Calling `gnus-article-prepare-display' on an already
|
|
|
|
|
|
;; prepared article removes all MIME parts. I'm unsure whether
|
|
|
|
|
|
;; this is a bug or not.
|
|
|
|
|
|
(gnus-article-highlight t)
|
|
|
|
|
|
(gnus-treat-article nil)
|
|
|
|
|
|
(gnus-run-hooks 'gnus-article-prepare-hook
|
|
|
|
|
|
'gnus-outlook-display-hook)))
|
|
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
|
(defun gnus-article-outlook-unwrap-lines (&optional nodisplay)
|
|
|
|
|
|
"Unwrap lines that appear to be wrapped citation lines.
|
|
|
|
|
|
You can control what lines will be unwrapped by frobbing
|
|
|
|
|
|
`gnus-outlook-deuglify-unwrap-min' and `gnus-outlook-deuglify-unwrap-max',
|
|
|
|
|
|
indicating the minimum and maximum length of an unwrapped citation line. If
|
|
|
|
|
|
NODISPLAY is non-nil, don't redisplay the article buffer."
|
|
|
|
|
|
(interactive "P")
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(let ((case-fold-search nil)
|
|
|
|
|
|
(inhibit-read-only t)
|
|
|
|
|
|
(cite-marks gnus-outlook-deuglify-cite-marks)
|
|
|
|
|
|
(no-wrap gnus-outlook-deuglify-no-wrap-chars)
|
|
|
|
|
|
(stop-chars gnus-outlook-deuglify-unwrap-stop-chars))
|
|
|
|
|
|
(gnus-with-article-buffer
|
|
|
|
|
|
(article-goto-body)
|
|
|
|
|
|
(while (re-search-forward
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"^\\([ \t" cite-marks "]*\\)"
|
|
|
|
|
|
"\\([" cite-marks "].*[^\n " stop-chars "]\\)[ \t]?\n"
|
|
|
|
|
|
"\\1\\([^\n " cite-marks no-wrap "]+.*\\)$")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
nil t)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(let ((len12 (- (match-end 2) (match-beginning 1)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(len3 (- (match-end 3) (match-beginning 3))))
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(when (and (> len12 gnus-outlook-deuglify-unwrap-min)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(< (+ len12 len3) gnus-outlook-deuglify-unwrap-max))
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(replace-match "\\1\\2 \\3")
|
|
|
|
|
|
(goto-char (match-beginning 0)))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(unless nodisplay (gnus-outlook-display-article-buffer)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun gnus-outlook-rearrange-article (attr-start)
|
|
|
|
|
|
"Put the text from ATTR-START to the end of buffer at the top of the article buffer."
|
2007-10-28 09:18:39 +00:00
|
|
|
|
;; FIXME: 1. (*) text/plain ( ) text/html
|
|
|
|
|
|
(let ((inhibit-read-only t)
|
|
|
|
|
|
(cite-marks gnus-outlook-deuglify-cite-marks))
|
|
|
|
|
|
(gnus-with-article-buffer
|
|
|
|
|
|
(article-goto-body)
|
|
|
|
|
|
;; article does not start with attribution
|
|
|
|
|
|
(unless (= (point) attr-start)
|
|
|
|
|
|
(gnus-kill-all-overlays)
|
|
|
|
|
|
(let ((cur (point))
|
|
|
|
|
|
;; before signature or end of buffer
|
|
|
|
|
|
(to (if (gnus-article-search-signature)
|
|
|
|
|
|
(point)
|
|
|
|
|
|
(point-max))))
|
|
|
|
|
|
;; handle the case where the full quote is below the
|
|
|
|
|
|
;; signature
|
|
|
|
|
|
(when (< to attr-start)
|
|
|
|
|
|
(setq to (point-max)))
|
|
|
|
|
|
(save-excursion
|
|
|
|
|
|
(narrow-to-region attr-start to)
|
|
|
|
|
|
(goto-char attr-start)
|
|
|
|
|
|
(forward-line)
|
|
|
|
|
|
(unless (looking-at ">")
|
|
|
|
|
|
(message-indent-citation (point) (point-max) 'yank-only)
|
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
|
(newline)
|
|
|
|
|
|
(setq to (point-max)))
|
|
|
|
|
|
(widen))
|
|
|
|
|
|
(transpose-regions cur attr-start attr-start to))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
|
;; John Doe <john.doe@some.domain> wrote in message
|
|
|
|
|
|
;; news:a87usw8$dklsssa$2@some.news.server...
|
|
|
|
|
|
|
|
|
|
|
|
(defun gnus-outlook-repair-attribution-outlook ()
|
|
|
|
|
|
"Repair a broken attribution line (Outlook)."
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(let ((case-fold-search nil)
|
|
|
|
|
|
(inhibit-read-only t)
|
|
|
|
|
|
(cite-marks gnus-outlook-deuglify-cite-marks))
|
|
|
|
|
|
(gnus-with-article-buffer
|
|
|
|
|
|
(article-goto-body)
|
|
|
|
|
|
(when (re-search-forward
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(concat "^\\([^" cite-marks "].+\\)"
|
|
|
|
|
|
"\\(" gnus-outlook-deuglify-attrib-verb-regexp "\\)"
|
|
|
|
|
|
"\\(.*\n?[^\n" cite-marks "].*\\)?"
|
|
|
|
|
|
"\\(" gnus-outlook-deuglify-attrib-end-regexp "\\)$")
|
|
|
|
|
|
nil t)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(gnus-kill-all-overlays)
|
|
|
|
|
|
(replace-match "\\1\\2\\4")
|
|
|
|
|
|
(match-beginning 0)))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; ----- Original Message -----
|
|
|
|
|
|
;; From: "John Doe" <john.doe@some.domain>
|
|
|
|
|
|
;; To: "Doe Foundation" <info@doefnd.org>
|
|
|
|
|
|
;; Sent: Monday, November 19, 2001 12:13 PM
|
|
|
|
|
|
;; Subject: More Doenuts
|
|
|
|
|
|
|
|
|
|
|
|
(defun gnus-outlook-repair-attribution-block ()
|
|
|
|
|
|
"Repair a big broken attribution block."
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(let ((case-fold-search nil)
|
|
|
|
|
|
(inhibit-read-only t)
|
|
|
|
|
|
(cite-marks gnus-outlook-deuglify-cite-marks))
|
|
|
|
|
|
(gnus-with-article-buffer
|
|
|
|
|
|
(article-goto-body)
|
|
|
|
|
|
(when (re-search-forward
|
|
|
|
|
|
(concat "^[" cite-marks " \t]*--* ?[^-]+ [^-]+ ?--*\\s *\n"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
"[^\n:]+:[ \t]*\\([^\n]+\\)\n"
|
|
|
|
|
|
"\\([^\n:]+:[ \t]*[^\n]+\n\\)+")
|
|
|
|
|
|
nil t)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(gnus-kill-all-overlays)
|
|
|
|
|
|
(replace-match "\\1 wrote:\n")
|
|
|
|
|
|
(match-beginning 0)))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
|
;; On Wed, 16 Jan 2002 23:23:30 +0100, John Doe <john.doe@some.domain> wrote:
|
|
|
|
|
|
|
|
|
|
|
|
(defun gnus-outlook-repair-attribution-other ()
|
|
|
|
|
|
"Repair a broken attribution line (other user agents than Outlook)."
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(let ((case-fold-search nil)
|
|
|
|
|
|
(inhibit-read-only t)
|
|
|
|
|
|
(cite-marks gnus-outlook-deuglify-cite-marks))
|
|
|
|
|
|
(gnus-with-article-buffer
|
|
|
|
|
|
(article-goto-body)
|
|
|
|
|
|
(when (re-search-forward
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(concat "^\\("gnus-outlook-deuglify-attrib-cut-regexp"\\)?"
|
|
|
|
|
|
"\\([^" cite-marks "].+\\)\n\\([^\n" cite-marks "].*\\)?"
|
|
|
|
|
|
"\\(" gnus-outlook-deuglify-attrib-verb-regexp "\\).*"
|
|
|
|
|
|
"\\(" gnus-outlook-deuglify-attrib-end-regexp "\\)$")
|
|
|
|
|
|
nil t)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(gnus-kill-all-overlays)
|
|
|
|
|
|
(replace-match "\\4 \\5\\6\\7")
|
|
|
|
|
|
(match-beginning 0)))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
|
(defun gnus-article-outlook-repair-attribution (&optional nodisplay)
|
|
|
|
|
|
"Repair a broken attribution line.
|
|
|
|
|
|
If NODISPLAY is non-nil, don't redisplay the article buffer."
|
|
|
|
|
|
(interactive "P")
|
|
|
|
|
|
(let ((attrib-start
|
|
|
|
|
|
(or
|
|
|
|
|
|
(gnus-outlook-repair-attribution-other)
|
|
|
|
|
|
(gnus-outlook-repair-attribution-block)
|
|
|
|
|
|
(gnus-outlook-repair-attribution-outlook))))
|
|
|
|
|
|
(unless nodisplay (gnus-outlook-display-article-buffer))
|
|
|
|
|
|
attrib-start))
|
|
|
|
|
|
|
|
|
|
|
|
(defun gnus-article-outlook-rearrange-citation (&optional nodisplay)
|
|
|
|
|
|
"Repair broken citations.
|
|
|
|
|
|
If NODISPLAY is non-nil, don't redisplay the article buffer."
|
|
|
|
|
|
(interactive "P")
|
|
|
|
|
|
(let ((attrib-start (gnus-article-outlook-repair-attribution 'nodisplay)))
|
|
|
|
|
|
;; rearrange citations if an attribution line has been recognized
|
|
|
|
|
|
(if attrib-start
|
|
|
|
|
|
(gnus-outlook-rearrange-article attrib-start)))
|
|
|
|
|
|
(unless nodisplay (gnus-outlook-display-article-buffer)))
|
|
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
|
(defun gnus-outlook-deuglify-article (&optional nodisplay)
|
|
|
|
|
|
"Full deuglify of broken Outlook (Express) articles.
|
|
|
|
|
|
Treat dumbquotes, unwrap lines, repair attribution and rearrange citation. If
|
|
|
|
|
|
NODISPLAY is non-nil, don't redisplay the article buffer."
|
|
|
|
|
|
(interactive "P")
|
|
|
|
|
|
;; apply treatment of dumb quotes
|
|
|
|
|
|
(gnus-article-treat-dumbquotes)
|
|
|
|
|
|
;; repair wrapped cited lines
|
|
|
|
|
|
(gnus-article-outlook-unwrap-lines 'nodisplay)
|
|
|
|
|
|
;; repair attribution line and rearrange citation.
|
|
|
|
|
|
(gnus-article-outlook-rearrange-citation 'nodisplay)
|
|
|
|
|
|
(unless nodisplay (gnus-outlook-display-article-buffer)))
|
|
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
|
(defun gnus-article-outlook-deuglify-article ()
|
|
|
|
|
|
"Deuglify broken Outlook (Express) articles and redisplay."
|
|
|
|
|
|
(interactive)
|
|
|
|
|
|
(gnus-outlook-deuglify-article nil))
|
|
|
|
|
|
|
|
|
|
|
|
(provide 'deuglify)
|
|
|
|
|
|
|
|
|
|
|
|
;; Local Variables:
|
|
|
|
|
|
;; coding: iso-8859-1
|
|
|
|
|
|
;; End:
|
|
|
|
|
|
|
2008-04-10 14:10:46 +00:00
|
|
|
|
;; arch-tag: 5f895cc9-51a9-487c-b42e-28844d79eb73
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;;; deuglify.el ends here
|