*** pub/rgnus/lisp/gnus-art.el	Sat May  3 01:09:10 1997
--- rgnus/lisp/gnus-art.el	Thu May  8 17:41:28 1997
***************
*** 844,852 ****
  		    ;; Has to be present.
  		    (re-search-forward "^X-Face: " nil t))
  	  ;; We now have the area of the buffer where the X-Face is stored.
! 	  (let ((beg (point))
! 		(end (1- (re-search-forward "^\\($\\|[^ \t]\\)" nil t))))
! 	    (save-excursion
  	      ;; We display the face.
  	      (if (symbolp gnus-article-x-face-command)
  		  ;; The command is a lisp function, so we call it.
--- 844,852 ----
  		    ;; Has to be present.
  		    (re-search-forward "^X-Face: " nil t))
  	  ;; We now have the area of the buffer where the X-Face is stored.
! 	  (save-excursion
! 	    (let ((beg (point))
! 		  (end (1- (re-search-forward "^\\($\\|[^ \t]\\)" nil t))))
  	      ;; We display the face.
  	      (if (symbolp gnus-article-x-face-command)
  		  ;; The command is a lisp function, so we call it.
*** pub/rgnus/lisp/gnus-int.el	Mon Mar 24 01:28:30 1997
--- rgnus/lisp/gnus-int.el	Thu May  8 17:41:28 1997
***************
*** 375,381 ****
  	     last)))
  
  (defun gnus-request-replace-article (article group buffer)
!   (let ((func (car (gnus-find-method-for-group group))))
      (funcall (intern (format "%s-request-replace-article" func))
  	     article (gnus-group-real-name group) buffer)))
  
--- 375,381 ----
  	     last)))
  
  (defun gnus-request-replace-article (article group buffer)
!   (let ((func (car (gnus-group-name-to-method group))))
      (funcall (intern (format "%s-request-replace-article" func))
  	     article (gnus-group-real-name group) buffer)))
  
*** pub/rgnus/lisp/gnus-picon.el	Sat May  3 01:09:11 1997
--- rgnus/lisp/gnus-picon.el	Thu May  8 17:41:28 1997
***************
*** 23,28 ****
--- 23,31 ----
  
  ;;; Commentary:
  
+ ;;; TODO:
+ ;; See the comment in gnus-picons-remove
+ 
  ;;; Code:
  
  (require 'gnus)
***************
*** 32,37 ****
--- 35,42 ----
  (require 'gnus-art)
  (require 'gnus-win)
  
+ ;;; User variables:
+ 
  (defgroup picons nil
    "Show pictures of people, domains, and newsgroups (XEmacs).
  For this to work, you must add gnus-group-display-picons to the
***************
*** 113,146 ****
    :type 'boolean
    :group 'picons)
  
! (defvar gnus-picons-map (make-sparse-keymap "gnus-picons-keys")
!  "keymap to hide/show picon glyphs")
! 
! (define-key gnus-picons-map [(button2)] 'gnus-picons-toggle-extent)
  
! ;;; Internal variables.
  
  (defvar gnus-group-annotations nil
    "List of annotations added/removed when selecting/exiting a group")
  (defvar gnus-article-annotations nil
    "List of annotations added/removed when selecting an article")
  (defvar gnus-x-face-annotations nil
!   "List of annotations added/removed when selecting an article with an X-Face.")
  
  (defun gnus-picons-remove (symbol)
!   "Remove all annotations/processes in variable named SYMBOL.
  This function is careful to set it to nil before removing anything so that
  asynchronous process don't get crazy."
!   (let ((listitems (symbol-value symbol)))
!     (set symbol nil)
!     (while listitems
!       (let ((item (pop listitems)))
! 	(cond ((annotationp item)
! 	       (delete-annotation item))
! 	      ((processp item)
! 	       ;; kill the process, ignore any output.
! 	       (set-process-sentinel item (function (lambda (p e))))
! 	       (delete-process item)))))))
  
  (defun gnus-picons-remove-all ()
    "Removes all picons from the Gnus display(s)."
--- 118,200 ----
    :type 'boolean
    :group 'picons)
  
! (defcustom gnus-picons-clear-cache-on-shutdown t
!   "*Whether to clear the picons cache when exiting gnus.
! Gnus caches every picons it finds while it is running.  This saves
! some time in the search process but eats some memory.  If this
! variable is set to nil, Gnus will never clear the cache itself; you
! will have to manually call `gnus-picons-clear-cache' to clear it.
! Otherwise the cache will be cleared every time you exit Gnus."
!   :type 'boolean
!   :group 'picons)
  
! (defcustom gnus-picons-piconsearch-url nil
!   "*The url to query for picons.  Setting this to nil will disable it.
! The only plublicly available address currently known is
! http://www.cs.indiana.edu:800/piconsearch.  If you know of any other,
! please tell me so that we can list it."
!   :type '(choice (const :tag "Disable" :value nil)
! 		 (const :tag "www.cs.indiana.edu"
! 			:value "http://www.cs.indiana.edu:800/piconsearch")
! 		 (string))
!   :group 'picons)
! 
! ;;; Internal variables:
! 
! (defvar gnus-picons-processes-alist nil
!   "Picons processes currently running and their environment.")
! (defvar gnus-picons-glyph-alist nil
!   "Picons glyphs cache.
! List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.")
! (defvar gnus-picons-url-alist nil
!   "Picons file names cache.
! List of pairs (KEY . NAME) where KEY is (USER HOST DBS) and NAME is an URL.")
  
  (defvar gnus-group-annotations nil
    "List of annotations added/removed when selecting/exiting a group")
+ (defvar gnus-group-annotations-lock nil)
  (defvar gnus-article-annotations nil
    "List of annotations added/removed when selecting an article")
+ (defvar gnus-article-annotations-lock nil)
  (defvar gnus-x-face-annotations nil
!   "List of annotations added/removed when selecting an article with an
! X-Face.")
! (defvar gnus-x-face-annotations-lock nil)
! 
! (defvar gnus-picons-jobs-alist nil
!   "List of jobs that still need be done.
! This is a list of (SYM-ANN TAG ARGS...) where SYM-ANN three annotations list,
! TAG is one of `picon' or `search' indicating that the job should query a
! picon or do a search for picons file names, and ARGS is some additionnal
! arguments necessary for the job.")
! 
! (defvar gnus-picons-job-already-running nil
!   "Lock to ensure only one stream of http requests is running.")
! 
! ;;; Functions:
! 
! (defsubst gnus-picons-lock (symbol)
!   (intern (concat (symbol-name symbol) "-lock")))
  
  (defun gnus-picons-remove (symbol)
!   "Remove all annotations in variable named SYMBOL.
  This function is careful to set it to nil before removing anything so that
  asynchronous process don't get crazy."
!   ;; clear the lock
!   (set (gnus-picons-lock symbol) nil)
!   ;; clear all annotations
!   (mapc (function (lambda (item)
! 		    (if (annotationp item)
! 			(delete-annotation item))))
! 	(prog1 (symbol-value symbol)
! 	  (set symbol nil)))
!   ;; FIXME: there's a race condition here.  If a job is already
!   ;; running, it has already removed itself from this queue...  But
!   ;; will still display its picon.
!   ;; TODO: push a request to clear an annotation.  Then
!   ;; gnus-picons-next-job will be able to clean up when it gets the
!   ;; hand
!   (setq gnus-picons-jobs-alist (remassq symbol gnus-picons-jobs-alist)))
  
  (defun gnus-picons-remove-all ()
    "Removes all picons from the Gnus display(s)."
***************
*** 153,165 ****
  
  (defun gnus-get-buffer-name (variable)
    "Returns the buffer name associated with the contents of a variable."
!   (cond ((symbolp variable)
!          (let ((newvar (cdr (assq variable gnus-window-to-buffer))))
!            (cond ((symbolp newvar)
!                   (symbol-value newvar))
!                  ((stringp newvar) newvar))))
!         ((stringp variable)
!          variable)))
  
  (defun gnus-picons-prepare-for-annotations (annotations)
    "Prepare picons buffer for puting annotations memorized in ANNOTATIONS.
--- 207,218 ----
  
  (defun gnus-get-buffer-name (variable)
    "Returns the buffer name associated with the contents of a variable."
!   (cond ((symbolp variable) (let ((newvar (cdr (assq variable
! 						     gnus-window-to-buffer))))
! 			      (cond ((symbolp newvar)
! 				     (symbol-value newvar))
! 				    ((stringp newvar) newvar))))
!         ((stringp variable) variable)))
  
  (defun gnus-picons-prepare-for-annotations (annotations)
    "Prepare picons buffer for puting annotations memorized in ANNOTATIONS.
***************
*** 175,181 ****
    (if (and (eq gnus-picons-display-where 'article)
  	   gnus-picons-display-article-move-p)
        (when (search-forward "\n\n" nil t)
! 	(forward-line -1)))
    (gnus-picons-remove annotations))
  
  (defun gnus-picons-article-display-x-face ()
--- 228,237 ----
    (if (and (eq gnus-picons-display-where 'article)
  	   gnus-picons-display-article-move-p)
        (when (search-forward "\n\n" nil t)
! 	(forward-line -1))
!     (make-local-variable 'inhibit-read-only)
!     (setq buffer-read-only t
! 	  inhibit-read-only nil))
    (gnus-picons-remove annotations))
  
  (defun gnus-picons-article-display-x-face ()
***************
*** 189,210 ****
      (gnus-article-display-x-face)))
  
  (defun gnus-picons-x-face-sentinel (process event)
!   ;; don't call gnus-picons-prepare-for-annotations, it would reset
!   ;; gnus-x-face-annotations.
!   (set-buffer (get-buffer-create
! 	       (gnus-get-buffer-name gnus-picons-display-where)))
!   (gnus-add-current-to-buffer-list)
!   (goto-char (point-min))
!   (if (and (eq gnus-picons-display-where 'article)
! 	   gnus-picons-display-article-move-p)
!       (when (search-forward "\n\n" nil t)
! 	(forward-line -1)))
!   ;; If the process is still in the list, insert this icon
!   (let ((myself (member process gnus-x-face-annotations)))
!     (when myself
!       (setcar myself
! 	      (make-annotation gnus-picons-x-face-file-name nil 'text))
!       (delete-file gnus-picons-x-face-file-name))))
  
  (defun gnus-picons-display-x-face (beg end)
    "Function to display the x-face header in the picons window.
--- 245,259 ----
      (gnus-article-display-x-face)))
  
  (defun gnus-picons-x-face-sentinel (process event)
!   (let* ((env (assq process gnus-picons-processes-alist))
! 	 (annot (cdr env)))
!     (setq gnus-picons-processes-alist (remassq process
! 					       gnus-picons-processes-alist))
!     (when annot
!       (set-annotation-glyph annot
! 			    (make-glyph gnus-picons-x-face-file-name))
!       (if (memq annot gnus-x-face-annotations)
! 	  (delete-file gnus-picons-x-face-file-name)))))
  
  (defun gnus-picons-display-x-face (beg end)
    "Function to display the x-face header in the picons window.
***************
*** 216,232 ****
  	(save-excursion
  	  (gnus-picons-prepare-for-annotations 'gnus-x-face-annotations)
  	  (setq gnus-x-face-annotations
! 		(cons (make-annotation (concat "X-Face: "
! 					       (buffer-substring beg end buf))
  				       nil 'text)
  		      gnus-x-face-annotations))))
      ;; convert the x-face header to a .xbm file
      (let* ((process-connection-type nil)
! 	   (process (start-process "gnus-x-face" nil
! 				   shell-file-name shell-command-switch
! 				   gnus-picons-convert-x-face)))
        (process-kill-without-query process)
-       (setq gnus-x-face-annotations (list process))
        (set-process-sentinel process 'gnus-picons-x-face-sentinel)
        (process-send-region process beg end)
        (process-send-eof process))))
--- 265,287 ----
  	(save-excursion
  	  (gnus-picons-prepare-for-annotations 'gnus-x-face-annotations)
  	  (setq gnus-x-face-annotations
! 		(cons (make-annotation
! 		       (vector 'xface
! 			       :data (concat "X-Face: "
! 					     (buffer-substring beg end buf)))
  				       nil 'text)
  		      gnus-x-face-annotations))))
      ;; convert the x-face header to a .xbm file
      (let* ((process-connection-type nil)
! 	   (annot (save-excursion
! 		    (gnus-picons-prepare-for-annotations
! 		     'gnus-x-face-annotations)
! 		    (make-annotation nil nil 'text)))
! 	   (process (start-process-shell-command "gnus-x-face" nil 
! 						 gnus-picons-convert-x-face)))
!       (push annot gnus-x-face-annotations)
!       (push (cons process annot) gnus-picons-processes-alist)
        (process-kill-without-query process)
        (set-process-sentinel process 'gnus-picons-x-face-sentinel)
        (process-send-region process beg end)
        (process-send-eof process))))
***************
*** 238,273 ****
      (when (and (featurep 'xpm)
  	       (or (not (fboundp 'device-type)) (equal (device-type) 'x))
  	       (setq from (mail-fetch-field "from"))
! 	       (setq from (downcase
! 			   (or (cadr (mail-extract-address-components from))
! 			       "")))
  	       (or (setq at-idx (string-match "@" from))
  		   (setq at-idx (length from))))
        (save-excursion
! 	(let ((username (substring from 0 at-idx))
  	      (addrs (if (eq at-idx (length from))
  			 (if gnus-local-domain
! 			     (message-tokenize-header gnus-local-domain ".")
! 			   nil)
  		       (message-tokenize-header (substring from (1+ at-idx))
  						"."))))
  	  (gnus-picons-prepare-for-annotations 'gnus-article-annotations)
! 	  (setq gnus-article-annotations
! 		(nconc gnus-article-annotations
! 		       ;; look for domain paths.
! 		       (gnus-picons-display-pairs
! 			(gnus-picons-lookup-pairs addrs
! 					       gnus-picons-domain-directories)
! 			(not (or gnus-picons-display-as-address
! 				 gnus-article-annotations))
! 			nil "." t)
! 		       ;; add an '@' if displaying as address
! 		       (if  (and gnus-picons-display-as-address addrs)
! 			 (list (make-annotation "@" nil 'text nil nil nil t)))
! 		       ;; then do user directories,
! 		       (gnus-picons-display-picon-or-name
! 			(gnus-picons-lookup-user (downcase username) addrs)
! 			username nil t)))
  
  	  (add-hook 'gnus-summary-exit-hook 'gnus-picons-remove-all))))))
  
--- 293,330 ----
      (when (and (featurep 'xpm)
  	       (or (not (fboundp 'device-type)) (equal (device-type) 'x))
  	       (setq from (mail-fetch-field "from"))
! 	       (setq from (downcase (or (cadr (mail-extract-address-components
! 					       from))
! 					"")))
  	       (or (setq at-idx (string-match "@" from))
  		   (setq at-idx (length from))))
        (save-excursion
! 	(let ((username (downcase (substring from 0 at-idx)))
  	      (addrs (if (eq at-idx (length from))
  			 (if gnus-local-domain
! 			     (message-tokenize-header gnus-local-domain "."))
  		       (message-tokenize-header (substring from (1+ at-idx))
  						"."))))
  	  (gnus-picons-prepare-for-annotations 'gnus-article-annotations)
! 	  (if (null gnus-picons-piconsearch-url)
! 	      (setq gnus-article-annotations
! 		    (nconc gnus-article-annotations
! 			   (gnus-picons-display-pairs
! 			    (gnus-picons-lookup-pairs
! 			     addrs gnus-picons-domain-directories)
! 			    (not (or gnus-picons-display-as-address
! 				     gnus-article-annotations))
! 			    "." t)
! 			   (if (and gnus-picons-display-as-address addrs)
! 			       (list (make-annotation [string :data "@"] nil
! 						      'text nil nil nil t)))
! 			   (gnus-picons-display-picon-or-name
! 			    (gnus-picons-lookup-user username addrs)
! 			    username t)))
! 	    (push (list 'gnus-article-annotations 'search username addrs
! 			gnus-picons-domain-directories t)
! 		  gnus-picons-jobs-alist)
! 	    (gnus-picons-next-job))
  
  	  (add-hook 'gnus-summary-exit-hook 'gnus-picons-remove-all))))))
  
***************
*** 278,336 ****
  	     (or (not (fboundp 'device-type)) (equal (device-type) 'x)))
      (save-excursion
        (gnus-picons-prepare-for-annotations 'gnus-group-annotations)
!       (setq gnus-group-annotations
! 	    (gnus-picons-display-pairs
! 	     (gnus-picons-lookup-pairs (reverse (message-tokenize-header
! 					      gnus-newsgroup-name "."))
! 				    gnus-picons-news-directory)
! 	     t nil "."))
        (add-hook 'gnus-summary-exit-hook 'gnus-picons-remove-all))))
  
! (defun gnus-picons-make-path (dir subdirs)
!   "Make a directory name from a base DIR and a list of SUBDIRS.
! Returns a directory name build by concatenating DIR and all elements of
! SUBDIRS with \"/\" between elements."
!   (while subdirs
!     (setq dir (file-name-as-directory (concat dir (pop subdirs)))))
!   dir)
! 
! (defsubst gnus-picons-try-suffixes (file)
!   (let ((suffixes gnus-picons-file-suffixes)
! 	f)
!     (while (and suffixes
! 		(not (file-exists-p (setq f (concat file (pop suffixes))))))
!       (setq f nil))
!     f))
  
  (defun gnus-picons-lookup (addrs dirs)
    "Lookup the picon for ADDRS in databases DIRS.
  Returns the picon filename or NIL if none found."
    (let (result)
      (while (and dirs (null result))
!       (setq result
! 	    (gnus-picons-try-suffixes
! 	     (expand-file-name "face."
! 			       (gnus-picons-make-path
! 				(file-name-as-directory
! 				 (concat
! 				  (file-name-as-directory gnus-picons-database)
! 				  (pop dirs)))
! 				(reverse addrs))))))
      result))
  
  (defun gnus-picons-lookup-user-internal (user domains)
    (let ((dirs gnus-picons-user-directories)
! 	picon)
      (while (and dirs (null picon))
!       (let ((dir (list (pop dirs)))
! 	    (domains domains))
! 	(while (and domains (null picon))
! 	  (setq picon (gnus-picons-lookup (cons user domains) dir))
! 	  (pop domains))
! 	;; Also make a try MISC subdir
! 	(unless picon
! 	  (setq picon (gnus-picons-lookup (list user "MISC") dir)))))
! 
      picon))
  
  (defun gnus-picons-lookup-user (user domains)
--- 335,384 ----
  	     (or (not (fboundp 'device-type)) (equal (device-type) 'x)))
      (save-excursion
        (gnus-picons-prepare-for-annotations 'gnus-group-annotations)
!       (if (null gnus-picons-piconsearch-url)
! 	  (setq gnus-group-annotations
! 		(gnus-picons-display-pairs
! 		 (gnus-picons-lookup-pairs (reverse (message-tokenize-header
! 						     gnus-newsgroup-name "."))
! 					   gnus-picons-news-directory)
! 		 t "."))
! 	(push (list 'gnus-group-annotations 'search nil
! 		    (message-tokenize-header gnus-newsgroup-name ".")
! 		    (if (listp gnus-picons-news-directory)
! 			gnus-picons-news-directory
! 		      (list gnus-picons-news-directory))
! 		    nil)
! 	      gnus-picons-jobs-alist)
! 	(gnus-picons-next-job))
! 
        (add-hook 'gnus-summary-exit-hook 'gnus-picons-remove-all))))
  
! (defsubst gnus-picons-lookup-internal (addrs dir)
!   (setq dir (expand-file-name dir gnus-picons-database))
!   (gnus-picons-try-face (dolist (part (reverse addrs) dir)
! 			  (setq dir (expand-file-name part dir)))))
  
  (defun gnus-picons-lookup (addrs dirs)
    "Lookup the picon for ADDRS in databases DIRS.
  Returns the picon filename or NIL if none found."
    (let (result)
      (while (and dirs (null result))
!       (setq result (gnus-picons-lookup-internal addrs (pop dirs))))
      result))
  
  (defun gnus-picons-lookup-user-internal (user domains)
    (let ((dirs gnus-picons-user-directories)
! 	domains-tmp dir picon)
      (while (and dirs (null picon))
!       (setq domains-tmp domains
! 	    dir (pop dirs))
!       (while (and domains-tmp
! 		  (null (setq picon (gnus-picons-lookup-internal
! 				     (cons user domains-tmp) dir))))
! 	(pop domains-tmp))
!       ;; Also make a try in MISC subdir
!       (unless picon
! 	(setq picon (gnus-picons-lookup-internal (list user "MISC") dir))))
      picon))
  
  (defun gnus-picons-lookup-user (user domains)
***************
*** 345,436 ****
  Returns a list of PAIRS whose CAR is the picon filename or NIL if
  none, and whose CDR is the corresponding element of DOMAINS."
    (let (picons)
      (while domains
!       (push (list (gnus-picons-lookup (cons "unknown" domains)
! 				      (if (listp directories)
! 					  directories
! 					(list directories)))
  		  (pop domains))
  	    picons))
      picons))
  
! (defun gnus-picons-display-picon-or-name (picon name &optional xface-p right-p)
!   (if picon
!       (gnus-picons-try-to-find-face picon xface-p name right-p)
!     (list (make-annotation name nil 'text nil nil nil right-p))))
  
! (defun gnus-picons-display-pairs (pairs &optional bar-p xface-p dot-p right-p)
    "Display picons in list PAIRS."
    (let ((bar (and bar-p (or gnus-picons-display-as-address
! 			  (annotations-in-region (point)
! 						 (min (point-max) (1+ (point)))
! 						 (current-buffer)))))
  	(domain-p (and gnus-picons-display-as-address dot-p))
! 	picons)
      (while pairs
!       (let ((pair (pop pairs)))
! 	(setq picons (nconc (if (and domain-p picons (not right-p))
! 				(list (make-annotation
! 				       dot-p nil 'text nil nil nil right-p)))
! 			    (gnus-picons-display-picon-or-name (car pair)
! 							       (cadr pair)
! 							       xface-p
! 							       right-p)
! 			    (if (and domain-p pairs right-p)
! 				(list (make-annotation
! 				       dot-p nil 'text nil nil nil right-p)))
! 			    (when (and bar domain-p)
! 			      (setq bar nil)
! 			      (gnus-picons-try-to-find-face
! 			       (expand-file-name "bar.xbm"
! 						 gnus-xmas-glyph-directory)
! 			       nil nil t))
! 			    picons))))
      picons))
  
! (defvar gnus-picons-glyph-alist nil)
  
! (defun gnus-picons-try-to-find-face (path &optional xface-p part rightp)
!   "If PATH exists, display it as a bitmap.  Returns t if succeeded."
!   (let ((glyph (and (not xface-p)
! 		    (cdr (assoc path gnus-picons-glyph-alist)))))
!     (when (or glyph (file-exists-p path))
!       (unless glyph
! 	(setq glyph (make-glyph path))
! 	(unless xface-p
! 	  (push (cons path glyph) gnus-picons-glyph-alist))
! 	(set-glyph-face glyph 'default))
!       (let ((new (make-annotation glyph (point) 'text nil nil nil rightp)))
! 	(nconc
! 	 (list new)
! 	 (when (and (eq major-mode 'gnus-article-mode)
! 		    (not gnus-picons-display-as-address)
! 		    (not part))
! 	   (list (make-annotation " " (point) 'text nil nil nil rightp)))
! 	 (when (and part gnus-picons-display-as-address)
! 	   (let ((txt (make-annotation part (point) 'text nil nil nil rightp)))
! 	     (hide-annotation txt)
! 	     (set-extent-property txt 'its-partner new)
! 	     (set-extent-property txt 'keymap gnus-picons-map)
! 	     (set-extent-property txt 'mouse-face gnus-article-mouse-face)
! 	     (set-extent-property new 'its-partner txt)
! 	     (set-extent-property new 'keymap gnus-picons-map)
! 	     (list txt))))))))
! 
! (defun gnus-picons-toggle-extent (event)
!   "Toggle picon glyph at given point"
    (interactive "e")
!   (let* ((ant1 (event-glyph-extent event))
! 	 (ant2 (extent-property ant1 'its-partner)))
!     (when (and (annotationp ant1) (annotationp ant2))
!       (reveal-annotation ant2)
!       (hide-annotation ant1))))
  
  (gnus-add-shutdown 'gnus-picons-close 'gnus)
  
  (defun gnus-picons-close ()
    "Shut down the picons."
!   (setq gnus-picons-glyph-alist nil))
  
  (provide 'gnus-picon)
  
--- 393,727 ----
  Returns a list of PAIRS whose CAR is the picon filename or NIL if
  none, and whose CDR is the corresponding element of DOMAINS."
    (let (picons)
+     (setq directories (if (listp directories)
+ 			  directories
+ 			(list directories)))
      (while domains
!       (push (list (gnus-picons-lookup (cons "unknown" domains) directories)
  		  (pop domains))
  	    picons))
      picons))
  
! (defun gnus-picons-display-picon-or-name (picon name &optional right-p)
!   (cond (picon (gnus-picons-display-glyph picon name right-p))
! 	(gnus-picons-display-as-address (list (make-annotation
! 					       (vector 'string :data name)
! 					       nil 'text
! 					       nil nil nil right-p)))))
  
! (defun gnus-picons-display-pairs (pairs &optional bar-p dot-p right-p)
    "Display picons in list PAIRS."
    (let ((bar (and bar-p (or gnus-picons-display-as-address
! 			    (annotations-in-region (point)
! 						   (min (point-max)
! 							(1+ (point)))
! 						   (current-buffer)))))
  	(domain-p (and gnus-picons-display-as-address dot-p))
! 	pair picons)
      (while pairs
!       (setq pair (pop pairs)
! 	    picons (nconc (if (and domain-p picons (not right-p))
! 			      (list (make-annotation
! 				     (vector 'string :data dot-p)
! 				     nil 'text nil nil nil right-p)))
! 			  (gnus-picons-display-picon-or-name (car pair)
! 							     (cadr pair)
! 							     right-p)
! 			  (if (and domain-p pairs right-p)
! 			      (list (make-annotation
! 				     (vector 'string :data dot-p)
! 				     nil 'text nil nil nil right-p)))
! 			  (when (and bar domain-p)
! 			    (setq bar nil)
! 			    (gnus-picons-display-glyph
! 			     (gnus-picons-try-face gnus-xmas-glyph-directory
! 						   "bar.")
! 			     nil t))
! 			  picons)))
      picons))
  
! (defun gnus-picons-try-face (dir &optional filebase)
!   (let* ((dir (file-name-as-directory dir))
! 	 (filebase (or filebase "face."))
! 	 (key (concat dir filebase))
! 	 (glyph (cdr (assoc key gnus-picons-glyph-alist)))
! 	 (suffixes gnus-picons-file-suffixes)
! 	 f)
!     (while (and suffixes (null glyph))
!       (when (file-exists-p (setq f (expand-file-name (concat filebase
! 								 (pop suffixes))
! 							 dir)))
! 	(setq glyph (make-glyph f))
! 	(push (cons key glyph) gnus-picons-glyph-alist)))
!     glyph))
! 
! (defun gnus-picons-display-glyph (glyph &optional part rightp)
!   (let ((new (make-annotation glyph (point) 'text nil nil nil rightp)))
!     (when (and part gnus-picons-display-as-address)
!       (set-annotation-data new (cons new
! 				     (make-glyph (vector 'string :data part))))
!       (set-annotation-action new 'gnus-picons-action-toggle))
!     (nconc
!      (list new)
!      (if (and (eq major-mode 'gnus-article-mode)
! 	      (not gnus-picons-display-as-address)
! 	      (not part))
! 	 (list (make-annotation [string :data " "]
! 				(point) 'text nil nil nil rightp))))))
  
! (defun gnus-picons-action-toggle (data)
!   "Toggle annotation"
    (interactive "e")
!   (let* ((annot (car data))
! 	 (glyph (annotation-glyph annot)))
!     (set-annotation-glyph annot (cdr data))
!     (set-annotation-data annot (cons annot glyph))))
! 
! (defun gnus-picons-clear-cache ()
!   "Clear the picons cache"
!   (interactive)
!   (setq gnus-picons-glyph-alist nil))
  
  (gnus-add-shutdown 'gnus-picons-close 'gnus)
  
  (defun gnus-picons-close ()
    "Shut down the picons."
!   (if gnus-picons-clear-cache-on-shutdown
!       (gnus-picons-clear-cache)))
! 
! ;;; Query a remote DB.  This requires some stuff from w3 !
! 
! (require 'url)
! (require 'w3-forms)
! 
! (defun gnus-picons-url-retrieve (url fn arg)
!   (let ((old-asynch (default-value 'url-be-asynchronous))
! 	(url-working-buffer (generate-new-buffer " *picons*"))
! 	(url-request-method nil)
! 	(url-package-name "Gnus")
! 	(url-package-version gnus-version-number))
!     (setq-default url-be-asynchronous t)
!     (save-excursion
!       (set-buffer url-working-buffer)
!       (setq url-be-asynchronous t
! 	    url-show-status nil
! 	    url-current-callback-data arg
! 	    url-current-callback-func fn)
!       (url-retrieve url t))
!     (setq-default url-be-asynchronous old-asynch)))
! 
! (defun gnus-picons-make-glyph (type)
!   "Make a TYPE glyph using current buffer as data.  Handles xbm nicely."
!   (cond ((null type) nil)
! 	((eq type 'xbm) (let ((fname (make-temp-name "/tmp/picon")))
! 			  (write-region (point-min) (point-max) fname
! 					nil 'quiet)
! 			  (prog1 (make-glyph (vector 'xbm :file fname))
! 			    (delete-file fname))))
! 	(t (make-glyph (vector type :data (buffer-string))))))
! 
! ;;; Parsing of piconsearch result page.
! 
! ;; Assumes:
! ;; 1 - each value field has the form: "<strong>key</strong> = <kbd>value</kbd>"
! ;; 2 - a "<p>" separates the keywords from the results
! ;; 3 - every results begins by the path within the database at the beginning
! ;;     of the line in raw text.
! ;; 3b - and the href following it is the preferred image type.
! 
! ;; if 1 or 2 is not met, it will probably cause an error.  The other
! ;; will go undetected
! 
! (defun gnus-picons-parse-value (name)
!   (goto-char (point-min))
!   (re-search-forward (concat "<strong>"
! 			     (regexp-quote name)
! 			     "</strong> *= *<kbd> *\\([^ <][^<]*\\) *</kbd>"))
!   (buffer-substring (match-beginning 1) (match-end 1)))
! 
! (defun gnus-picons-parse-filenames ()
!   ;; returns an alist of ((USER ADDRS DB) . URL)
!   (let* ((case-fold-search t)
! 	 (user (gnus-picons-parse-value "user"))
! 	 (host (gnus-picons-parse-value "host"))
! 	 (dbs (message-tokenize-header (gnus-picons-parse-value "db") " "))
! 	 (start-re
! 	  (concat
! 	   ;; dbs
! 	   "^\\(" (mapconcat 'identity dbs "\\|") "\\)/"
! 	   ;; host
! 	   "\\(\\(" (replace-in-string host "\\." "/\\|" t) "/\\|MISC/\\)*\\)"
! 	   ;; user
! 	   "\\(" (regexp-quote user) "\\|unknown\\)/"
! 	   "face\\."))
! 	 cur-db cur-host cur-user types res)
!     ;; now point will be somewhere in the header.  Find beginning of
!     ;; entries
!     (re-search-forward "<p>[ \t\n]*")
!     (while (re-search-forward start-re nil t)
!       (setq cur-db (buffer-substring (match-beginning 1) (match-end 1))
! 	    cur-host (buffer-substring (match-beginning 2) (match-end 2))
! 	    cur-user (buffer-substring (match-beginning 4) (match-end 4))
! 	    cur-host (nreverse (message-tokenize-header cur-host "/")))
!       ;; XXX - KLUDGE: there is a blank picon in news/MISC/unknown
!       (unless (and (string-equal cur-db "news")
! 		   (string-equal cur-user "unknown")
! 		   (equal cur-host '("MISC")))
! 	;; ok now we have found an entry (USER HOST DB), find the
! 	;; corresponding picon URL
! 	(save-restriction
! 	  ;; restrict region to this entry
! 	  (narrow-to-region (point) (search-forward "<br>"))
! 	  (goto-char (point-min))
! 	  (setq types gnus-picons-file-suffixes)
! 	  (while (and types
! 		      (not (re-search-forward
! 			    (concat "<a[ \t\n]+href=\"\\([^\"]*\\."
! 				    (regexp-quote (car types)) "\\)\"")
! 			    nil t)))
! 	    (pop types))
! 	  (push (cons (list cur-user cur-host cur-db)
! 		      (buffer-substring (match-beginning 1) (match-end 1)))
! 		res))))
!     (nreverse res)))
! 
! ;;; picon network display functions :
! 
! (defun gnus-picons-network-display-internal (sym-ann glyph part right-p)
!   (set-buffer
!    (get-buffer-create (gnus-get-buffer-name gnus-picons-display-where)))
!   (set sym-ann (nconc (symbol-value sym-ann)
! 		      (gnus-picons-display-picon-or-name glyph part right-p)))
!   (gnus-picons-next-job-internal))
! 
! (defun gnus-picons-network-display-callback (url part sym-ann right-p)
!   (let ((glyph (gnus-picons-make-glyph (cdr (assoc url-current-mime-type
! 						   w3-image-mappings)))))
!     (kill-buffer (current-buffer))
!     (push (cons url glyph) gnus-picons-glyph-alist)
!     (gnus-picons-network-display-internal sym-ann glyph part right-p)))
! 
! (defun gnus-picons-network-display (url part sym-ann right-p)
!   (let ((cache (assoc url gnus-picons-glyph-alist)))
!     (if (or cache (null url))
! 	(gnus-picons-network-display-internal sym-ann (cdr cache) part right-p)
!       (gnus-picons-url-retrieve url 'gnus-picons-network-display-callback
! 				(list url part sym-ann right-p)))))
! 
! ;;; search job functions
! 
! (defun gnus-picons-network-search-internal (user addrs dbs sym-ann right-p
! 						 &optional fnames)
!   (let (curkey dom pfx url dbs-tmp cache new-jobs)
!     ;; First do the domain search
!     (dolist (part (if right-p
! 		      (reverse addrs)
! 		    addrs))
!       (setq pfx (nconc (list part) pfx)
! 	    dom (cond ((and dom right-p) (concat part "." dom))
! 		      (dom (concat dom "." part))
! 		      (t part))
! 	    curkey (list "unknown" dom dbs))
!       (when (null (setq cache (assoc curkey gnus-picons-url-alist)))
! 	;; This one is not yet in the cache, create a new entry
! 	;; Search for an entry
! 	(setq dbs-tmp dbs
! 	      url nil)
! 	(while (and dbs-tmp (null url))
! 	  (setq url (or (cdr (assoc (list "unknown" pfx (car dbs-tmp)) fnames))
! 			(and (eq dom part)
! 			     ;; This is the first component.  Try the
! 			     ;; catch-all MISC component
! 			     (cdr (assoc (list "unknown"
! 					       '("MISC")
! 					       (car dbs-tmp))
! 					 fnames)))))
! 	  (pop dbs-tmp))
! 	(push (setq cache (cons curkey url)) gnus-picons-url-alist))
!       ;; Put this glyph in the job list
!       (if (and (not (eq dom part)) gnus-picons-display-as-address)
! 	  (push (list sym-ann "." right-p) new-jobs))
!       (push (list sym-ann 'picon (cdr cache) part right-p) new-jobs))
!     ;; next, the user search
!     (when user
!       (setq curkey (list user dom gnus-picons-user-directories))
!       (if (null (setq cache (assoc curkey gnus-picons-url-alist)))
! 	  (let ((users (list user "unknown"))
! 		dirs usr domains-tmp dir picon)
! 	    (while (and users (null picon))
! 	      (setq dirs gnus-picons-user-directories
! 		    usr (pop users))
! 	      (while (and dirs (null picon))
! 		(setq domains-tmp addrs
! 		      dir (pop dirs))
! 		(while (and domains-tmp
! 			    (null (setq picon (assoc (list usr domains-tmp dir)
! 						     fnames))))
! 		  (pop domains-tmp))
! 		(unless picon
! 		  (setq picon (assoc (list usr '("MISC") dir) fnames)))))
! 	    (push (setq cache (cons curkey (cdr picon)))
! 		  gnus-picons-url-alist)))
!       (if (and gnus-picons-display-as-address new-jobs)
! 	  (push (list sym-ann "@" right-p) new-jobs))
!       (push (list sym-ann 'picon (cdr cache) user right-p) new-jobs))
!     (setq gnus-picons-jobs-alist (nconc (nreverse new-jobs)
! 					gnus-picons-jobs-alist))
!     (gnus-picons-next-job-internal)))
! 
! (defun gnus-picons-network-search-callback (user addrs dbs sym-ann right-p)
!   (gnus-picons-network-search-internal user addrs dbs sym-ann right-p
! 				       (prog1 (gnus-picons-parse-filenames)
! 					 (kill-buffer (current-buffer)))))
! 
! (defun gnus-picons-network-search (user addrs dbs sym-ann right-p)
!   (let* ((host (mapconcat 'identity addrs "."))
! 	 (key (list (or user "unknown") host (if user
! 						  gnus-picons-user-directories
! 						dbs)))
! 	 (cache (assoc key gnus-picons-url-alist)))
!     (if (null cache)
! 	(gnus-picons-url-retrieve
! 	 (concat gnus-picons-piconsearch-url
! 		 "?user=" (w3-form-encode-xwfu (or user "unknown"))
! 		 "&host=" (w3-form-encode-xwfu host)
! 		 "&db=" (mapconcat 'w3-form-encode-xwfu
! 				   (if user
! 				       (append dbs
! 					       gnus-picons-user-directories)
! 				     dbs)
! 				   "+"))
! 	 'gnus-picons-network-search-callback
! 	 (list user addrs dbs sym-ann right-p))
!       (gnus-picons-network-search-internal user addrs dbs sym-ann right-p))))
! 
! ;;; Main jobs dispatcher function
! ;; Given that XEmacs is not really multi threaded, this locking should
! ;; be sufficient
! 
! (defun gnus-picons-next-job-internal ()
!   (if gnus-picons-jobs-alist
!       (let* ((job (pop gnus-picons-jobs-alist))
! 	     (sym-ann (pop job))
! 	     (tag (pop job)))
! 	(if tag
! 	    (cond ((stringp tag);; (SYM-ANN "..." RIGHT-P)
! 		   (gnus-picons-network-display-internal sym-ann nil tag
! 							 (pop job)))
! 		  ((eq 'search tag);; (SYM-ANN 'search USER ADDRS DBS RIGHT-P)
! 		   (gnus-picons-network-search
! 		    (pop job) (pop job) (pop job) sym-ann (pop job)))
! 		  ((eq 'picon tag);; (SYM-ANN 'picon URL PART RIGHT-P)
! 		   (gnus-picons-network-display
! 		    (pop job) (pop job) sym-ann (pop job)))
! 		  (t (error "Unknown picon job tag %s" tag)))))
!     (setq gnus-picons-job-already-running nil)))
! 
! (defun gnus-picons-next-job ()
!   "Start processing the job queue."
!   (unless gnus-picons-job-already-running
!     (setq gnus-picons-job-already-running t)
!     (gnus-picons-next-job-internal)))
  
  (provide 'gnus-picon)
  
*** pub/rgnus/lisp/gnus-start.el	Thu Apr 10 22:15:07 1997
--- rgnus/lisp/gnus-start.el	Thu May  8 17:41:29 1997
***************
*** 861,867 ****
  
      ;; See whether we need to read the description file.
      (when (and (boundp 'gnus-group-line-format)
! 	       (string-match "%[-,0-9]*D" gnus-group-line-format)
  	       (not gnus-description-hashtb)
  	       (not dont-connect)
  	       gnus-read-active-file)
--- 861,868 ----
  
      ;; See whether we need to read the description file.
      (when (and (boundp 'gnus-group-line-format)
! 	       (let ((case-fold-search nil))
! 		 (string-match "%[-,0-9]*D" gnus-group-line-format))
  	       (not gnus-description-hashtb)
  	       (not dont-connect)
  	       gnus-read-active-file)
*** pub/rgnus/lisp/gnus-sum.el	Sat May  3 01:09:12 1997
--- rgnus/lisp/gnus-sum.el	Thu May  8 17:41:30 1997
***************
*** 4815,4820 ****
--- 4815,4823 ----
  		   (not non-destructive))
  	  (setq gnus-newsgroup-scored nil))
  	;; Set the new ranges of read articles.
+ 	(save-excursion
+ 	  (set-buffer gnus-group-buffer)
+ 	  (gnus-undo-force-boundary))
  	(gnus-update-read-articles
  	 group (append gnus-newsgroup-unreads gnus-newsgroup-unselected))
  	;; Set the current article marks.
***************
*** 8448,8454 ****
      (gnus-article-setup-buffer)
      (set-buffer gnus-article-buffer)
      (setq buffer-read-only nil)
!     (let ((command (if automatic command (read-string "Command: " command))))
        (erase-buffer)
        (insert "$ " command "\n\n")
        (if gnus-view-pseudo-asynchronously
--- 8451,8458 ----
      (gnus-article-setup-buffer)
      (set-buffer gnus-article-buffer)
      (setq buffer-read-only nil)
!     (let ((command (if automatic command
! 		     (read-string "Command: " (cons command 0)))))
        (erase-buffer)
        (insert "$ " command "\n\n")
        (if gnus-view-pseudo-asynchronously
***************
*** 8641,8647 ****
  	(push (cons prev (cdr active)) read))
        (save-excursion
  	(set-buffer gnus-group-buffer)
- 	(gnus-undo-force-boundary)
  	(gnus-undo-register
  	  `(progn
  	     (gnus-info-set-marks ',info ',(gnus-info-marks info) t)
--- 8645,8650 ----
*** pub/rgnus/lisp/gnus.el	Sat May  3 01:09:12 1997
--- rgnus/lisp/gnus.el	Thu May  8 17:41:30 1997
***************
*** 226,232 ****
    :link '(custom-manual "(gnus)Exiting Gnus")
    :group 'gnus)
  
! (defconst gnus-version-number "5.4.50"
    "Version number for this version of Gnus.")
  
  (defconst gnus-version (format "Gnus v%s" gnus-version-number)
--- 226,232 ----
    :link '(custom-manual "(gnus)Exiting Gnus")
    :group 'gnus)
  
! (defconst gnus-version-number "5.4.51"
    "Version number for this version of Gnus.")
  
  (defconst gnus-version (format "Gnus v%s" gnus-version-number)
*** pub/rgnus/lisp/message.el	Thu May  1 18:03:09 1997
--- rgnus/lisp/message.el	Thu May  8 17:41:31 1997
***************
*** 3594,3607 ****
        (insert string)
        (if (not comp)
  	  (message "No matching groups")
! 	(pop-to-buffer "*Completions*")
! 	(buffer-disable-undo (current-buffer))
! 	(let ((buffer-read-only nil))
! 	  (erase-buffer)
! 	  (let ((standard-output (current-buffer)))
! 	    (display-completion-list (sort completions 'string<)))
! 	  (goto-char (point-min))
! 	  (pop-to-buffer cur)))))))
  
  ;;; Help stuff.
  
--- 3594,3608 ----
        (insert string)
        (if (not comp)
  	  (message "No matching groups")
! 	(save-selected-window
! 	  (pop-to-buffer "*Completions*")
! 	  (buffer-disable-undo (current-buffer))
! 	  (let ((buffer-read-only nil))
! 	    (erase-buffer)
! 	    (let ((standard-output (current-buffer)))
! 	      (display-completion-list (sort completions 'string<)))
! 	    (goto-char (point-min))
! 	    (delete-region (point) (progn (forward-line 3) (point))))))))))
  
  ;;; Help stuff.
  
*** pub/rgnus/lisp/nnfolder.el	Sat May  3 01:09:13 1997
--- rgnus/lisp/nnfolder.el	Thu May  8 17:41:31 1997
***************
*** 508,514 ****
        (nnmail-save-active nnfolder-group-alist nnfolder-active-file))
  
      (if dont-check
! 	(setq nnfolder-current-group group)
        (let (inf file)
  	;; If we have to change groups, see if we don't already have the
  	;; folder in memory.  If we do, verify the modtime and destroy
--- 508,515 ----
        (nnmail-save-active nnfolder-group-alist nnfolder-active-file))
  
      (if dont-check
! 	(setq nnfolder-current-group group
! 	      nnfolder-current-folder nil)
        (let (inf file)
  	;; If we have to change groups, see if we don't already have the
  	;; folder in memory.  If we do, verify the modtime and destroy
*** pub/rgnus/lisp/nnmh.el	Thu May  1 18:03:09 1997
--- rgnus/lisp/nnmh.el	Thu May  8 17:41:32 1997
***************
*** 182,188 ****
  (deffoo nnmh-request-list (&optional server dir)
    (nnheader-insert "")
    (let ((nnmh-toplev
! 	 (or dir (file-truename (file-name-as-directory nnmh-directory)))))
      (nnmh-request-list-1 nnmh-toplev))
    (setq nnmh-group-alist (nnmail-get-active))
    t)
--- 182,188 ----
  (deffoo nnmh-request-list (&optional server dir)
    (nnheader-insert "")
    (let ((nnmh-toplev
! 	 (file-truename (or dir (file-name-as-directory nnmh-directory)))))
      (nnmh-request-list-1 nnmh-toplev))
    (setq nnmh-group-alist (nnmail-get-active))
    t)
*** pub/rgnus/lisp/ChangeLog	Sat May  3 01:09:10 1997
--- rgnus/lisp/ChangeLog	Thu May  8 17:41:27 1997
***************
*** 1,3 ****
--- 1,93 ----
+ Thu May  8 17:37:38 1997  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+ 
+ 	* gnus.el: Gnus v5.4.51 is released.
+ 
+ Thu May  8 15:58:43 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+ 
+ 	* gnus-sum.el (gnus-execute-command): Place point at start of
+ 	prompt. 
+ 
+ 	* gnus-int.el (gnus-request-replace-article): Don't bug out on
+ 	unknown groups.
+ 
+ 	* gnus-sum.el (gnus-summary-update-info): Force undo boundary here.
+ 	(gnus-update-read-articles): ... and not here.
+ 
+ 	* gnus-art.el (article-display-x-face): Would only show one X-Face.
+ 
+ Wed May  7 05:23:20 1997  Kim-Minh Kaplan  <kimminh.kaplan@utopia.eunet.fr>
+ 
+ 	* gnus-picon.el: (gnus-picons-url-alist): new variable.
+ 	(gnus-picons-jobs-alist): new variable.
+ 	(gnus-picons-remove): clean this new variable. FIXME: race
+ 	condition.
+ 	(gnus-picons-job-already-running): new variable.
+ 	(gnus-article-display-picons): use the job queue if using the
+ 	network.
+ 	(gnus-group-display-picons): ditto.
+ 	(gnus-picons-make-path): function deleted.
+ 	(gnus-picons-lookup-internal): modified accordingly.
+ 	(gnus-picons-lookup-user-internal): take the LETs out of the
+ 	loops.
+ 	(gnus-picons-lookup-pairs): take constant calculation outside of
+ 	loop.
+ 	(gnus-picons-display-picon-or-name): use COND instead of nested IFs
+ 	(gnus-picons-display-pairs): take the LET outside of loop.
+ 	(gnus-picons-try-face): ditto.
+ 	(gnus-picons-users-image-alist): variable deleted.
+ 	(gnus-picons-clear-cache): don't clear it.
+ 	(gnus-picons-retrieve-limit): variable deleted.
+ 	(gnus-picons-url-retrieve): clear url-request-method
+ 	(gnus-picons-retrieve-user-callback): function deleted.
+ 	(gnus-picons-retrieve-user): function deleted.
+ 	(gnus-picons-retrieve-domain-callback): function deleted
+ 	(gnus-picons-retrieve-domain-internal): function deleted.
+ 	(gnus-picons-parse-value): new function.
+ 	(gnus-picons-parse-filenames): new function.
+ 	(gnus-picons-network-display-internal): new function.
+ 	(gnus-picons-network-display-callback): new function.
+ 	(gnus-picons-network-display): new function.
+ 	(gnus-picons-network-search-internal): new function.
+ 	(gnus-picons-network-search-callback): new function.
+ 	(gnus-picons-network-search): new function.
+ 	(gnus-picons-next-job-internal): new function.
+ 	(gnus-picons-next-job): new function.
+ 
+ Wed May  7 22:14:32 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+ 
+ 	* gnus-start.el (gnus-setup-news): Don't fold case.
+ 
+ Sat May  3 16:55:25 1997  Kim-Minh Kaplan  <kimminh.kaplan@utopia.eunet.fr>
+ 
+ 	* gnus-picon.el: * gnus-picons-clear-cache-on-shutdown: new variable.
+ 	* gnus-picons-piconsearch-cache-user: variable deleted.
+ 	* gnus-picons-clear-cache: new function.
+ 	* gnus-picons-close: only clear cache if
+  	gnus-picons-clear-cache-on-shutdown.
+ 	* gnus-picons-url-retrieve: set url-package-name and
+  	url-package-version.
+ 	* gnus-picons-users-image-alist: new variable.
+ 	* gnus-picons-retrieve-user-callback: use it.
+ 	* Added support for network retrieval of picons.
+ 	* gnus-picons-map: removed.
+ 	* gnus-picons-remove: removed case to handle processes.
+ 	* gnus-picons-processes-alist: new variable
+ 	* gnus-picons-x-face-sentinel: simplified.  Use processes alist.
+ 	* gnus-picons-display-x-face: explicitly request an xface image.
+ 	Always call gnus-picons-prepare-for-annotations.  Use processes
+ 	alist.
+ 	* gnus-picons-lookup-internal: new function.
+ 	* gnus-picons-lookup: use it.
+ 	* gnus-picons-lookup-user-internal: ditto.
+ 	* gnus-picons-display-picon-or-name: no more xface-p argument.
+ 	* gnus-picons-try-suffixes: removed.
+ 	* gnus-picons-try-face: new function.  Does the caching in
+ 	gnus-picons-glyph-alist.
+ 	* gnus-picons-try-to-find-face: take a glyph argument instead of a
+ 	path.  No more xface-p argument.  Only use one annotation even if
+ 	gnus-picons-display-as-address.
+ 	* gnus-picons-toggle-extent: changed into an annotation action.
+ 
  Sat May  3 00:59:39 1997  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
  
  	* gnus.el: Gnus v5.4.50 is released.
*** pub/rgnus/texi/gnus.texi	Sat May  3 01:09:15 1997
--- rgnus/texi/gnus.texi	Thu May  8 17:41:34 1997
***************
*** 1,7 ****
  \input texinfo                  @c -*-texinfo-*-
  
  @setfilename gnus
! @settitle Gnus 5.4.50 Manual
  @synindex fn cp
  @synindex vr cp
  @synindex pg cp
--- 1,7 ----
  \input texinfo                  @c -*-texinfo-*-
  
  @setfilename gnus
! @settitle Gnus 5.4.51 Manual
  @synindex fn cp
  @synindex vr cp
  @synindex pg cp
***************
*** 287,293 ****
  @tex
  
  @titlepage
! @title Gnus 5.4.50 Manual
  
  @author by Lars Magne Ingebrigtsen
  @page
--- 287,293 ----
  @tex
  
  @titlepage
! @title Gnus 5.4.51 Manual
  
  @author by Lars Magne Ingebrigtsen
  @page
***************
*** 323,329 ****
  spool or your mbox file.  All at the same time, if you want to push your
  luck.
  
! This manual corresponds to Gnus 5.4.50.
  
  @end ifinfo
  
--- 323,329 ----
  spool or your mbox file.  All at the same time, if you want to push your
  luck.
  
! This manual corresponds to Gnus 5.4.51.
  
  @end ifinfo
  
***************
*** 5229,5234 ****
--- 5229,5251 ----
  means that Gnus will look at the articles it saves for an
  @code{Archive-name} line and use that as a suggestion for the file
  name. 
+ 
+ Here's an example function to clean up file names somewhat.  If you have
+ lots of mail groups that are called things like
+ @samp{nnml:mail.whatever}, you may want to chop off the beginning of
+ these group names before creating the file name to save to.  The
+ following will do just that:
+ 
+ 1@lisp
+ (defun my-save-name (group)
+   (when (string-match "^nnml:mail." group)
+     (substring group (match-end 0))))
+ 
+ (setq gnus-split-methods
+       '((gnus-article-archive-name)
+         (my-save-name)))
+ @end lisp
+ 
  
  @vindex gnus-use-long-file-name
  Finally, you have the @code{gnus-use-long-file-name} variable.  If it is
*** pub/rgnus/texi/message.texi	Sat May  3 01:09:15 1997
--- rgnus/texi/message.texi	Thu May  8 17:41:34 1997
***************
*** 1,7 ****
  \input texinfo                  @c -*-texinfo-*-
  
  @setfilename message
! @settitle Message 5.4.50 Manual
  @synindex fn cp
  @synindex vr cp
  @synindex pg cp
--- 1,7 ----
  \input texinfo                  @c -*-texinfo-*-
  
  @setfilename message
! @settitle Message 5.4.51 Manual
  @synindex fn cp
  @synindex vr cp
  @synindex pg cp
***************
*** 39,45 ****
  @tex
  
  @titlepage
! @title Message 5.4.50 Manual
  
  @author by Lars Magne Ingebrigtsen
  @page
--- 39,45 ----
  @tex
  
  @titlepage
! @title Message 5.4.51 Manual
  
  @author by Lars Magne Ingebrigtsen
  @page
***************
*** 79,85 ****
  * Key Index::         List of Message mode keys.
  @end menu
  
! This manual corresponds to Message 5.4.50.  Message is distributed with
  the Gnus distribution bearing the same version number as this manual
  has. 
  
--- 79,85 ----
  * Key Index::         List of Message mode keys.
  @end menu
  
! This manual corresponds to Message 5.4.51.  Message is distributed with
  the Gnus distribution bearing the same version number as this manual
  has. 
  
*** pub/rgnus/texi/ChangeLog	Thu May  1 18:03:12 1997
--- rgnus/texi/ChangeLog	Thu May  8 17:41:34 1997
***************
*** 1,3 ****
--- 1,11 ----
+ Wed May  7 19:00:48 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+ 
+ 	* gnus.texi (Saving Articles): Addition.
+ 
+ Wed May  7 19:00:43 1997  Mark Boyns  <boyns@sdsu.edu>
+ 
+ 	* gnus.texi (Saving Articles): Addition.
+ 
  Thu May  1 14:06:57 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
  
  	* gnus.texi (Score File Format): Fix.