Merge from emacs--devo--0

[gnus] / lisp / deuglify.el

diff --git a/lisp/deuglify.el b/lisp/deuglify.el
index c4b9b19..03c2bcf 100644 (file)
--- a/lisp/deuglify.el
+++ b/lisp/deuglify.el
@@ -1,7 +1,7 @@
 ;;; deuglify.el --- deuglify broken Outlook (Express) articles
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-;; Copyright (C) 2001, 2002 Raymond Scholz
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Author: Raymond Scholz <rscholz@zonix.de>
 ;;         Thomas Steffen (unwrapping algorithm,
@@ -12,7 +12,7 @@
 
 ;; 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)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -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:
 
@@ -146,7 +146,7 @@
 ;; Hey, John.  There's no in all your sentences!
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
+;;
 ;; Usage
 ;; -----
 ;;
@@ -231,67 +231,65 @@
 
 (defgroup gnus-outlook-deuglify nil
   "Deuglify articles generated by broken user agents like MS Outlook (Express)."
-  :version "21.4")
+  :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 "21.4"
+  :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 "21.4"
+  :version "22.1"
   :type 'integer
   :group 'gnus-outlook-deuglify)
 
 (defcustom gnus-outlook-deuglify-cite-marks ">|#%"
   "Characters that indicate cited lines."
-  :version "21.4"
+  :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 "21.4"
+  :version "22.1"
   :type '(radio (const :format "None  " nil)
                (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 "21.4"
+  :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 "21.4"
+  :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 "21.4"
+  :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 "21.4"
+  :version "22.1"
   :type 'string
   :group 'gnus-outlook-deuglify)
 
-;;;###autoload
 (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 "21.4"
+  :version "22.1"
   :type 'hook
   :group 'gnus-outlook-deuglify)
 
@@ -340,6 +338,7 @@ NODISPLAY is non-nil, don't redisplay the 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."
+  ;; FIXME: 1.  (*) text/plain          ( ) text/html
   (let ((inhibit-read-only t)
        (cite-marks gnus-outlook-deuglify-cite-marks))
     (gnus-with-article-buffer
@@ -354,8 +353,18 @@ NODISPLAY is non-nil, don't redisplay the article buffer."
                    (point-max))))
          ;; handle the case where the full quote is below the
          ;; signature
-         (if (< to attr-start)
+         (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))))))
 
 ;; John Doe <john.doe@some.domain> wrote in message