X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fdeuglify.el;h=c0597e7e11d2e7ab09bd784ad4f38d6e835954ad;hb=85be3726901ca453647897e26330fee8aa25d8c0;hp=42c7514c488cdf647dcbb00c059e02389cc7d0e7;hpb=ec6bccad2a77180e2aa0676ce6f72677eb13aa84;p=elisp%2Fgnus.git-

diff --git a/lisp/deuglify.el b/lisp/deuglify.el
index 42c7514..c0597e7 100644
--- a/lisp/deuglify.el
+++ b/lisp/deuglify.el
@@ -1,6 +1,6 @@
 ;;; deuglify.el --- deuglify broken Outlook (Express) articles
 
-;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 ;; Copyright (C) 2001, 2002 Raymond Scholz
 
 ;; Author: Raymond Scholz <rscholz@zonix.de>
@@ -22,8 +22,8 @@
 
 ;; 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,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -230,51 +230,61 @@
 ;;; 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 "22.1"
+  :group 'gnus)
 
 ;;;###autoload
 (defcustom gnus-outlook-deuglify-unwrap-min 45
   "Minimum length of the cited line above the (possibly) wrapped line."
+  :version "22.1"
   :type 'integer
   :group 'gnus-outlook-deuglify)
 
 ;;;###autoload
 (defcustom gnus-outlook-deuglify-unwrap-max 95
   "Maximum length of the cited line after unwrapping."
+  :version "22.1"
   :type 'integer
   :group 'gnus-outlook-deuglify)
 
 (defcustom gnus-outlook-deuglify-cite-marks ">|#%"
   "Characters that indicate cited lines."
+  :version "22.1"
   :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."
+  :version "22.1"
   :type '(radio (const :format "None  " nil)
-		(string :size 0 :value ".?!"))
+		(string :value ".?!"))
   :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."
+  :version "22.1"
   :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."
+  :version "22.1"
   :type 'string
   :group 'gnus-outlook-deuglify)
 
 (defcustom gnus-outlook-deuglify-attrib-verb-regexp
   "wrote\\|writes\\|says\\|schrieb\\|schreibt\\|meinte\\|skrev\\|a écrit\\|schreef\\|escribió"
   "Regular expression matching the verb used in an attribution line."
+  :version "22.1"
   :type 'string
   :group 'gnus-outlook-deuglify)
 
 (defcustom  gnus-outlook-deuglify-attrib-end-regexp
   ": *\\|\\.\\.\\."
   "Regular expression matching the end of an attribution line."
+  :version "22.1"
   :type 'string
   :group 'gnus-outlook-deuglify)
 
@@ -282,6 +292,7 @@
 (defcustom gnus-outlook-display-hook nil
   "A hook called after an deuglified article has been prepared.
 It is run after `gnus-article-prepare-hook'."
+  :version "22.1"
   :type 'hook
   :group 'gnus-outlook-deuglify)
 
@@ -322,11 +333,10 @@ NODISPLAY is non-nil, don't redisplay the article buffer."
               nil t)
 	(let ((len12 (- (match-end 2) (match-beginning 1)))
 	      (len3 (- (match-end 3) (match-beginning 3))))
-	  (if (and (> len12 gnus-outlook-deuglify-unwrap-min)
-		   (< (+ len12 len3) gnus-outlook-deuglify-unwrap-max))
-	      (progn
-		(replace-match "\\1\\2 \\3")
-		(goto-char (match-beginning 0))))))))
+	  (when (and (> len12 gnus-outlook-deuglify-unwrap-min)
+		     (< (+ len12 len3) gnus-outlook-deuglify-unwrap-max))
+	    (replace-match "\\1\\2 \\3")
+	    (goto-char (match-beginning 0)))))))
   (unless nodisplay (gnus-outlook-display-article-buffer)))
 
 (defun gnus-outlook-rearrange-article (attr-start)