*** pub/sgnus/lisp/gnus-picon.el	Wed Jun 19 16:58:30 1996
--- sgnus/lisp/gnus-picon.el	Wed Jun 19 19:24:21 1996
***************
*** 219,225 ****
  		    (cadr (mail-extract-address-components from))
  		    ".*@\\(.*\\)\\'" "\\1")
  		   "\\." "/")) "/")))
!           (set-buffer (gnus-get-buffer-name gnus-picons-display-where))
            (gnus-add-current-to-buffer-list)
  	  (goto-char (point-min))
  	  (if (eq gnus-picons-display-where 'article)
--- 219,226 ----
  		    (cadr (mail-extract-address-components from))
  		    ".*@\\(.*\\)\\'" "\\1")
  		   "\\." "/")) "/")))
!           (set-buffer (get-buffer-create
! 		       (gnus-get-buffer-name gnus-picons-display-where)))
            (gnus-add-current-to-buffer-list)
  	  (goto-char (point-min))
  	  (if (eq gnus-picons-display-where 'article)
***************
*** 279,292 ****
  	(delete-annotation gnus-group-annotations)
  	(setq gnus-group-annotations nil)))
        (gnus-picons-remove gnus-group-annotations)
-       (setq gnus-group-annotations nil)
        (setq gnus-group-annotations
  	    (gnus-picons-insert-face-if-exists 
  	     (concat (file-name-as-directory gnus-picons-database)  
  		     gnus-picons-news-directory)
! 	     (concat (replace-in-string gnus-newsgroup-name "\\." "/") 
! 		     "/unknown")
! 	     t))
        (add-hook 'gnus-summary-exit-hook 'gnus-picons-remove-all))))
  
  (defsubst gnus-picons-try-suffixes (file)
--- 280,291 ----
  	(delete-annotation gnus-group-annotations)
  	(setq gnus-group-annotations nil)))
        (gnus-picons-remove gnus-group-annotations)
        (setq gnus-group-annotations
  	    (gnus-picons-insert-face-if-exists 
  	     (concat (file-name-as-directory gnus-picons-database)  
  		     gnus-picons-news-directory)
! 	     (replace-in-string gnus-newsgroup-name "\\." "/") 
! 	     t t))
        (add-hook 'gnus-summary-exit-hook 'gnus-picons-remove-all))))
  
  (defsubst gnus-picons-try-suffixes (file)
***************
*** 297,306 ****
        (setq f nil))
      f))
  
! (defun gnus-picons-insert-face-if-exists (path filename &optional rev)
    "Inserts a face at point if I can find one"
    (let ((files (message-tokenize-header filename "/"))
  	picons found)
      (while (and files
  		(file-exists-p path))
        (setq path (concat path "/" (pop files)))
--- 296,307 ----
        (setq f nil))
      f))
  
! (defun gnus-picons-insert-face-if-exists (path filename &optional rev bar)
    "Inserts a face at point if I can find one"
    (let ((files (message-tokenize-header filename "/"))
  	picons found)
+ ;    (when rev
+ ;      (setq files (nreverse files)))
      (while (and files
  		(file-exists-p path))
        (setq path (concat path "/" (pop files)))
***************
*** 308,313 ****
--- 309,319 ----
  		  (or 
  		   (gnus-picons-try-suffixes (concat path "/face."))
  		   (gnus-picons-try-suffixes (concat path "/unknown/face."))))
+ 	(when bar
+ 	  (setq picons
+ 		(nconc picons
+ 		       (gnus-picons-try-to-find-face 
+ 			(concat gnus-xmas-glyph-directory "bar.xbm")))))
  	(setq picons (nconc (gnus-picons-try-to-find-face found)
  			    picons))))
      (nreverse picons)))
*** pub/sgnus/lisp/gnus-xmas.el	Wed Jun 19 16:58:35 1996
--- sgnus/lisp/gnus-xmas.el	Wed Jun 19 19:00:10 1996
***************
*** 524,529 ****
--- 524,531 ----
      (fset 'gnus-topic-remove-excess-properties
  	  'gnus-xmas-topic-remove-excess-properties)
      (fset 'gnus-mode-line-buffer-identification 'identity)
+     (unless (boundp 'shell-command-switch)
+       (setq shell-command-switch "-c"))
      ))
  
  
*** pub/sgnus/lisp/gnus.el	Wed Jun 19 16:58:36 1996
--- sgnus/lisp/gnus.el	Wed Jun 19 19:00:18 1996
***************
*** 1730,1736 ****
    "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
    "The mail address of the Gnus maintainers.")
  
! (defconst gnus-version-number "5.2.21"
    "Version number for this version of Gnus.")
  
  (defconst gnus-version (format "Gnus v%s" gnus-version-number)
--- 1730,1736 ----
    "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
    "The mail address of the Gnus maintainers.")
  
! (defconst gnus-version-number "5.2.22"
    "Version number for this version of Gnus.")
  
  (defconst gnus-version (format "Gnus v%s" gnus-version-number)
***************
*** 9551,9560 ****
  the list of process marked articles, and the current article will be
  taken into consideration."
    (cond
!    ((and n (numberp n))
      ;; A numerical prefix has been given.
      (let ((backward (< n 0))
! 	  (n (abs n))
  	  articles article)
        (save-excursion
  	(while
--- 9551,9560 ----
  the list of process marked articles, and the current article will be
  taken into consideration."
    (cond
!    (n
      ;; A numerical prefix has been given.
      (let ((backward (< n 0))
! 	  (n (abs (prefix-numeric-value n)))
  	  articles article)
        (save-excursion
  	(while
***************
*** 11489,11495 ****
  	     articles prefix))
        (set (intern (format "gnus-current-%s-group" action)) to-newsgroup))
      (setq to-method (or select-method 
! 			(gnus-find-method-for-group to-newsgroup)))
      ;; Check the method we are to move this article to...
      (or (gnus-check-backend-function 'request-accept-article (car to-method))
  	(error "%s does not support article copying" (car to-method)))
--- 11489,11495 ----
  	     articles prefix))
        (set (intern (format "gnus-current-%s-group" action)) to-newsgroup))
      (setq to-method (or select-method 
! 			(gnus-group-name-to-method to-newsgroup)))
      ;; Check the method we are to move this article to...
      (or (gnus-check-backend-function 'request-accept-article (car to-method))
  	(error "%s does not support article copying" (car to-method)))
***************
*** 15289,15295 ****
      (setq method (gnus-server-to-method method)))
    (when (and (not method)
  	     (stringp group))
!     (setq method (gnus-find-method-for-group group)))
    (goto-char (point-max))
    (unless (bolp)
      (insert "\n"))
--- 15289,15295 ----
      (setq method (gnus-server-to-method method)))
    (when (and (not method)
  	     (stringp group))
!     (setq method (gnus-group-name-to-method group)))
    (goto-char (point-max))
    (unless (bolp)
      (insert "\n"))
*** pub/sgnus/lisp/message.el	Wed Jun 19 16:58:38 1996
--- sgnus/lisp/message.el	Wed Jun 19 18:40:27 1996
***************
*** 810,815 ****
--- 810,816 ----
    (make-local-variable 'paragraph-start)
    (setq paragraph-start (concat (regexp-quote mail-header-separator)
  				"$\\|[ \t]*[-_][-_][-_]+$\\|"
+ 				"-- $\\|"
  				paragraph-start))
    (setq paragraph-separate (concat (regexp-quote mail-header-separator)
  				   "$\\|[ \t]*[-_][-_][-_]+$\\|"
***************
*** 939,947 ****
  
  (defun message-insert-signature (&optional force)
    "Insert a signature.  See documentation for the `message-signature' variable."
!   (interactive (list t))
    (let* ((signature 
  	  (cond ((and (null message-signature)
  		      force)
  		 t)
  		((message-functionp message-signature)
--- 940,954 ----
  
  (defun message-insert-signature (&optional force)
    "Insert a signature.  See documentation for the `message-signature' variable."
!   (interactive (list 0))
    (let* ((signature 
  	  (cond ((and (null message-signature)
+ 		      (eq force 0))
+ 		 (save-excursion
+ 		   (goto-char (point-max))
+ 		   (not (re-search-backward
+ 			 message-signature-separator nil t))))
+ 		((and (null message-signature)
  		      force)
  		 t)
  		((message-functionp message-signature)
***************
*** 960,969 ****
        ;; Remove blank lines at the end of the message.
        (goto-char (point-max))
        (skip-chars-backward " \t\n")
-       (forward-line 1)
        (delete-region (point) (point-max))
        ;; Insert the signature.
!       (insert "\n-- \n")
        (if (eq signature t)
  	  (insert-file-contents message-signature-file)
  	(insert signature))
--- 967,975 ----
        ;; Remove blank lines at the end of the message.
        (goto-char (point-max))
        (skip-chars-backward " \t\n")
        (delete-region (point) (point-max))
        ;; Insert the signature.
!       (insert "\n\n-- \n")
        (if (eq signature t)
  	  (insert-file-contents message-signature-file)
  	(insert signature))
*** pub/sgnus/lisp/nnmh.el	Wed Jun 19 16:58:39 1996
--- sgnus/lisp/nnmh.el	Wed Jun 19 18:20:55 1996
***************
*** 273,282 ****
         (setq result (eval accept-form))
         (kill-buffer (current-buffer))
         result)
!      (condition-case ()
! 	 (funcall nnmail-delete-file-function
! 		  (concat nnmh-current-directory (int-to-string article)))
!        (file-error nil)))
      result))
  
  (deffoo nnmh-request-accept-article (group &optional server last noinsert)
--- 273,284 ----
         (setq result (eval accept-form))
         (kill-buffer (current-buffer))
         result)
!      (progn
!        (nnmh-possibly-change-directory group server)
!        (condition-case ()
! 	   (funcall nnmail-delete-file-function
! 		    (concat nnmh-current-directory (int-to-string article)))
! 	 (file-error nil))))
      result))
  
  (deffoo nnmh-request-accept-article (group &optional server last noinsert)
*** pub/sgnus/lisp/ChangeLog	Wed Jun 19 16:58:56 1996
--- sgnus/lisp/ChangeLog	Wed Jun 19 19:21:16 1996
***************
*** 1,3 ****
--- 1,26 ----
+ Wed Jun 19 18:53:46 1996  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+ 
+ 	* gnus-picon.el (gnus-group-display-picons): Insert a bar.
+ 
+ 	* gnus-xmas.el (gnus-xmas-redefine): On XEmacs 19.13, set
+ 	`shell-command-switch'. 
+ 
+ 	* gnus.el (gnus-summary-work-articles): Use numeric value of
+ 	`C-u'. 
+ 
+ Wed Jun 19 18:36:23 1996  Christopher Davis  <ckd@loiosh.kei.com>
+ 
+ 	* message.el (message-mode): Add signature separator.
+ 	(message-insert-signature): Check whether a signature is present. 
+ 
+ Wed Jun 19 17:29:07 1996  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+ 
+ 	* nnmh.el (nnmh-request-move-article): Make sure we change back to
+ 	the right directory.
+ 
+ 	* gnus-picon.el (gnus-article-display-picons): Make sure the
+ 	buffer is created.
+ 
  Wed Jun 19 16:58:21 1996  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
  
  	* gnus.el: Gnus v5.2.21 is released.
