Synch to Oort Gnus 200303300230.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ea81c6..588ca2b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2003-03-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-registry.el (gnus-registry-translate-to-alist): Make a
+       valid lambda.
+       (gnus-registry-translate-from-alist): Ditto.
+
+       * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bind
+       print-length to nil.
+
+       * gnus-sum.el (gnus-summary-highlight-line-0): Indent.
+
+       * gnus-fun.el (gnus-fun-ppm-change-string): New function.
+       (gnus-grab-cam-face): Use it.
+
 2003-03-28  Paul Jarc  <prj@po.cwru.edu>
 
        * nnmaildir.el (nnmaildir-request-set-mark,

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 9fcb839..f8afca8 100644 (file)
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -219,15 +219,28 @@ colors of the displayed X-Faces."
       (sleep-for 1))
     (setq file (car file))
     (shell-command
-     (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | ppmnorm 2>/dev/null | ppmnorm | ppmtopgm | pnmscale -width 48 -height 48 > /tmp/gnus.face.ppm"
+     (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | ppmnorm 2>/dev/null | pnmscale -width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm"
             file))
     (let ((gnus-convert-image-to-face-command
-          "cat '%s' | ppmquant %d | pnmtopng"))
+          (format "cat '%%s' | ppmchange %s | ppmquant %%d | pnmtopng"
+                  (gnus-fun-ppm-change-string))))
       (setq result (gnus-face-from-file "/tmp/gnus.face.ppm")))
     (delete-file file)
     ;;(delete-file "/tmp/gnus.face.ppm")
     result))
 
+(defun gnus-fun-ppm-change-string ()
+  (let* ((possibilites '("%02x0000" "00%02x00" "0000%02x"
+                       "%02x%02x00" "00%02x%02x" "%02x00%02x"))
+        (format (concat "'#%02x%02x%02x' '#"
+                        (nth (random 6) possibilites)
+                        "'"))
+        (values nil))
+  (dotimes (i 255)
+    (push (format format i i i i i i)
+         values))
+  (mapconcat 'identity values " ")))
+
 (provide 'gnus-fun)
 
 ;;; gnus-fun.el ends here

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 1fb8d25..eea50d3 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2688,10 +2688,9 @@ If FORCE is non-nil, the .newsrc file is read."
 
               (unwind-protect
                   (progn
-                    (gnus-with-output-to-file
-                     working-file
-                     (gnus-gnus-to-quick-newsrc-format)
-                     (gnus-run-hooks 'gnus-save-quick-newsrc-hook))
+                    (gnus-with-output-to-file working-file
+                     (gnus-gnus-to-quick-newsrc-format)
+                     (gnus-run-hooks 'gnus-save-quick-newsrc-hook))
 
                     ;; These bindings will mislead the current buffer
                     ;; into thinking that it is visiting the startup
@@ -2737,7 +2736,8 @@ If FORCE is non-nil, the .newsrc file is read."
     (princ "(setq gnus-newsrc-file-version ")
     (princ (gnus-prin1-to-string gnus-version))
     (princ ")\n")
-    (let* ((gnus-killed-list
+    (let* ((print-length nil)
+          (gnus-killed-list
            (if (and gnus-save-killed-list
                     (stringp gnus-save-killed-list))
                (gnus-strip-killed-list)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index ba15cef..6074eae 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -11226,7 +11226,8 @@ If REVERSE, save parts that do not match TYPE."
                  (c cond)
                  (list gnus-summary-highlight))
             (while list
-              (setcdr c (cons (list (caar list) (list 'quote (cdar list))) nil))
+              (setcdr c (cons (list (caar list) (list 'quote (cdar list)))
+                             nil))
               (setq c (cdr c)
                     list (cdr list)))
             (gnus-byte-compile (list 'lambda nil cond))))))

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 6f924dc..135f51f 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1091,15 +1091,17 @@ Return the modified alist."
             (,buffer (make-string ,size 0))
             (,leng 0)
             (append nil)
-            (standard-output (lambda (c)
-                               (aset ,buffer ,leng c)
-                               (if (= ,size (setq ,leng (1+ ,leng)))
-                                   (progn (write-region ,buffer nil ,file append 'no-msg)
-                                          (setq ,leng 0
-                                                append t))))))
+            (standard-output
+            (lambda (c)
+              (aset ,buffer ,leng c)
+              (if (= ,size (setq ,leng (1+ ,leng)))
+                  (progn (write-region ,buffer nil ,file append 'no-msg)
+                         (setq ,leng 0
+                               append t))))))
        ,@body
-       (if (> ,leng 0)
-           (write-region (substring ,buffer 0 ,leng) nil ,file append 'no-msg)))))
+       (when (> ,leng 0)
+        (write-region (substring ,buffer 0 ,leng) nil ,file
+                      append 'no-msg)))))
 
 (put 'gnus-with-output-to-file 'lisp-indent-function 1)
 (put 'gnus-with-output-to-file 'edebug-form-spec '(form body))