From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Tue, 21 Sep 2010 22:48:20 +0000 (+0200)
Subject: Fix variable name clobbering from previous patch.
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=a82fb840dc1a4e4f343f7f3e0faa307e841f3bc2;hp=5220f0be0588ca1ee428e7b74b68701b9b1f277e

Fix variable name clobbering from previous patch.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7f6ad06f..0d77ddfa4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nnml.el (nnml-generate-nov-file): Fix variable name clobbering from
+	previous patch.
+
 	* gnus-sum.el (gnus-adjust-marked-articles): Fix another typo.
 
 2010-09-21  Adam Sjøgren  <asjo@koldfront.dk>
diff --git a/lisp/nnml.el b/lisp/nnml.el
index 11cdfd768..d05485b32 100644
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -942,22 +942,23 @@ Unless no-active is non-nil, update the active file too."
       (when (file-exists-p nov)
 	(funcall nnmail-delete-file-function nov))
       (dolist (file files)
-	(unless (file-directory-p (setq file (concat dir (cdr file))))
-	  (erase-buffer)
-	  (nnheader-insert-file-contents file)
-	  (narrow-to-region
-	   (goto-char (point-min))
-	   (progn
-	     (re-search-forward "\n\r?\n" nil t)
-	     (setq chars (- (point-max) (point)))
-	     (max (point-min) (1- (point)))))
-	  (unless (zerop (buffer-size))
-	    (goto-char (point-min))
-	    (setq headers (nnml-parse-head chars (car file)))
-	    (with-current-buffer nov-buffer
-	      (goto-char (point-max))
-	      (nnheader-insert-nov headers)))
-	  (widen)))
+	(let ((path (concat dir (cdr file))))
+	  (unless (file-directory-p path)
+	    (erase-buffer)
+	    (nnheader-insert-file-contents path)
+	    (narrow-to-region
+	     (goto-char (point-min))
+	     (progn
+	       (re-search-forward "\n\r?\n" nil t)
+	       (setq chars (- (point-max) (point)))
+	       (max (point-min) (1- (point)))))
+	    (unless (zerop (buffer-size))
+	      (goto-char (point-min))
+	      (setq headers (nnml-parse-head chars (car file)))
+	      (with-current-buffer nov-buffer
+		(goto-char (point-max))
+		(nnheader-insert-nov headers)))
+	    (widen))))
       (with-current-buffer nov-buffer
 	(nnmail-write-region (point-min) (point-max) nov nil 'nomesg)
 	(kill-buffer (current-buffer))))))