emacs: lisp/mail/rmailsum.el comparison

(rmail-new-summary): Avoid unsafe save-restriction.

comparison

equal deleted inserted replaced

-:f1d73d12436e
+:f77de1e2b48b
 (setq mesg rmail-current-message)
 ;; Filter the messages; make or get their summary lines.
 (let ((summary-msgs ())
 	    (new-summary-line-count 0))
 	(let ((msgnum 1)
-	      (buffer-read-only nil))
+	      (buffer-read-only nil)
-	  (save-restriction
+	      (old-min (point-min-marker))
-	    (save-excursion
+	      (old-max (point-max-marker)))
-	      (widen)
+	  ;; Can't use save-restriction here; that doesn't work if we
-	      (goto-char (point-min))
+	  ;; plan to modify text outside the original restriction.
-	      (while (>= rmail-total-messages msgnum)
+	  (save-excursion
-		(if (or (null function)
+	    (widen)
-			(apply function (cons msgnum args)))
+	    (goto-char (point-min))
-		    (setq summary-msgs
+	    (while (>= rmail-total-messages msgnum)
-			  (cons (cons msgnum (rmail-make-summary-line msgnum))
+	      (if (or (null function)
-				summary-msgs)))
+		      (apply function (cons msgnum args)))
-		(setq msgnum (1+ msgnum)))
+		  (setq summary-msgs
-	      (setq summary-msgs (nreverse summary-msgs)))))
+			(cons (cons msgnum (rmail-make-summary-line msgnum))
+			      summary-msgs)))
+	      (setq msgnum (1+ msgnum)))
+	    (setq summary-msgs (nreverse summary-msgs)))
+	  (narrow-to-region old-min old-max))
 	;; Temporarily, while summary buffer is unfinished,
 	;; we "don't have" a summary.
 	(setq rmail-summary-buffer nil)
 	(save-excursion
 	  (let ((rbuf (current-buffer))

Mercurial > emacs