Index: lisp/deuglify.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/deuglify.el,v
retrieving revision 6.4
diff -u -r6.4 deuglify.el
--- lisp/deuglify.el	2002/12/28 23:54:45	6.4
+++ lisp/deuglify.el	2002/12/31 16:34:07
@@ -280,7 +280,6 @@
 
 ;; Functions
 
-;; TODO: don't kill MIME parts
 ;;;###autoload
 (defun gnus-outlook-unwrap-lines ()
   "Unwrap lines that appear to be wrapped citation lines.
@@ -311,19 +310,18 @@
 		  (replace-match "\\1\\2 \\3")
 		  (goto-char (match-beginning 0))))))))))
 
-;; TODO: respect signatures, don't kill MIME parts
 (defun gnus-outlook-rearrange-article (from-where)
   "Put the text from `from-where' to the end of buffer at the top of the article buffer."
   (save-excursion
     (let ((inhibit-read-only t)
 	  (cite-marks gnus-outlook-deuglify-cite-marks))
       (gnus-with-article-buffer
-	(unless (search-forward-regexp
-		   (concat "^[ \t]*[^" cite-marks "\n]") nil t)
-	  (kill-region from-where (point-max))
-	  (article-goto-body)
-	  (yank)
-	  (insert "\n"))))))
+	(article-goto-body)
+	;; attribution out of place?
+	(unless (= (point) from-where)
+	  (gnus-kill-all-overlays)
+	  (transpose-regions (point) (+ from-where 1)
+			     (+ from-where 1) (point-max)))))))
 
 ;; John Doe <john.doe@some.domain> wrote in message
 ;; news:a87usw8$dklsssa$2@some.news.server...
@@ -343,6 +341,7 @@
 		     "\\(" gnus-outlook-deuglify-attrib-end-regexp "\\)$")
 	     nil t)
 	    (progn
+	      (gnus-kill-all-overlays)
 	      (replace-match "\\1\\2\\4")
 	      (match-beginning 0)))))))
 
@@ -369,6 +368,7 @@
 		     "[^\n]+: [^\n]+$")
 	     nil t)
 	    (progn
+	      (gnus-kill-all-overlays)
 	      (replace-match "\\1 wrote:")
 	      (match-beginning 0)))))))
 
@@ -389,6 +389,7 @@
 		     "\\(" gnus-outlook-deuglify-attrib-end-regexp "\\)$")
 	     nil t)
 	    (progn
+	      (gnus-kill-all-overlays)
 	      (replace-match "\\4 \\5\\6\\7")
 	      (match-beginning 0)))))))
 
@@ -425,7 +426,7 @@
   (interactive)
   (gnus-outlook-deuglify-article)
   (with-current-buffer (or gnus-article-buffer (current-buffer))
-    (gnus-article-prepare-display)))
+    (gnus-article-highlight t)))
 
 (provide 'deuglify)