*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 98d84a3..61b92f0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,30 @@
+Wed Jun 19 19:31:56 1996  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus.el: Gnus v5.2.22 is released.
+
+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.

diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index 0612e6d..bbfca30 100644 (file)
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -219,7 +219,8 @@ To use:  (setq gnus-article-x-face-command 'gnus-picons-display-x-face)"
                    (cadr (mail-extract-address-components from))
                    ".*@\\(.*\\)\\'" "\\1")
                   "\\." "/")) "/")))
-          (set-buffer (gnus-get-buffer-name gnus-picons-display-where))
+          (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,14 +280,12 @@ To use:  (setq gnus-article-x-face-command 'gnus-picons-display-x-face)"
        (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))
+            (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,10 +296,12 @@ To use:  (setq gnus-article-x-face-command 'gnus-picons-display-x-face)"
       (setq f nil))
     f))
 
-(defun gnus-picons-insert-face-if-exists (path filename &optional rev)
+(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,6 +309,11 @@ To use:  (setq gnus-article-x-face-command 'gnus-picons-display-x-face)"
                  (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)))

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index f56e9bf..5e05d95 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -524,6 +524,8 @@ pounce directly on the real variables themselves.")
     (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"))
     ))
 
 

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 6f00383..806c6c0 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1730,7 +1730,7 @@ variable (string, integer, character, etc).")
   "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
-(defconst gnus-version-number "5.2.21"
+(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,10 +9551,10 @@ This is meant to be called in `gnus-article-internal-prepare-hook'."
 the list of process marked articles, and the current article will be
 taken into consideration."
   (cond
-   ((and n (numberp n))
+   (n
     ;; A numerical prefix has been given.
     (let ((backward (< n 0))
-         (n (abs n))
+         (n (abs (prefix-numeric-value n)))
          articles article)
       (save-excursion
        (while
@@ -11489,7 +11489,7 @@ and `request-accept' functions."
             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)))
+                       (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,7 +15289,7 @@ If GROUP is nil, all groups on METHOD are scanned."
     (setq method (gnus-server-to-method method)))
   (when (and (not method)
             (stringp group))
-    (setq method (gnus-find-method-for-group group)))
+    (setq method (gnus-group-name-to-method group)))
   (goto-char (point-max))
   (unless (bolp)
     (insert "\n"))

diff --git a/lisp/message.el b/lisp/message.el
index 7beebf9..b86ce85 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -810,6 +810,7 @@ C-c C-r  message-ceasar-buffer-body (rot13 the message body)."
   (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,9 +940,15 @@ C-c C-r  message-ceasar-buffer-body (rot13 the message body)."
 
 (defun message-insert-signature (&optional force)
   "Insert a signature.  See documentation for the `message-signature' variable."
-  (interactive (list t))
+  (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,10 +967,9 @@ C-c C-r  message-ceasar-buffer-body (rot13 the message body)."
       ;; 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")
+      (insert "\n\n-- \n")
       (if (eq signature t)
          (insert-file-contents message-signature-file)
        (insert signature))

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index ced715d..8400be8 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -273,10 +273,12 @@
        (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)))
+     (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)