diff -c /home/harder/gnus/lisp/gnus-picon.el /home/harder/cvsgnus/lisp/gnus-picon.el
*** /home/harder/gnus/lisp/gnus-picon.el	Thu Feb  5 03:35:28 2004
--- /home/harder/cvsgnus/lisp/gnus-picon.el	Thu Mar 25 02:54:02 2004
***************
*** 151,156 ****
--- 151,158 ----
  
  ;;; Functions that does picon transformations:
  
+ (defvar gnus-picon-style 'right)
+ 
  (defun gnus-picon-transform-address (header category)
    (gnus-with-article-headers
      (let ((addresses
***************
*** 162,168 ****
  	       (mail-encode-encoded-word-string
  		(or (mail-fetch-field header) "")))
  	     (mail-fetch-field header))))
! 	  spec file point cache)
        (dolist (address addresses)
  	(setq address (car address))
  	(when (and (stringp address)
--- 164,170 ----
  	       (mail-encode-encoded-word-string
  		(or (mail-fetch-field header) "")))
  	     (mail-fetch-field header))))
! 	  spec file point cache len)
        (dolist (address addresses)
  	(setq address (car address))
  	(when (and (stringp address)
***************
*** 193,208 ****
  
  	  (gnus-article-goto-header header)
  	  (mail-header-narrow-to-field)
! 	  (when (search-forward address nil t)
! 	    (delete-region (match-beginning 0) (match-end 0))
! 	    (setq point (point))
! 	    (while spec
! 	      (goto-char point)
! 	      (if (> (length spec) 2)
! 		  (insert ".")
! 		(if (= (length spec) 2)
! 		  (insert "@")))
! 	      (gnus-picon-insert-glyph (pop spec) category))))))))
  
  (defun gnus-picon-transform-newsgroups (header)
    (interactive)
--- 195,230 ----
  
  	  (gnus-article-goto-header header)
  	  (mail-header-narrow-to-field)
! 	  (case gnus-picon-style
! 	    (right
! 	     (when (= (length addresses) 1)
! 	       (setq len (apply '+ (mapcar (lambda (x)
! 					     (condition-case nil
! 						 (car (image-size (car x))) 
! 					       (error 0))) spec)))
! 	       (when (> len 0)
! 		 (goto-char (point-at-eol))
! 		 (insert (propertize 
! 			  " " 'display
! 			  (cons 'space (list :align-to (- (window-width) len))))))
! 	       (goto-char (point-at-eol))
! 	       (setq point (point-at-eol))
! 	       (dolist (image spec)
! 		 (unless (stringp image)
! 		   (goto-char point)
! 		   (gnus-picon-insert-glyph image category)))))
! 	    (inline
! 	      (when (search-forward address nil t)
! 		(delete-region (match-beginning 0) (match-end 0))
! 		(setq point (point))
! 		(while spec
! 		  (goto-char point)
! 		  (if (> (length spec) 2)
! 		      (insert ".")
! 		    (if (= (length spec) 2)
! 			(insert "@")))
! 		  (gnus-picon-insert-glyph (pop spec) category)))))
! 	      )))))
  
  (defun gnus-picon-transform-newsgroups (header)
    (interactive)

Diff finished.  Thu Mar 25 02:54:23 2004