diff lisp/gnus/nnspool.el @ 111693:1cb16ad0d1bc

Merge changes made in Gnus trunk. nnheader.el (nnheader-parse-head): Bug fix. Properly position point when parsing headers. nnspool.el (nnspool-insert-nov-head): Bug fix. Make sure point is positioned properly when parsing headers. shr-color.el (shr-color->hexadecimal): Add support for color names. color-lab.el (boundp): Bind float-pi for Emacs < 23.3. shr.el (shr-insert-color-overlay): Split stuff like "#444444 !important" to find the real colour.

--- a/lisp/gnus/nnspool.el	Tue Nov 23 22:27:22 2010 +0200
+++ b/lisp/gnus/nnspool.el	Tue Nov 23 22:24:15 2010 +0000
@@ -399,15 +399,16 @@
   "Read the head of ARTICLE, convert to NOV headers, and insert."
   (save-excursion
     (let ((cur (current-buffer))
-	  buf)
+          buf)
       (setq buf (nnheader-set-temp-buffer " *nnspool head*"))
       (when (nnheader-insert-head
-	     (nnspool-article-pathname nnspool-current-group article))
-	(nnheader-insert-article-line article)
-	(let ((headers (nnheader-parse-head)))
-	  (set-buffer cur)
-	  (goto-char (point-max))
-	  (nnheader-insert-nov headers)))
+             (nnspool-article-pathname nnspool-current-group article))
+        (nnheader-insert-article-line article)
+        (goto-char (point-min))
+        (let ((headers (nnheader-parse-head)))
+          (set-buffer cur)
+          (goto-char (point-max))
+          (nnheader-insert-nov headers)))
       (kill-buffer buf))))
 
 (defun nnspool-sift-nov-with-sed (articles file)