*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3bcff0..b63f7b5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,15 @@
-Sun Aug 20 01:04:45 1995  Lars Magne Ingebrigtsen  <lingebri@sunsci4.cern.ch>
+Sun Aug 20 16:04:20 1995  Lars Magne Ingebrigtsen  <lingebri@sunsci4.cern.ch>
+
+       * gnus.el (gnus-summary-number-of-articles-in-thread): Include
+       adopted articles in the count.
+       (gnus-active-to-gnus-format): Would bug out on non-symbol stuff. 
+
+       * nnheader.el (nnheader-insert-file-contents-literally): Don't
+       bind `file-name-handler-list' to nil.
+
+Sun Aug 20 01:04:45 1995  Lars Magne Ingebrigtsen  <lingebri@sunscipw.cern.ch>
+
+       * gnus.el: 0.99.13 is released.
 
        * gnus-ems.el (gnus-ems-redefine): One entry too many; XEmacs
        bugout. 
@@ -6,7 +17,7 @@ Sun Aug 20 01:04:45 1995  Lars Magne Ingebrigtsen  <lingebri@sunsci4.cern.ch>
 Sat Aug 19 22:41:22 1995  Lars Magne Ingebrigtsen  <lingebri@sunsci4.cern.ch>
 
        * gnus.el (gnus-article-treat-overstrike): Make overstrikes
-       invisible instead of deleitng them.
+       invisible instead of deleting them.
        (gnus-summary-mode-map): Changed the "M p" and "M s" keymaps.
        (gnus-update-active-hashtb-from-killed): New function.
        (gnus-setup-news): Use it.

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index c38976c..f8820cc 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -520,8 +520,6 @@ call it with the value of the `gnus-data' text property."
       (setq gnus-summary-mode-hook
            (cons
             '(lambda ()
-              (easy-menu-add gnus-summary-mark-menu)
-              (easy-menu-add gnus-summary-move-menu)
               (easy-menu-add gnus-summary-article-menu)
               (easy-menu-add gnus-summary-thread-menu)
               (easy-menu-add gnus-summary-misc-menu)

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index c10ef7b..08a780e 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -114,10 +114,18 @@ of the last successful match.")
 ;; functions are written by Per Abrahamsen <amanda@iesd.auc.dk>.
 
 (defun gnus-summary-lower-score (&optional score)
+  "Make a score entry based on the current article.
+The user will be prompted for header to score on, match type,
+permanence, and the string to be used.  The numerical prefix will be
+used as score."
   (interactive "P")
   (gnus-summary-increase-score (- (gnus-score-default score))))
 
 (defun gnus-summary-increase-score (&optional score)
+  "Make a score entry based on the current article.
+The user will be prompted for header to score on, match type,
+permanence, and the string to be used.  The numerical prefix will be
+used as score."
   (interactive "P")
   (gnus-set-global-variables)
   (let* ((nscore (gnus-score-default score))

diff --git a/lisp/gnus-vis.el b/lisp/gnus-vis.el
index 8d33da4..23454f1 100644 (file)
--- a/lisp/gnus-vis.el
+++ b/lisp/gnus-vis.el
@@ -380,134 +380,56 @@ gnus-netscape-start-url:
   (or
    (boundp 'gnus-summary-mark-menu)
    (progn
-     (easy-menu-define
-      gnus-summary-mark-menu
-      gnus-summary-mode-map
-      ""
-      '("Mark"
-       ("Read"
-        ["Mark as read" gnus-summary-mark-as-read-forward t]
-        ["Mark same subject and select" gnus-summary-kill-same-subject-and-select t]
-        ["Mark same subject" gnus-summary-kill-same-subject t]
-        ["Catchup" gnus-summary-catchup t]
-        ["Catchup all" gnus-summary-catchup-all t]
-        ["Catchup to here" gnus-summary-catchup-to-here t]
-        ["Catchup region" gnus-summary-mark-region-as-read t])
-       ("Various"
-        ["Tick" gnus-summary-tick-article-forward t]
-        ["Mark as dormant" gnus-summary-mark-as-dormant t]
-        ["Remove marks" gnus-summary-clear-mark-forward t]
-        ["Set expirable mark" gnus-summary-mark-as-expirable t]
-        ["Set bookmark" gnus-summary-set-bookmark t]
-        ["Remove bookmark" gnus-summary-remove-bookmark t])
-       ("Display"
-        ["Remove lines marked as read" gnus-summary-remove-lines-marked-as-read t]
-        ["Remove lines marked with..." gnus-summary-remove-lines-marked-with t]
-        ["Show dormant articles" gnus-summary-show-all-dormant t]
-        ["Hide dormant articles" gnus-summary-hide-all-dormant t]
-        ["Show expunged articles" gnus-summary-show-all-expunged t])
-       ("Process mark"
-        ["Set mark" gnus-summary-mark-as-processable t]
-        ["Remove mark" gnus-summary-unmark-as-processable t]
-        ["Remove all marks" gnus-summary-unmark-all-processable t]
-        ["Mark series" gnus-uu-mark-series t]
-        ["Mark region" gnus-uu-mark-region t]
-        ["Mark by regexp" gnus-uu-mark-by-regexp t]
-        ["Mark all" gnus-uu-mark-all t]
-        ["Mark sparse" gnus-uu-mark-sparse t]
-        ["Mark thread" gnus-uu-mark-thread t]
-        )
-       ))
-
-     (easy-menu-define
-      gnus-summary-move-menu
-      gnus-summary-mode-map
-      ""
-      '("Move"
-       ["Scroll article forwards" gnus-summary-next-page t]
-       ["Next unread article" gnus-summary-next-unread-article t]
-       ["Previous unread article" gnus-summary-prev-unread-article t]
-       ["Next article" gnus-summary-next-article t]
-       ["Previous article" gnus-summary-prev-article t]
-       ["Next article same subject" gnus-summary-next-same-subject t]
-       ["Previous article same subject" gnus-summary-prev-same-subject t]
-       ["First unread article" gnus-summary-first-unread-article t]
-       ["Go to subject number..." gnus-summary-goto-subject t]
-       ["Go to the last article" gnus-summary-goto-last-article t]
-       ["Pop article off history" gnus-summary-pop-article t]
-       ))
-
-     (easy-menu-define
-      gnus-summary-article-menu
-      gnus-summary-mode-map
-      ""
-      '("Article"
-       ("Hide"
-        ("Date"
-         ["Local" gnus-article-date-local t]
-         ["UT" gnus-article-date-local t]
-         ["Lapsed" gnus-article-date-local t])
-        ["Headers" gnus-article-hide-headers t]
-        ["Signature" gnus-article-hide-signature t]
-        ["Citation" gnus-article-hide-citation t]
-        ["Overstrike" gnus-article-treat-overstrike t]
-        ["Word wrap" gnus-article-word-wrap t]
-        ["CR" gnus-article-remove-cr t]
-        ["Show X-Face" gnus-article-display-x-face t]
-        ["Quoted-Printable" gnus-article-de-quoted-unreadable t])
-       ("Extract"
-        ["Uudecode" gnus-uu-decode-uu t]
-        ["Uudecode and save" gnus-uu-decode-uu-and-save t]
-        ["Unshar" gnus-uu-decode-unshar t]
-        ["Unshar and save" gnus-uu-decode-unshar-and-save t]
-        ["Save" gnus-uu-decode-save t]
-        ["Binhex" gnus-uu-decode-binhex t])
-       ["Enter digest buffer" gnus-summary-enter-digest-group t]
-       ["Isearch article" gnus-summary-isearch-article t]
-       ["Search all articles" gnus-summary-search-article-forward t]
-       ["Beginning of the article" gnus-summary-beginning-of-article t]
-       ["End of the article" gnus-summary-end-of-article t]
-       ["Fetch parent of article" gnus-summary-refer-parent-article t]
-       ["Fetch article with id..." gnus-summary-refer-article t]
-       ["Stop page breaking" gnus-summary-stop-page-breaking t]
-       ["Rot 13" gnus-summary-caesar-message t]
-       ["Redisplay" gnus-summary-show-article t]
-       ["Toggle header" gnus-summary-toggle-header t]
-       ["Toggle MIME" gnus-summary-toggle-mime t]
-       ["Save" gnus-summary-save-article t]
-       ["Save in mail format" gnus-summary-save-article-mail t]
-       ["Pipe through a filter" gnus-summary-pipe-output t]
-       ("Mail articles"
-        ["Respool article" gnus-summary-respool-article t]
-        ["Move article" gnus-summary-move-article t]
-        ["Copy article" gnus-summary-copy-article t]
-        ["Import file" gnus-summary-import-article t]
-        ["Edit article" gnus-summary-edit-article t]
-        ["Delete article" gnus-summary-delete-article t])
-       ))
-
-     (easy-menu-define
-      gnus-summary-thread-menu
-      gnus-summary-mode-map
-      ""
-      '("Threads"
-       ["Toggle threading" gnus-summary-toggle-threads t]
-       ["Display hidden thread" gnus-summary-show-thread t]
-       ["Hide thread" gnus-summary-hide-thread t]
-       ["Go to next thread" gnus-summary-next-thread t]
-       ["Go to previous thread" gnus-summary-prev-thread t]
-       ["Go down thread" gnus-summary-down-thread t]
-       ["Go up thread" gnus-summary-up-thread t]
-       ["Mark thread as read" gnus-summary-kill-thread t]
-       ["Lower thread score" gnus-summary-lower-thread t]
-       ["Raise thread score" gnus-summary-raise-thread t]
-       ))
 
      (easy-menu-define
       gnus-summary-misc-menu
       gnus-summary-mode-map
       ""
       '("Misc"
+       ("Mark"
+        ("Read"
+         ["Mark as read" gnus-summary-mark-as-read-forward t]
+         ["Mark same subject and select" gnus-summary-kill-same-subject-and-select t]
+         ["Mark same subject" gnus-summary-kill-same-subject t]
+         ["Catchup" gnus-summary-catchup t]
+         ["Catchup all" gnus-summary-catchup-all t]
+         ["Catchup to here" gnus-summary-catchup-to-here t]
+         ["Catchup region" gnus-summary-mark-region-as-read t])
+        ("Various"
+         ["Tick" gnus-summary-tick-article-forward t]
+         ["Mark as dormant" gnus-summary-mark-as-dormant t]
+         ["Remove marks" gnus-summary-clear-mark-forward t]
+         ["Set expirable mark" gnus-summary-mark-as-expirable t]
+         ["Set bookmark" gnus-summary-set-bookmark t]
+         ["Remove bookmark" gnus-summary-remove-bookmark t])
+        ("Display"
+         ["Remove lines marked as read" gnus-summary-remove-lines-marked-as-read t]
+         ["Remove lines marked with..." gnus-summary-remove-lines-marked-with t]
+         ["Show dormant articles" gnus-summary-show-all-dormant t]
+         ["Hide dormant articles" gnus-summary-hide-all-dormant t]
+         ["Show expunged articles" gnus-summary-show-all-expunged t])
+        ("Process mark"
+         ["Set mark" gnus-summary-mark-as-processable t]
+         ["Remove mark" gnus-summary-unmark-as-processable t]
+         ["Remove all marks" gnus-summary-unmark-all-processable t]
+         ["Mark series" gnus-uu-mark-series t]
+         ["Mark region" gnus-uu-mark-region t]
+         ["Mark by regexp" gnus-uu-mark-by-regexp t]
+         ["Mark all" gnus-uu-mark-all t]
+         ["Mark sparse" gnus-uu-mark-sparse t]
+         ["Mark thread" gnus-uu-mark-thread t]))
+       ("Move"
+        ["Scroll article forwards" gnus-summary-next-page t]
+        ["Next unread article" gnus-summary-next-unread-article t]
+        ["Previous unread article" gnus-summary-prev-unread-article t]
+        ["Next article" gnus-summary-next-article t]
+        ["Previous article" gnus-summary-prev-article t]
+        ["Next article same subject" gnus-summary-next-same-subject t]
+        ["Previous article same subject" gnus-summary-prev-same-subject t]
+        ["First unread article" gnus-summary-first-unread-article t]
+        ["Go to subject number..." gnus-summary-goto-subject t]
+        ["Go to the last article" gnus-summary-goto-last-article t]
+        ["Pop article off history" gnus-summary-pop-article t])        
        ("Sort"
         ["Sort by number" gnus-summary-sort-by-number t]
         ["Sort by author" gnus-summary-sort-by-author t]
@@ -529,28 +451,6 @@ gnus-netscape-start-url:
        ["Edit local kill file" gnus-summary-edit-local-kill t]
        ))
 
-     (easy-menu-define
-      gnus-summary-post-menu
-      gnus-summary-mode-map
-      ""
-      '("Post"
-       ["Post an article" gnus-summary-post-news t]
-       ["Followup" gnus-summary-followup t]
-       ["Followup and yank" gnus-summary-followup-with-original t]
-       ["Supersede article" gnus-summary-supersede-article t]
-       ["Cancel article" gnus-summary-cancel-article t]
-       ["Reply" gnus-summary-reply t]
-       ["Reply and yank" gnus-summary-reply-with-original t]
-       ["Mail forward" gnus-summary-mail-forward t]
-       ["Post forward" gnus-summary-post-forward t]
-       ["Digest and mail" gnus-uu-digest-mail-forward t]
-       ["Digest and post" gnus-uu-digest-post-forward t]
-       ["Send a mail" gnus-summary-mail-other-window t]
-       ["Reply & followup" gnus-summary-followup-and-reply t]
-       ["Reply & followup and yank" gnus-summary-followup-and-reply-with-original t]
-       ["Uuencode and post" gnus-uu-post-news t]
-       ))
-
      (easy-menu-define
       gnus-summary-kill-menu
       gnus-summary-mode-map
@@ -681,6 +581,94 @@ gnus-netscape-start-url:
            :style radio
            :selected (eq gnus-score-default-duration 'i)])
          ))))
+
+     (easy-menu-define
+      gnus-summary-article-menu
+      gnus-summary-mode-map
+      ""
+      '("Article"
+       ("Hide"
+        ("Date"
+         ["Local" gnus-article-date-local t]
+         ["UT" gnus-article-date-local t]
+         ["Lapsed" gnus-article-date-local t])
+        ["Headers" gnus-article-hide-headers t]
+        ["Signature" gnus-article-hide-signature t]
+        ["Citation" gnus-article-hide-citation t]
+        ["Overstrike" gnus-article-treat-overstrike t]
+        ["Word wrap" gnus-article-word-wrap t]
+        ["CR" gnus-article-remove-cr t]
+        ["Show X-Face" gnus-article-display-x-face t]
+        ["Quoted-Printable" gnus-article-de-quoted-unreadable t])
+       ("Extract"
+        ["Uudecode" gnus-uu-decode-uu t]
+        ["Uudecode and save" gnus-uu-decode-uu-and-save t]
+        ["Unshar" gnus-uu-decode-unshar t]
+        ["Unshar and save" gnus-uu-decode-unshar-and-save t]
+        ["Save" gnus-uu-decode-save t]
+        ["Binhex" gnus-uu-decode-binhex t])
+       ["Enter digest buffer" gnus-summary-enter-digest-group t]
+       ["Isearch article" gnus-summary-isearch-article t]
+       ["Search all articles" gnus-summary-search-article-forward t]
+       ["Beginning of the article" gnus-summary-beginning-of-article t]
+       ["End of the article" gnus-summary-end-of-article t]
+       ["Fetch parent of article" gnus-summary-refer-parent-article t]
+       ["Fetch article with id..." gnus-summary-refer-article t]
+       ["Stop page breaking" gnus-summary-stop-page-breaking t]
+       ["Rot 13" gnus-summary-caesar-message t]
+       ["Redisplay" gnus-summary-show-article t]
+       ["Toggle header" gnus-summary-toggle-header t]
+       ["Toggle MIME" gnus-summary-toggle-mime t]
+       ["Save" gnus-summary-save-article t]
+       ["Save in mail format" gnus-summary-save-article-mail t]
+       ["Pipe through a filter" gnus-summary-pipe-output t]
+       ("Mail articles"
+        ["Respool article" gnus-summary-respool-article t]
+        ["Move article" gnus-summary-move-article t]
+        ["Copy article" gnus-summary-copy-article t]
+        ["Import file" gnus-summary-import-article t]
+        ["Edit article" gnus-summary-edit-article t]
+        ["Delete article" gnus-summary-delete-article t])
+       ))
+
+     (easy-menu-define
+      gnus-summary-thread-menu
+      gnus-summary-mode-map
+      ""
+      '("Threads"
+       ["Toggle threading" gnus-summary-toggle-threads t]
+       ["Display hidden thread" gnus-summary-show-thread t]
+       ["Hide thread" gnus-summary-hide-thread t]
+       ["Go to next thread" gnus-summary-next-thread t]
+       ["Go to previous thread" gnus-summary-prev-thread t]
+       ["Go down thread" gnus-summary-down-thread t]
+       ["Go up thread" gnus-summary-up-thread t]
+       ["Mark thread as read" gnus-summary-kill-thread t]
+       ["Lower thread score" gnus-summary-lower-thread t]
+       ["Raise thread score" gnus-summary-raise-thread t]
+       ))
+     (easy-menu-define
+      gnus-summary-post-menu
+      gnus-summary-mode-map
+      ""
+      '("Post"
+       ["Post an article" gnus-summary-post-news t]
+       ["Followup" gnus-summary-followup t]
+       ["Followup and yank" gnus-summary-followup-with-original t]
+       ["Supersede article" gnus-summary-supersede-article t]
+       ["Cancel article" gnus-summary-cancel-article t]
+       ["Reply" gnus-summary-reply t]
+       ["Reply and yank" gnus-summary-reply-with-original t]
+       ["Mail forward" gnus-summary-mail-forward t]
+       ["Post forward" gnus-summary-post-forward t]
+       ["Digest and mail" gnus-uu-digest-mail-forward t]
+       ["Digest and post" gnus-uu-digest-post-forward t]
+       ["Send a mail" gnus-summary-mail-other-window t]
+       ["Reply & followup" gnus-summary-followup-and-reply t]
+       ["Reply & followup and yank" gnus-summary-followup-and-reply-with-original t]
+       ["Uuencode and post" gnus-uu-post-news t]
+       ))
+
      )))
 
 (defun gnus-score-set-default (var value)
@@ -1381,7 +1369,7 @@ The value is actually the element of LIST whose cdr is ELT."
                  list (cdr list))))
        result)))
 
-(require 'gnus-cus)
+; (require 'gnus-cus)
 (gnus-ems-redefine)
 (provide 'gnus-vis)
 

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 09c1aa2..fdd23b8 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1310,7 +1310,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 "(ding) Gnus v0.99.13"
+(defconst gnus-version "(ding) Gnus v0.99.14"
   "Version number for this version of Gnus.")
 
 (defvar gnus-info-nodes
@@ -5774,11 +5774,7 @@ article number."
          (if (and (consp thread) (cdr thread))
              (apply
               '+ 1 (mapcar
-                    (function
-                     (lambda (arg)
-                       (if (memq (header-number (car arg)) gnus-tmp-gathered)
-                           0
-                         (gnus-summary-number-of-articles-in-thread arg))))
+                    'gnus-summary-number-of-articles-in-thread 
                     (cdr thread)))
            1)))
     (if char 
@@ -12806,7 +12802,8 @@ Returns whether the updating was successful."
                      (setq gnus-moderated-list 
                            (cons (symbol-name group) gnus-moderated-list))))
              (error 
-              (set group nil)))
+              (and (symbolp group)
+                   (set group nil))))
            (widen)
            (forward-line 1)))
       ;; And if we do not care about moderation, we use this loop,
@@ -12831,7 +12828,8 @@ Returns whether the updating was successful."
                  (set group nil)))
            (error 
             (progn 
-              (set group nil)
+              (and (symbolp group)
+                   (set group nil))
               (if ignore-errors
                   ()
                 (gnus-message 3 "Warning - illegal active: %s"

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index e387eb7..54b0266 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -213,7 +213,7 @@ A buffer may be modified in several ways after reading into the buffer due
 to advanced Emacs features, such as file-name-handlers, format decoding,
 find-file-hooks, etc.
   This function ensures that none of these modifications will take place."
-  (let ((file-name-handler-alist nil)
+  (let (; (file-name-handler-alist nil)
        (format-alist nil)
        (after-insert-file-functions nil)
        (find-buffer-file-type-function