*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2055477..69beb58 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,29 @@
+Sun May 25 17:08:16 1997  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+       * gnus.el: Gnus v5.4.55 is released.
+
+Sun May 25 15:13:45 1997  Michael R. Cook  <mcook@cognex.com>
+
+       * gnus-art.el (gnus-button-alist): Typo fix.
+
+Sun May 25 14:44:38 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-salt.el (gnus-pick-start-reading): Mark unpicked as read.
+
+       * gnus-sum.el (gnus-summary-move-article): Don't scan.
+
+       * gnus-group.el (gnus-group-get-new-news-this-group): Accept an
+       optional non-scan parameter.
+
+Sun May 25 14:33:47 1997  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+       * gnus-cite.el (gnus-cite-attribution-prefix): Typo.
+
+Sat May 24 12:57:46 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-nocem.el (gnus-nocem-verify-issuer): Ignore errors when
+       verifying. 
+
 Sat May 24 11:55:04 1997  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Gnus v5.4.54 is released.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 3ceffbf..f107e84 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1731,34 +1731,33 @@ If variable `gnus-use-long-file-name' is non-nil, it is
 
 (put 'gnus-article-mode 'mode-class 'special)
 
-(when t
-  (gnus-define-keys gnus-article-mode-map
-    " " gnus-article-goto-next-page
-    "\177" gnus-article-goto-prev-page
-    [delete] gnus-article-goto-prev-page
-    "\C-c^" gnus-article-refer-article
-    "h" gnus-article-show-summary
-    "s" gnus-article-show-summary
-    "\C-c\C-m" gnus-article-mail
-    "?" gnus-article-describe-briefly
-    gnus-mouse-2 gnus-article-push-button
-    "\r" gnus-article-press-button
-    "\t" gnus-article-next-button
-    "\M-\t" gnus-article-prev-button
-    "e" gnus-article-edit
-    "<" beginning-of-buffer
-    ">" end-of-buffer
-    "\C-c\C-i" gnus-info-find-node
-    "\C-c\C-b" gnus-bug
-
-    "\C-d" gnus-article-read-summary-keys
-    "\M-*" gnus-article-read-summary-keys
-    "\M-#" gnus-article-read-summary-keys
-    "\M-^" gnus-article-read-summary-keys
-    "\M-g" gnus-article-read-summary-keys)
-
-  (substitute-key-definition
-   'undefined 'gnus-article-read-summary-keys gnus-article-mode-map))
+(gnus-define-keys gnus-article-mode-map
+  " " gnus-article-goto-next-page
+  "\177" gnus-article-goto-prev-page
+  [delete] gnus-article-goto-prev-page
+  "\C-c^" gnus-article-refer-article
+  "h" gnus-article-show-summary
+  "s" gnus-article-show-summary
+  "\C-c\C-m" gnus-article-mail
+  "?" gnus-article-describe-briefly
+  gnus-mouse-2 gnus-article-push-button
+  "\r" gnus-article-press-button
+  "\t" gnus-article-next-button
+  "\M-\t" gnus-article-prev-button
+  "e" gnus-article-edit
+  "<" beginning-of-buffer
+  ">" end-of-buffer
+  "\C-c\C-i" gnus-info-find-node
+  "\C-c\C-b" gnus-bug
+
+  "\C-d" gnus-article-read-summary-keys
+  "\M-*" gnus-article-read-summary-keys
+  "\M-#" gnus-article-read-summary-keys
+  "\M-^" gnus-article-read-summary-keys
+  "\M-g" gnus-article-read-summary-keys)
+
+(substitute-key-definition
+ 'undefined 'gnus-article-read-summary-keys gnus-article-mode-map)
 
 (defun gnus-article-make-menu-bar ()
   (gnus-turn-off-edit-menu 'article)
@@ -2545,7 +2544,7 @@ groups."
 (defcustom gnus-button-alist
   `(("<\\(url: ?\\)?news:\\([^>\n\t ]*@[^>\n\t ]*\\)>" 0 t
      gnus-button-message-id 2)
-    ("\\bnews:\\([^>\n\t ]*@[^>\n\t ]*+\\)" 0 t gnus-button-message-id 1)
+    ("\\bnews:\\([^>\n\t ]*@[^>\n\t ]*\\)" 0 t gnus-button-message-id 1)
     ("\\(\\b<\\(url: ?\\)?news:\\(//\\)?\\([^>\n\t ]*\\)>\\)" 1 t
      gnus-button-fetch-group 4)
     ("\\bnews:\\(//\\)?\\([^>\n\t ]+\\)" 0 t gnus-button-fetch-group 2)

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 3b80b74..7f50668 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -99,7 +99,7 @@ The first regexp group should match the Supercite attribution."
   :type 'integer)
 
 (defcustom gnus-cite-attribution-prefix 
-  "in article\\|in <\\|On \\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\Sat\\|Sun\\),"
+  "in article\\|in <\\|On \\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\|Sun\\),"
   "Regexp matching the beginning of an attribution line."
   :group 'gnus-cite
   :type 'regexp)

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 8b1ef72..5a2c6f2 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2874,7 +2874,7 @@ re-scanning.  If ARG is non-nil and not a number, this will force
     (gnus-group-list-groups (and (numberp arg)
                                 (max (car gnus-group-list-mode) arg)))))
 
-(defun gnus-group-get-new-news-this-group (&optional n)
+(defun gnus-group-get-new-news-this-group (&optional n dont-scan)
   "Check for newly arrived news in the current group (and the N-1 next groups).
 The difference between N and the number of newsgroup checked is returned.
 If N is negative, this group and the N-1 previous groups will be checked."
@@ -2888,7 +2888,7 @@ If N is negative, this group and the N-1 previous groups will be checked."
       (gnus-group-remove-mark group)
       ;; Bypass any previous denials from the server.
       (gnus-remove-denial (gnus-find-method-for-group group))
-      (if (gnus-activate-group group 'scan)
+      (if (gnus-activate-group group (if dont-scan nil 'scan))
          (progn
            (gnus-get-unread-articles-in-group
             (gnus-get-info group) (gnus-active group) t)

diff --git a/lisp/gnus-nocem.el b/lisp/gnus-nocem.el
index 00275df..0695668 100644 (file)
--- a/lisp/gnus-nocem.el
+++ b/lisp/gnus-nocem.el
@@ -194,7 +194,8 @@ matches an previously scanned and verified nocem message."
 (defun gnus-nocem-verify-issuer (person)
   "Verify using PGP that the canceler is who she says she is."
   (if (fboundp gnus-nocem-verifyer)
-      (funcall gnus-nocem-verifyer)
+      (ignore-errors
+       (funcall gnus-nocem-verifyer))
     ;; If we don't have Mailcrypt, then we use the message anyway.
     t))
 

diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el
index f67430c..ba63d27 100644 (file)
--- a/lisp/gnus-salt.el
+++ b/lisp/gnus-salt.el
@@ -158,7 +158,7 @@ If given a prefix, mark all unpicked articles as read."
     (if gnus-pick-elegant-flow
        (progn
          (when (or catch-up gnus-mark-unpicked-articles-as-read)
-           (gnus-summary-limit-mark-excluded-as-read))
+           (gnus-summary-catchup))
          (if (gnus-group-quit-config gnus-newsgroup-name)
              (gnus-summary-exit)
            (gnus-summary-next-group)))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 0e62453..263da48 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6806,7 +6806,7 @@ and `request-accept' functions."
       (save-excursion
        (set-buffer gnus-group-buffer)
        (when (gnus-group-goto-group (car to-groups) t)
-         (gnus-group-get-new-news-this-group 1))
+         (gnus-group-get-new-news-this-group 1 t))
        (pop to-groups)))
 
     (gnus-kill-buffer copy-buf)

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 61db02a..5894ee8 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -226,7 +226,7 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "5.4.54"
+(defconst gnus-version-number "5.4.55"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 1ff4978..32491c6 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 25 14:40:17 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus.texi (Expiring Mail): Addition.
+
 Sat May 24 05:26:17 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
 
        * gnus.texi (Score File Format): Update.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index d07c946..00d057d 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus
-@settitle Gnus 5.4.54 Manual
+@settitle Gnus 5.4.55 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -287,7 +287,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Gnus 5.4.54 Manual
+@title Gnus 5.4.55 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -323,7 +323,7 @@ can be gotten by any nefarious means you can think of---@sc{nntp}, local
 spool or your mbox file.  All at the same time, if you want to push your
 luck.
 
-This manual corresponds to Gnus 5.4.54.
+This manual corresponds to Gnus 5.4.55.
 
 @end ifinfo
 
@@ -9220,6 +9220,19 @@ have all articles that you read marked as expirable automatically.  All
 articles that are marked as expirable have an @samp{E} in the first
 column in the summary buffer.
 
+By default, if you have auto expiry switched on, Gnus will mark all the
+articles you read as expirable, no matter if they were read or unread
+before.  To avoid having articles marked as read marked as expirable
+automatically, you can put something like the following in your
+@file{.gnus} file:
+
+@vindex gnus-mark-article-hook
+@lisp
+(remove-hook 'gnus-mark-article-hook                                
+             'gnus-summary-mark-read-and-unread-as-read)            
+(add-hook 'gnus-mark-article-hook 'gnus-summary-mark-unread-as-read)
+@end lisp
+
 Note that making a group auto-expirable don't mean that all read
 articles are expired---only the articles that are marked as expirable
 will be expired.  Also note the using the @kbd{d} command won't make
@@ -14092,6 +14105,7 @@ Alastair Burt,
 Joao Cachopo,
 Zlatko Calusic,
 Massimo Campostrini,
+Dan Christensen,
 Michael R. Cook,
 Glenn Coombs, 
 Frank D. Cringle, 
@@ -14840,7 +14854,8 @@ default, way of getting news.
 @item foreign
 @cindex foreign
 You can also have any number of foreign groups active at the same time.
-These are groups that use different backends for getting news.
+These are groups that use non-native non-secondary backends for getting
+news.
 
 @item secondary
 @cindex secondary

diff --git a/texi/message.texi b/texi/message.texi
index 81c1eb7..5c87134 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename message
-@settitle Message 5.4.54 Manual
+@settitle Message 5.4.55 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -39,7 +39,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Message 5.4.54 Manual
+@title Message 5.4.55 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -79,7 +79,7 @@ buffers.
 * Key Index::         List of Message mode keys.
 @end menu
 
-This manual corresponds to Message 5.4.54.  Message is distributed with
+This manual corresponds to Message 5.4.55.  Message is distributed with
 the Gnus distribution bearing the same version number as this manual
 has.