From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Fri, 10 Jan 2003 18:21:17 +0000 (+0000)
Subject: * gnus-cite.el (gnus-cite-delete-overlays): Protect against
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=25aefcded22aa2fb6789d4a02847aaaf04aea1cb;p=gnus

* gnus-cite.el (gnus-cite-delete-overlays): Protect against
errors when deleting overlays.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c95824a2..995ce959d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-cite.el (gnus-cite-delete-overlays): Protect against
+	errors when deleting overlays.
+
 	* gnus-score.el (gnus-score-followup): Allow tracing.
 
 	* gnus-art.el (gnus-treat-display-face): New variable.
diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 59ccf0169..a5ab85476 100644
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -671,7 +671,8 @@ See also the documentation for `gnus-article-highlight-citation'."
 	      (and (>= (gnus-overlay-end overlay) (point-min))
 		   (<= (gnus-overlay-end overlay) (point-max))))
       (setq gnus-cite-overlay-list (delete overlay gnus-cite-overlay-list))
-      (gnus-delete-overlay overlay))))
+      (ignore-errors
+	(gnus-delete-overlay overlay)))))
 
 (defun gnus-cite-parse-wrapper ()
   ;; Wrap chopped gnus-cite-parse.
diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index eef1c882c..08b60e66d 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -85,7 +85,7 @@ Output to the current buffer, replace text, and don't mingle error."
   (when (file-exists-p file)
     (let ((done nil)
 	  (attempt "")
-	  (quant 4))
+	  (quant 16))
       (while (and (not done)
 		  (> quant 1))
 	(setq attempt
@@ -94,7 +94,10 @@ Output to the current buffer, replace text, and don't mingle error."
 		       (shell-quote-argument file)
 		       quant)))
 	(if (> (length attempt) 740)
-	    (setq quant (/ quant 2))
+	    (progn
+	      (setq quant (- quant 2))
+	      (message "Length %d; trying quant %d"
+		       (length attempt) quant))
 	  (setq done t)))
       (if done
 	  (mm-with-unibyte-buffer