* gnus-sum.el: Add gnus-article-outlook-deuglify-article.

	* deuglify.el: Change copy right. Add autoload. Add coding-system.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0bbea95..2b5b332 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2002-02-22  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * gnus-sum.el: Add gnus-article-outlook-deuglify-article.
+
+       * deuglify.el: Change copy right. Add autoload. Add coding-system.
+       
        * deuglify.el: New file. The original file name is
        gnus-outlook-deuglify.el from Raymond Scholz <rscholz@zonix.de>.
 

diff --git a/lisp/deuglify.el b/lisp/deuglify.el
index 1dab222..756c018 100644 (file)
--- a/lisp/deuglify.el
+++ b/lisp/deuglify.el
@@ -1,32 +1,28 @@
-;;; gnus-outlook-deuglify.el --- deuglify broken Outlook (Express) articles
+;;; deuglify.el --- deuglify broken Outlook (Express) articles
 
+;; Copyright (C) 2002 Free Software Foundation, Inc.
 ;; Copyright (C) 2001,2002 Raymond Scholz
 
 ;; Author: Raymond Scholz <rscholz@zonix.de>
 ;;         Thomas Steffen (unwrapping algorithm,
 ;;                         based on an idea of Stefan Monnier)
 ;; Keywords: mail, news
-;; Version: $Id: gnus-outlook-deuglify.el,v 1.5 2002/01/27 14:39:17 rscholz Exp rscholz $
 
-;; X-URL: http://www.zonix.de/div/el/deuglify/gnus-outlook-deuglify.el
-
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published
-;; by
+;; This file is part of GNU Emacs.
 
+;; 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
 ;; the Free Software Foundation; either version 2, or (at your option)
-
 ;; any later version.
 
-;; This file is distributed in the hope that it will be useful,
+;; 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
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
@@ -199,7 +195,11 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; $Log: gnus-outlook-deuglify.el,v $
+;; $Log: deuglify.el,v $
+;; Revision 6.1  2002/02/22 21:14:46  zsh
+;;     * deuglify.el: New file. The original file name is
+;;     gnus-outlook-deuglify.el from Raymond Scholz <rscholz@zonix.de>.
+;;
 ;; 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.
@@ -231,7 +231,7 @@
 (require 'gnus-art)
 (require 'gnus-sum)
 
-(defconst gnus-outlook-deuglify-version "$Revision: 1.5 $"
+(defconst gnus-outlook-deuglify-version "1.5"
   "Version of gnus-outlook-deuglify.")
 
 ;;; User Customizable Variables:
@@ -240,11 +240,13 @@
   "Deuglify articles generated by broken user agents like MS 
 Outlook (Express).")
 
+;;;###autoload
 (defcustom gnus-outlook-deuglify-unwrap-min 45
   "Minimum length of the cited line above the (possibly) wrapped line."
   :type 'number
   :group 'gnus-outlook-deuglify)
 
+;;;###autoload
 (defcustom gnus-outlook-deuglify-unwrap-max 95
   "Maximum length of the cited line after unwrapping."
   :type 'number
@@ -290,6 +292,7 @@ that should be cut off."
 ;; Functions
 
 ;; TODO: don't kill MIME parts
+;;;###autoload
 (defun gnus-outlook-unwrap-lines ()
   "Unwrap lines that appear to be wrapped citation lines.  You can
 control what lines will be unwrapped by frobbing
@@ -401,6 +404,7 @@ the article buffer."
              (replace-match "\\4 \\5\\6\\7")
              (match-beginning 0)))))))
 
+;;;###autoload
 (defun gnus-outlook-repair-attribution ()
   "Repair a broken attribution line."
   (interactive)
@@ -416,6 +420,7 @@ the article buffer."
     (if attrib-start
        (gnus-outlook-rearrange-article attrib-start))))
 
+;;;###autoload
 (defun gnus-outlook-deuglify-article ()
   "Deuglify broken Outlook (Express) articles."
   (interactive)
@@ -426,6 +431,7 @@ the article buffer."
   ;; repair attribution line
   (gnus-outlook-rearrange-citation))
 
+;;;###autoload
 (defun gnus-article-outlook-deuglify-article ()
   "Deuglify broken Outlook (Express) articles and redisplay."
   (interactive)
@@ -433,9 +439,10 @@ the article buffer."
   (with-current-buffer (or gnus-article-buffer (current-buffer))
     (gnus-article-prepare-display)))
 
-;; luckily `W k' (mnemonic "Wash outlooK") isn't bound in Gnus :-)
-(define-key gnus-summary-wash-map "k" 'gnus-article-outlook-deuglify-article)
+(provide 'deuglify)
 
-(provide 'gnus-outlook-deuglify)
+;; Local Variables:
+;; coding: iso-8859-1
+;; End:
 
-;;; gnus-outlook-deuglify.el ends here
+;;; deuglify.el ends here

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index c6b9f9c..9a8c6fe 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -43,6 +43,9 @@
 (autoload 'gnus-mailing-list-insinuate "gnus-ml" nil t)
 (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" nil t)
 (autoload 'mm-uu-dissect "mm-uu")
+(autoload 'gnus-article-outlook-deuglify-article "deuglify" 
+  "Deuglify broken Outlook (Express) articles and redisplay."
+  t)
 
 (defcustom gnus-kill-summary-on-exit t
   "*If non-nil, kill the summary buffer when you exit from it.
@@ -1750,7 +1753,8 @@ increase the score of each group you read."
     "v" gnus-summary-verbose-headers
     "a" gnus-article-strip-headers-in-body ;; mnemonic: wash archive
     "p" gnus-article-verify-x-pgp-sig
-    "d" gnus-article-treat-dumbquotes)
+    "d" gnus-article-treat-dumbquotes
+    "k" gnus-article-outlook-deuglify-article)
 
   (gnus-define-keys (gnus-summary-wash-hide-map "W" gnus-summary-wash-map)
     "a" gnus-article-hide
@@ -2015,7 +2019,9 @@ increase the score of each group you read."
              ["Html" gnus-article-wash-html t]
              ["URLs" gnus-article-unsplit-urls t]
              ["Verify X-PGP-Sig" gnus-article-verify-x-pgp-sig t]
-             ["HZ" gnus-article-decode-HZ t])
+             ["HZ" gnus-article-decode-HZ t]
+             ["OutlooK deuglify" gnus-article-outlook-deuglify-article t]
+             )
             ("Output"
              ["Save in default format" gnus-summary-save-article
               ,@(if (featurep 'xemacs) '(t)