Changes committed gnus/lisp (ChangeLog gnus-sum.el)

"Ted Zlatanov" <[email protected]> Thu, 11 Sep 2008 14:48:09 +0200
Newsgroups gmane.emacs.gnus.commits
Message-ID <[email protected]>
Modified: ChangeLog gnus-sum.el

(gnus-summary-insert-line): Trap errors on setting the summary line
gnus-number property and ignore them (with a warning message).


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1907 gnus/lisp/ChangeLog:7.1908
--- ChangeLog:7.1907	Mon Sep  8 23:12:23 2008
+++ ChangeLog	Thu Sep 11 14:48:08 2008
@@ -1,3 +1,9 @@
+2008-09-11  Teodor Zlatanov  <[email protected]>
+
+	* gnus-sum.el (gnus-summary-insert-line): Trap errors on setting the
+	summary line gnus-number property and ignore them (with a warning
+	message).
+
 2008-09-08  David Engster  <[email protected]>
 
 	* nnmairix.el (nnmairix-create-server-and-default-group): Require match
Index: gnus-sum.el
diff -u gnus/lisp/gnus-sum.el:7.233 gnus/lisp/gnus-sum.el:7.234
--- gnus-sum.el:7.233	Wed Jul 30 19:56:50 2008
+++ gnus-sum.el	Thu Sep 11 14:48:08 2008
@@ -3740,10 +3740,12 @@
     (if (= gnus-tmp-lines -1)
 	(setq gnus-tmp-lines "?")
       (setq gnus-tmp-lines (number-to-string gnus-tmp-lines)))
-      (gnus-put-text-property
-     (point)
-     (progn (eval gnus-summary-line-format-spec) (point))
-       'gnus-number gnus-tmp-number)
+    (condition-case ()
+	(gnus-put-text-property
+	 (point)
+	 (progn (eval gnus-summary-line-format-spec) (point))
+	 'gnus-number gnus-tmp-number)
+      (error (gnus-message 5 "Error updating the summary line")))
     (when (gnus-visual-p 'summary-highlight 'highlight)
       (forward-line -1)
       (gnus-run-hooks 'gnus-summary-update-hook)
@@ -5351,15 +5353,15 @@
 		(setq gnus-tmp-lines "?")
 	      (setq gnus-tmp-lines (number-to-string gnus-tmp-lines)))
               (gnus-put-text-property
-	     (point)
-	     (progn (eval gnus-summary-line-format-spec) (point))
+	       (point)
+	       (progn (eval gnus-summary-line-format-spec) (point))
                'gnus-number number)
-	    (when gnus-visual-p
-	      (forward-line -1)
-	      (gnus-run-hooks 'gnus-summary-update-hook)
-	      (forward-line 1))
+	      (when gnus-visual-p
+		(forward-line -1)
+		(gnus-run-hooks 'gnus-summary-update-hook)
+		(forward-line 1))
 
-	    (setq gnus-tmp-prev-subject simp-subject)))
+	      (setq gnus-tmp-prev-subject simp-subject)))
 
 	(when (nth 1 thread)
 	  (push (list (max 0 gnus-tmp-level)