*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index f3dda94..2791ada 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1998-04-30  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * lisp/gnus.el (gnus-version-number): Update to 6.2.4.
+
+       * texi/gnus.texi, lisp/ChangeLog: Sync up with Gnus 5.6.7.
+
+       * lisp/gnus.el, lisp/message.el, lisp/gnus-sum.el,
+       lisp/gnus-msg.el, lisp/gnus-cache.el, lisp/gnus-art.el: Sync up
+       with Gnus 5.6.7.
+

 1998-04-28  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
 
        * lisp/gnus.el (gnus-version-number): Update to 6.2.3.
 1998-04-28  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
 
        * lisp/gnus.el (gnus-version-number): Update to 6.2.3.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd682c9..a08a9b9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,71 @@
+Wed Apr 29 22:48:33 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+       * gnus.el: Gnus v5.6.7 is released.
+
+Wed Apr 29 20:54:35 1998  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-sum.el (gnus-summary-update-info): Bind
+       gnuis-newsgroup-scored later.
+       (gnus-summary-prepare-threads): Check some more before inserting
+       dummy roots.
+
+       * gnus-cache.el (gnus-cache-enter-article): Update marks
+       properly. 
+
+       * gnus-xmas.el (gnus-xmas-draft-menu-add): New function.
+
+       * nntp.el (nntp-connection-timeout): Removed.
+
+       * gnus-move.el (gnus-move-group-to-server): Delete nils.
+
+       * nntp.el (nntp-close-server): Close more connections.
+
+       * gnus-art.el (gnus-button-alist): Accept white space after colons
+       in <URL:news:> things.
+
+Wed Apr 29 20:18:45 1998  Kurt Swanson  <kurt@dna.lth.se>
+
+       * gnus-art.el (article-update-date-lapsed): Bind
+       `deactivate-mark'. 
+
+       * gnus-salt.el (gnus-pick-mode-map): Moved keys around to avoid
+       shadowing. 
+
+       * gnus-art.el (gnus-article-read-summary-keys): New version.
+
+       * gnus-sum.el (gnus-summary-make-menu-bar): New for article mode. 
+
+       * gnus-msg.el (gnus-post-method): `current' custom.
+
+Wed Apr 29 19:04:27 1998  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-sum.el (gnus-summary-set-local-parameters): Ignore
+       quit-config. 
+       (gnus-select-newsgroup): Use the value of gnus-fetch-old-headers. 
+
+       * message.el (message-post-method): Doc fix.
+
+       * gnus.el (gnus-directory): dox fix.
+
+Tue Apr 28 03:32:17 1998  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-group.el (gnus-group-timestamp): Really get timestamp.
+
+       * gnus.el (gnus-group-parameter-value): Use explicit iteration.
+
+Tue Apr 28 03:15:50 1998  Hallvard B. Furuseth  <h.b.furuseth@usit.uio.no>
+
+       * gnus-util.el (gnus-alive-p): Check for binding.
+
+Tue Apr 28 03:00:16 1998  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-sum.el (gnus-parent-headers): Don't infloop on nil
+       References. 
+
+       * gnus-art.el (gnus-article-mode): Don't kill local vars.
+
+       * score-mode.el (score-mode-syntax-table): Change syntax.
+

 Mon Apr 27 00:26:01 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Gnus v5.6.6 is released.
 Mon Apr 27 00:26:01 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Gnus v5.6.6 is released.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index b4541ae..7ff92f7 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1383,13 +1383,14 @@ function and want to see what the date was before converting."
 
 (defun article-update-date-lapsed ()
   "Function to be run from a timer to update the lapsed time line."
 
 (defun article-update-date-lapsed ()
   "Function to be run from a timer to update the lapsed time line."

-  (save-excursion
-    (ignore-errors
-      (when (gnus-buffer-live-p gnus-article-buffer)
-       (set-buffer gnus-article-buffer)
-       (goto-char (point-min))
-       (when (re-search-forward "^X-Sent:" nil t)
-         (article-date-lapsed t))))))
+  (let (deactivate-mark)
+    (save-excursion
+      (ignore-errors
+        (when (gnus-buffer-live-p gnus-article-buffer)
+          (set-buffer gnus-article-buffer)
+          (goto-char (point-min))
+          (when (re-search-forward "^X-Sent:" nil t)
+            (article-date-lapsed t)))))))

 
 (defun gnus-start-date-timer (&optional n)
   "Start a timer to update the X-Sent header in the article buffers.
 
 (defun gnus-start-date-timer (&optional n)
   "Start a timer to update the X-Sent header in the article buffers.

@@ -1847,10 +1848,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is
        ["Remove carriage return" gnus-article-remove-cr t]
        ))
 
        ["Remove carriage return" gnus-article-remove-cr t]
        ))
 

-    (when nil
-      (when (boundp 'gnus-summary-article-menu)
-       (define-key gnus-article-mode-map [menu-bar commands]
-         (cons "Commands" gnus-summary-article-menu))))
+    ;; Note "Commands" menu is defined in gnus-sum.el for consistency

 
     (when (boundp 'gnus-summary-post-menu)
       (define-key gnus-article-mode-map [menu-bar post]
 
     (when (boundp 'gnus-summary-post-menu)
       (define-key gnus-article-mode-map [menu-bar post]

@@ -1876,7 +1874,6 @@ commands:
   (interactive)
   (when (gnus-visual-p 'article-menu 'menu)
     (gnus-article-make-menu-bar))
   (interactive)
   (when (gnus-visual-p 'article-menu 'menu)
     (gnus-article-make-menu-bar))

-  (kill-all-local-variables)

   (gnus-simplify-mode-line)
   (setq mode-name "Article")
   (setq major-mode 'gnus-article-mode)
   (gnus-simplify-mode-line)
   (setq mode-name "Article")
   (setq major-mode 'gnus-article-mode)

@@ -2296,67 +2293,68 @@ Argument LINES specifies lines to be scrolled down."
   "Read a summary buffer key sequence and execute it from the article buffer."
   (interactive "P")
   (let ((nosaves
   "Read a summary buffer key sequence and execute it from the article buffer."
   (interactive "P")
   (let ((nosaves

-        '("q" "Q"  "c" "r" "R" "\C-c\C-f" "m"  "a" "f" "F"
-          "Zc" "ZC" "ZE" "ZQ" "ZZ" "Zn" "ZR" "ZG" "ZN" "ZP"
-          "=" "^" "\M-^" "|"))
-       (nosave-but-article
-        '("A\r"))
-       (nosave-in-article
-        '("\C-d"))
+         '("q" "Q"  "c" "r" "R" "\C-c\C-f" "m"  "a" "f" "F"
+           "Zc" "ZC" "ZE" "ZQ" "ZZ" "Zn" "ZR" "ZG" "ZN" "ZP"
+           "=" "^" "\M-^" "|"))
+        (nosave-but-article
+         '("A\r"))
+        (nosave-in-article
+         '("\C-d"))

         (up-to-top
          '("n" "Gn" "p" "Gp"))
         (up-to-top
          '("n" "Gn" "p" "Gp"))

-       keys new-sum-point)
+        keys new-sum-point)

     (save-excursion
       (set-buffer gnus-article-current-summary)
       (let (gnus-pick-mode)
     (save-excursion
       (set-buffer gnus-article-current-summary)
       (let (gnus-pick-mode)

-       (push (or key last-command-event) unread-command-events)
-       (setq keys (read-key-sequence nil))))
+        (push (or key last-command-event) unread-command-events)
+        (setq keys (read-key-sequence nil))))

     (message "")
 
     (if (or (member keys nosaves)
     (message "")
 
     (if (or (member keys nosaves)

-           (member keys nosave-but-article)
-           (member keys nosave-in-article))
-       (let (func)
-         (save-window-excursion
-           (pop-to-buffer gnus-article-current-summary 'norecord)
-           ;; We disable the pick minor mode commands.
-           (let (gnus-pick-mode)
-             (setq func (lookup-key (current-local-map) keys))))
-         (if (not func)
-             (ding)
-           (unless (member keys nosave-in-article)
-             (set-buffer gnus-article-current-summary))
-           (call-interactively func)
-           (setq new-sum-point (point)))
-         (when (member keys nosave-but-article)
-           (pop-to-buffer gnus-article-buffer 'norecord)))
+            (member keys nosave-but-article)
+            (member keys nosave-in-article))
+        (let (func)
+          (save-window-excursion
+            (pop-to-buffer gnus-article-current-summary 'norecord)
+            ;; We disable the pick minor mode commands.
+            (let (gnus-pick-mode)
+              (setq func (lookup-key (current-local-map) keys))))
+          (if (not func)
+              (ding)
+            (unless (member keys nosave-in-article)
+              (set-buffer gnus-article-current-summary))
+            (call-interactively func)
+            (setq new-sum-point (point)))
+          (when (member keys nosave-but-article)
+            (pop-to-buffer gnus-article-buffer 'norecord)))

       ;; These commands should restore window configuration.
       (let ((obuf (current-buffer))
       ;; These commands should restore window configuration.
       (let ((obuf (current-buffer))

-           (owin (current-window-configuration))
-           (opoint (point))
-           (summary gnus-article-current-summary)
-           func in-buffer)
-       (if not-restore-window
-           (pop-to-buffer summary 'norecord)
-         (switch-to-buffer summary 'norecord))
-       (setq in-buffer (current-buffer))
-       ;; We disable the pick minor mode commands.
-       (if (setq func (let (gnus-pick-mode)
-                        (lookup-key (current-local-map) keys)))
-           (progn
-             (call-interactively func)
-             (setq new-sum-point (point)))
-         (ding))
-       (when (eq in-buffer (current-buffer))
-         (set-buffer obuf)
-         (unless not-restore-window
-           (set-window-configuration owin))
-          (unless (member keys up-to-top)
+            (owin (current-window-configuration))
+            (opoint (point))
+            (summary gnus-article-current-summary)
+            func in-buffer selected)
+        (if not-restore-window
+            (pop-to-buffer summary 'norecord)
+          (switch-to-buffer summary 'norecord))
+        (setq in-buffer (current-buffer))
+        ;; We disable the pick minor mode commands.
+        (if (setq func (let (gnus-pick-mode)
+                         (lookup-key (current-local-map) keys)))
+            (progn
+              (call-interactively func)
+              (setq new-sum-point (point)))
+          (ding))
+        (when (eq in-buffer (current-buffer))
+          (setq selected (gnus-summary-select-article))
+          (set-buffer obuf)
+          (unless not-restore-window
+            (set-window-configuration owin))
+          (unless (or (not (eq selected 'old)) (member keys up-to-top))

             (set-window-point (get-buffer-window (current-buffer))
                               opoint))
             (set-window-point (get-buffer-window (current-buffer))
                               opoint))

-         (let ((win (get-buffer-window gnus-article-current-summary)))
-           (when win
-             (set-window-point win new-sum-point))))))))
+          (let ((win (get-buffer-window gnus-article-current-summary)))
+            (when win
+              (set-window-point win new-sum-point))))))))

 
 (defun gnus-article-hide (&optional arg force)
   "Hide all the gruft in the current article.
 
 (defun gnus-article-hide (&optional arg force)
   "Hide all the gruft in the current article.

@@ -2549,7 +2547,6 @@ This is an extended text-mode.
 
 \\{gnus-article-edit-mode-map}"
   (interactive)
 
 \\{gnus-article-edit-mode-map}"
   (interactive)

-  (kill-all-local-variables)

   (setq major-mode 'gnus-article-edit-mode)
   (setq mode-name "Article Edit")
   (use-local-map gnus-article-edit-mode-map)
   (setq major-mode 'gnus-article-edit-mode)
   (setq mode-name "Article Edit")
   (use-local-map gnus-article-edit-mode-map)

@@ -2679,10 +2676,11 @@ groups."
   :type 'regexp)
 
 (defcustom gnus-button-alist
   :type 'regexp)
 
 (defcustom gnus-button-alist

-  `(("<\\(url: ?\\)?news:\\([^>\n\t ]*@[^>\n\t ]*\\)>" 0 t
+  `(("<\\(url:[>\n\t ]*?\\)?news:[>\n\t ]*\\([^>\n\t ]*@[^>\n\t ]*\\)>" 0 t

      gnus-button-message-id 2)
     ("\\bnews:\\([^>\n\t ]*@[^>\n\t ]*\\)" 0 t gnus-button-message-id 1)
      gnus-button-message-id 2)
     ("\\bnews:\\([^>\n\t ]*@[^>\n\t ]*\\)" 0 t gnus-button-message-id 1)

-    ("\\(\\b<\\(url: ?\\)?news:\\(//\\)?\\([^>\n\t ]*\\)>\\)" 1 t
+    ("\\(\\b<\\(url:[>\n\t ]*\\)?news:[>\n\t ]*\\(//\\)?\\([^>\n\t ]*\\)>\\)"
+     1 t

      gnus-button-fetch-group 4)
     ("\\bnews:\\(//\\)?\\([^'\">\n\t ]+\\)" 0 t gnus-button-fetch-group 2)
     ("\\bin\\( +article\\| +message\\)? +\\(<\\([^\n @<>]+@[^\n @<>]+\\)>\\)" 2
      gnus-button-fetch-group 4)
     ("\\bnews:\\(//\\)?\\([^'\">\n\t ]+\\)" 0 t gnus-button-fetch-group 2)
     ("\\bin\\( +article\\| +message\\)? +\\(<\\([^\n @<>]+@[^\n @<>]+\\)>\\)" 2

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 844c074..430a452 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -309,6 +309,7 @@ Returns the list of articles entered."
   (let ((articles (gnus-summary-work-articles n))
        article out)
     (while (setq article (pop articles))
   (let ((articles (gnus-summary-work-articles n))
        article out)
     (while (setq article (pop articles))

+      (gnus-summary-remove-process-mark article)

       (if (natnump article)
          (when (gnus-cache-possibly-enter-article
                 gnus-newsgroup-name article
       (if (natnump article)
          (when (gnus-cache-possibly-enter-article
                 gnus-newsgroup-name article

@@ -316,7 +317,6 @@ Returns the list of articles entered."
                 nil nil nil t)
            (push article out))
        (gnus-message 2 "Can't cache article %d" article))
                 nil nil nil t)
            (push article out))
        (gnus-message 2 "Can't cache article %d" article))

-      (gnus-summary-remove-process-mark article)

       (gnus-summary-update-secondary-mark article))
     (gnus-summary-next-subject 1)
     (gnus-summary-position-point)
       (gnus-summary-update-secondary-mark article))
     (gnus-summary-next-subject 1)
     (gnus-summary-position-point)

@@ -332,9 +332,9 @@ Returns the list of articles removed."
        article out)
     (while articles
       (setq article (pop articles))
        article out)
     (while articles
       (setq article (pop articles))

+      (gnus-summary-remove-process-mark article)

       (when (gnus-cache-possibly-remove-article article nil nil nil t)
        (push article out))
       (when (gnus-cache-possibly-remove-article article nil nil nil t)
        (push article out))

-      (gnus-summary-remove-process-mark article)

       (gnus-summary-update-secondary-mark article))
     (gnus-summary-next-subject 1)
     (gnus-summary-position-point)
       (gnus-summary-update-secondary-mark article))
     (gnus-summary-next-subject 1)
     (gnus-summary-position-point)

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 902955c..78b4a7a 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1234,7 +1234,8 @@ already."
 (defun gnus-group-group-name ()
   "Get the name of the newsgroup on the current line."
   (let ((group (get-text-property (gnus-point-at-bol) 'gnus-group)))
 (defun gnus-group-group-name ()
   "Get the name of the newsgroup on the current line."
   (let ((group (get-text-property (gnus-point-at-bol) 'gnus-group)))

-    (and group (symbol-name group))))
+    (when group
+      (symbol-name group))))

 
 (defun gnus-group-group-level ()
   "Get the level of the newsgroup on the current line."
 
 (defun gnus-group-group-level ()
   "Get the level of the newsgroup on the current line."

@@ -3354,7 +3355,7 @@ or `gnus-group-catchup-group-hook'."
 
 (defsubst gnus-group-timestamp (group)
   "Return the timestamp for GROUP."
 
 (defsubst gnus-group-timestamp (group)
   "Return the timestamp for GROUP."

-  (gnus-group-get-parameter group 'timestamp))
+  (gnus-group-get-parameter group 'timestamp t))

 
 (defun gnus-group-timestamp-delta (group)
   "Return the offset in seconds from the timestamp for GROUP to the current time, as a floating point number."
 
 (defun gnus-group-timestamp-delta (group)
   "Return the offset in seconds from the timestamp for GROUP to the current time, as a floating point number."

diff --git a/lisp/gnus-move.el b/lisp/gnus-move.el
index ef39c59..cbf0346 100644 (file)
--- a/lisp/gnus-move.el
+++ b/lisp/gnus-move.el
@@ -130,7 +130,10 @@ Update the .newsrc.eld file to reflect the change of nntp server."
          ;; into the Gnus info format.
          (setq to-reads
                (gnus-range-add
          ;; into the Gnus info format.
          (setq to-reads
                (gnus-range-add

-                (gnus-compress-sequence (and to-reads (sort to-reads '<)) t)
+                (gnus-compress-sequence
+                 (and (setq to-reads (delq nil to-reads))
+                      (sort to-reads '<))
+                 t)

                 (cons 1 (1- (car to-active)))))
          (gnus-info-set-read info to-reads)
          ;; Do the marks.  I'm sure y'all understand what's
                 (cons 1 (1- (car to-active)))))
          (gnus-info-set-read info to-reads)
          ;; Do the marks.  I'm sure y'all understand what's

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 23759b3..78f3cbf 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -50,6 +50,7 @@ methods. If that is the case, the user will be queried for what select
 method to use when posting."
   :group 'gnus-group-foreign
   :type `(choice (const nil)
 method to use when posting."
   :group 'gnus-group-foreign
   :type `(choice (const nil)

+                 (const current)

                 (const native)
                 (sexp :tag "Methods" ,gnus-select-method)))
 
                 (const native)
                 (sexp :tag "Methods" ,gnus-select-method)))
 

diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el
index 849b2c7..4e9385b 100644 (file)
--- a/lisp/gnus-salt.el
+++ b/lisp/gnus-salt.el
@@ -72,23 +72,24 @@ It accepts the same format specs that `gnus-summary-line-format' does."
   (setq gnus-pick-mode-map (make-sparse-keymap))
 
   (gnus-define-keys gnus-pick-mode-map
   (setq gnus-pick-mode-map (make-sparse-keymap))
 
   (gnus-define-keys gnus-pick-mode-map

-    "t" gnus-uu-mark-thread
-    "T" gnus-uu-unmark-thread

     " " gnus-pick-next-page
     "u" gnus-summary-unmark-as-processable
     " " gnus-pick-next-page
     "u" gnus-summary-unmark-as-processable

-    "U" gnus-summary-unmark-all-processable
-    "v" gnus-uu-mark-over
-    "r" gnus-uu-mark-region
-    "R" gnus-uu-unmark-region
-    "e" gnus-uu-mark-by-regexp
-    "E" gnus-uu-mark-by-regexp
-    "b" gnus-uu-mark-buffer
-    "B" gnus-uu-unmark-buffer

     "." gnus-pick-article
     gnus-down-mouse-2 gnus-pick-mouse-pick-region
     "." gnus-pick-article
     gnus-down-mouse-2 gnus-pick-mouse-pick-region

+    "\r" gnus-pick-start-reading
+    ;; "t" gnus-uu-mark-thread
+    ;; "T" gnus-uu-unmark-thread
+    ;; "U" gnus-summary-unmark-all-processable
+    ;; "v" gnus-uu-mark-over
+    ;; "r" gnus-uu-mark-region
+    ;; "R" gnus-uu-unmark-region
+    ;; "e" gnus-uu-mark-by-regexp
+    ;; "E" gnus-uu-mark-by-regexp
+    ;; "b" gnus-uu-mark-buffer
+    ;; "B" gnus-uu-unmark-buffer

     ;;gnus-mouse-2 gnus-pick-mouse-pick
     ;;gnus-mouse-2 gnus-pick-mouse-pick

-    "X" gnus-pick-start-reading
-    "\r" gnus-pick-start-reading))
+    ;; "X" gnus-pick-start-reading
+    ))

 
 (defun gnus-pick-make-menu-bar ()
   (unless (boundp 'gnus-pick-menu)
 
 (defun gnus-pick-make-menu-bar ()
   (unless (boundp 'gnus-pick-menu)

@@ -99,14 +100,14 @@ It accepts the same format specs that `gnus-summary-line-format' does."
        ["Article" gnus-summary-mark-as-processable t]
        ["Thread" gnus-uu-mark-thread t]
        ["Region" gnus-uu-mark-region t]
        ["Article" gnus-summary-mark-as-processable t]
        ["Thread" gnus-uu-mark-thread t]
        ["Region" gnus-uu-mark-region t]

-       ["Regexp" gnus-uu-mark-regexp t]
+       ["Regexp" gnus-uu-mark-by-regexp t]

        ["Buffer" gnus-uu-mark-buffer t])
        ("Unpick"
        ["Article" gnus-summary-unmark-as-processable t]
        ["Thread" gnus-uu-unmark-thread t]
        ["Region" gnus-uu-unmark-region t]
        ["Buffer" gnus-uu-mark-buffer t])
        ("Unpick"
        ["Article" gnus-summary-unmark-as-processable t]
        ["Thread" gnus-uu-unmark-thread t]
        ["Region" gnus-uu-unmark-region t]

-       ["Regexp" gnus-uu-unmark-regexp t]
-       ["Buffer" gnus-uu-unmark-buffer t])
+       ["Regexp" gnus-uu-unmark-by-regexp t]
+       ["Buffer" gnus-summary-unmark-all-processable t])

        ["Start reading" gnus-pick-start-reading t]
        ["Switch pick mode off" gnus-pick-mode gnus-pick-mode]))))
 
        ["Start reading" gnus-pick-start-reading t]
        ["Switch pick mode off" gnus-pick-mode gnus-pick-mode]))))
 

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index faea1c9..19332b7 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -1328,7 +1328,7 @@ SCORE is the score to add."
                (gnus-prin1 score)
              ;; This is a normal score file, so we print it very
              ;; prettily.
                (gnus-prin1 score)
              ;; This is a normal score file, so we print it very
              ;; prettily.

-             (let ((emacs-lisp-mode-syntax-table score-mode-syntax-table))
+             (let ((lisp-mode-syntax-table score-mode-syntax-table))

                (pp score (current-buffer)))))
          (gnus-make-directory (file-name-directory file))
          ;; If the score file is empty, we delete it.
                (pp score (current-buffer)))))
          (gnus-make-directory (file-name-directory file))
          ;; If the score file is empty, we delete it.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 52b5d1e..bf0ee86 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1482,211 +1482,110 @@ increase the score of each group you read."
         ["Increase score..." gnus-summary-increase-score t]
         ["Lower score..." gnus-summary-lower-score t]))))
 
         ["Increase score..." gnus-summary-increase-score t]
         ["Lower score..." gnus-summary-lower-score t]))))
 

-    '(("Default header"
-       ["Ask" (gnus-score-set-default 'gnus-score-default-header nil)
-       :style radio
-       :selected (null gnus-score-default-header)]
-       ["From" (gnus-score-set-default 'gnus-score-default-header 'a)
-       :style radio
-       :selected (eq gnus-score-default-header 'a)]
-       ["Subject" (gnus-score-set-default 'gnus-score-default-header 's)
-       :style radio
-       :selected (eq gnus-score-default-header 's)]
-       ["Article body"
-       (gnus-score-set-default 'gnus-score-default-header 'b)
-       :style radio
-       :selected (eq gnus-score-default-header 'b )]
-       ["All headers"
-       (gnus-score-set-default 'gnus-score-default-header 'h)
-       :style radio
-       :selected (eq gnus-score-default-header 'h )]
-       ["Message-ID" (gnus-score-set-default 'gnus-score-default-header 'i)
-       :style radio
-       :selected (eq gnus-score-default-header 'i )]
-       ["Thread" (gnus-score-set-default 'gnus-score-default-header 't)
-       :style radio
-       :selected (eq gnus-score-default-header 't )]
-       ["Crossposting"
-       (gnus-score-set-default 'gnus-score-default-header 'x)
-       :style radio
-       :selected (eq gnus-score-default-header 'x )]
-       ["Lines" (gnus-score-set-default 'gnus-score-default-header 'l)
-       :style radio
-       :selected (eq gnus-score-default-header 'l )]
-       ["Date" (gnus-score-set-default 'gnus-score-default-header 'd)
-       :style radio
-       :selected (eq gnus-score-default-header 'd )]
-       ["Followups to author"
-       (gnus-score-set-default 'gnus-score-default-header 'f)
-       :style radio
-       :selected (eq gnus-score-default-header 'f )])
-      ("Default type"
-       ["Ask" (gnus-score-set-default 'gnus-score-default-type nil)
-       :style radio
-       :selected (null gnus-score-default-type)]
-       ;; The `:active' key is commented out in the following,
-       ;; because the GNU Emacs hack to support radio buttons use
-       ;; active to indicate which button is selected.
-       ["Substring" (gnus-score-set-default 'gnus-score-default-type 's)
-       :style radio
-       ;; :active (not (memq gnus-score-default-header '(l d)))
-       :selected (eq gnus-score-default-type 's)]
-       ["Regexp" (gnus-score-set-default 'gnus-score-default-type 'r)
-       :style radio
-       ;; :active (not (memq gnus-score-default-header '(l d)))
-       :selected (eq gnus-score-default-type 'r)]
-       ["Exact" (gnus-score-set-default 'gnus-score-default-type 'e)
-       :style radio
-       ;; :active (not (memq gnus-score-default-header '(l d)))
-       :selected (eq gnus-score-default-type 'e)]
-       ["Fuzzy" (gnus-score-set-default 'gnus-score-default-type 'f)
-       :style radio
-       ;; :active (not (memq gnus-score-default-header '(l d)))
-       :selected (eq gnus-score-default-type 'f)]
-       ["Before date" (gnus-score-set-default 'gnus-score-default-type 'b)
-       :style radio
-       ;; :active (eq (gnus-score-default-header 'd))
-       :selected (eq gnus-score-default-type 'b)]
-       ["At date" (gnus-score-set-default 'gnus-score-default-type 'n)
-       :style radio
-       ;; :active (eq (gnus-score-default-header 'd))
-       :selected (eq gnus-score-default-type 'n)]
-       ["After date" (gnus-score-set-default 'gnus-score-default-type 'a)
-       :style radio
-       ;; :active (eq (gnus-score-default-header 'd))
-       :selected (eq gnus-score-default-type 'a)]
-       ["Less than number"
-       (gnus-score-set-default 'gnus-score-default-type '<)
-       :style radio
-       ;; :active (eq (gnus-score-default-header 'l))
-       :selected (eq gnus-score-default-type '<)]
-       ["Equal to number"
-       (gnus-score-set-default 'gnus-score-default-type '=)
-       :style radio
-       ;; :active (eq (gnus-score-default-header 'l))
-       :selected (eq gnus-score-default-type '=)]
-       ["Greater than number"
-       (gnus-score-set-default 'gnus-score-default-type '>)
-       :style radio
-       ;; :active (eq (gnus-score-default-header 'l))
-       :selected (eq gnus-score-default-type '>)])
-      ["Default fold" gnus-score-default-fold-toggle
-       :style toggle
-       :selected gnus-score-default-fold]
-      ("Default duration"
-       ["Ask" (gnus-score-set-default 'gnus-score-default-duration nil)
-       :style radio
-       :selected (null gnus-score-default-duration)]
-       ["Permanent"
-       (gnus-score-set-default 'gnus-score-default-duration 'p)
-       :style radio
-       :selected (eq gnus-score-default-duration 'p)]
-       ["Temporary"
-       (gnus-score-set-default 'gnus-score-default-duration 't)
-       :style radio
-       :selected (eq gnus-score-default-duration 't)]
-       ["Immediate"
-       (gnus-score-set-default 'gnus-score-default-duration 'i)
-       :style radio
-       :selected (eq gnus-score-default-duration 'i)]))
-
-    (easy-menu-define
-     gnus-summary-article-menu gnus-summary-mode-map ""
-     '("Article"
-       ("Hide"
-       ["All" gnus-article-hide t]
-       ["Headers" gnus-article-hide-headers t]
-       ["Signature" gnus-article-hide-signature t]
-       ["Citation" gnus-article-hide-citation t]
-       ["PGP" gnus-article-hide-pgp t]
-       ["Boring headers" gnus-article-hide-boring-headers t])
-       ("Highlight"
-       ["All" gnus-article-highlight t]
-       ["Headers" gnus-article-highlight-headers t]
-       ["Signature" gnus-article-highlight-signature t]
-       ["Citation" gnus-article-highlight-citation t])
-       ("Date"
-       ["Local" gnus-article-date-local t]
-       ["ISO8601" gnus-article-date-iso8601 t]
-       ["UT" gnus-article-date-ut t]
-       ["Original" gnus-article-date-original t]
-       ["Lapsed" gnus-article-date-lapsed t]
-       ["User-defined" gnus-article-date-user t])
-       ("Washing"
-       ("Remove Blanks"
-        ["Leading" gnus-article-strip-leading-blank-lines t]
-        ["Multiple" gnus-article-strip-multiple-blank-lines t]
-        ["Trailing" gnus-article-remove-trailing-blank-lines t]
-        ["All of the above" gnus-article-strip-blank-lines t]
-        ["All" gnus-article-strip-all-blank-lines t]
-        ["Leading space" gnus-article-strip-leading-space t])
-       ["Overstrike" gnus-article-treat-overstrike t]
-       ["Dumb quotes" gnus-article-treat-dumbquotes t]
-       ["Emphasis" gnus-article-emphasize t]
-       ["Word wrap" gnus-article-fill-cited-article t]
-       ["CR" gnus-article-remove-cr t]
-       ["Show X-Face" gnus-article-display-x-face t]
-       ["UnHTMLize" gnus-article-treat-html t]
-       ["Rot 13" gnus-summary-caesar-message t]
-       ["Unix pipe" gnus-summary-pipe-message t]
-       ["Add buttons" gnus-article-add-buttons t]
-       ["Add buttons to head" gnus-article-add-buttons-to-head t]
-       ["Stop page breaking" gnus-summary-stop-page-breaking t]
-       ["Toggle MIME" gnus-summary-toggle-mime t]
-       ["Verbose header" gnus-summary-verbose-headers t]
-       ["Toggle header" gnus-summary-toggle-header t])
-       ("Output"
-       ["Save in default format" gnus-summary-save-article t]
-       ["Save in file" gnus-summary-save-article-file t]
-       ["Save in Unix mail format" gnus-summary-save-article-mail t]
-       ["Save in MH folder" gnus-summary-save-article-folder t]
-       ["Save in VM folder" gnus-summary-save-article-vm t]
-       ["Save in RMAIL mbox" gnus-summary-save-article-rmail t]
-       ["Save body in file" gnus-summary-save-article-body-file t]
-       ["Pipe through a filter" gnus-summary-pipe-output t]
-       ["Add to SOUP packet" gnus-soup-add-article t]
-       ["Print" gnus-summary-print-article t])
-       ("Backend"
-       ["Respool article..." gnus-summary-respool-article t]
-       ["Move article..." gnus-summary-move-article
-        (gnus-check-backend-function
-         'request-move-article gnus-newsgroup-name)]
-       ["Copy article..." gnus-summary-copy-article t]
-       ["Crosspost article..." gnus-summary-crosspost-article
-        (gnus-check-backend-function
-         'request-replace-article gnus-newsgroup-name)]
-       ["Import file..." gnus-summary-import-article t]
-       ["Check if posted" gnus-summary-article-posted-p t]
-       ["Edit article" gnus-summary-edit-article
-        (not (gnus-group-read-only-p))]
-       ["Delete article" gnus-summary-delete-article
-        (gnus-check-backend-function
-         'request-expire-articles gnus-newsgroup-name)]
-       ["Query respool" gnus-summary-respool-query t]
-       ["Delete expirable articles" gnus-summary-expire-articles-now
-        (gnus-check-backend-function
-         'request-expire-articles gnus-newsgroup-name)])
-       ("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]
-       ["Postscript" gnus-uu-decode-postscript t])
-       ("Cache"
-       ["Enter article" gnus-cache-enter-article t]
-       ["Remove article" gnus-cache-remove-article t])
-       ["Select article buffer" gnus-summary-select-article-buffer t]
-       ["Enter digest buffer" gnus-summary-enter-digest-group t]
-       ["Isearch article..." gnus-summary-isearch-article 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 referenced articles" gnus-summary-refer-references t]
-       ["Fetch current thread" gnus-summary-refer-thread t]
-       ["Fetch article with id..." gnus-summary-refer-article t]
-       ["Redisplay" gnus-summary-show-article t]))
+    ;; Define both the Article menu in the summary buffer and the equivalent
+    ;; Commands menu in the article buffer here for consistency.
+    (let ((innards
+           '(("Hide"
+              ["All" gnus-article-hide t]
+              ["Headers" gnus-article-hide-headers t]
+              ["Signature" gnus-article-hide-signature t]
+              ["Citation" gnus-article-hide-citation t]
+              ["PGP" gnus-article-hide-pgp t]
+              ["Boring headers" gnus-article-hide-boring-headers t])
+             ("Highlight"
+              ["All" gnus-article-highlight t]
+              ["Headers" gnus-article-highlight-headers t]
+              ["Signature" gnus-article-highlight-signature t]
+              ["Citation" gnus-article-highlight-citation t])
+             ("Date"
+              ["Local" gnus-article-date-local t]
+              ["ISO8601" gnus-article-date-iso8601 t]
+              ["UT" gnus-article-date-ut t]
+              ["Original" gnus-article-date-original t]
+              ["Lapsed" gnus-article-date-lapsed t]
+              ["User-defined" gnus-article-date-user t])
+             ("Washing"
+              ("Remove Blanks"
+               ["Leading" gnus-article-strip-leading-blank-lines t]
+               ["Multiple" gnus-article-strip-multiple-blank-lines t]
+               ["Trailing" gnus-article-remove-trailing-blank-lines t]
+               ["All of the above" gnus-article-strip-blank-lines t]
+               ["All" gnus-article-strip-all-blank-lines t]
+               ["Leading space" gnus-article-strip-leading-space t])
+              ["Overstrike" gnus-article-treat-overstrike t]
+              ["Dumb quotes" gnus-article-treat-dumbquotes t]
+              ["Emphasis" gnus-article-emphasize t]
+              ["Word wrap" gnus-article-fill-cited-article t]
+              ["CR" gnus-article-remove-cr t]
+              ["Show X-Face" gnus-article-display-x-face t]
+              ["UnHTMLize" gnus-article-treat-html t]
+              ["Rot 13" gnus-summary-caesar-message t]
+              ["Unix pipe" gnus-summary-pipe-message t]
+              ["Add buttons" gnus-article-add-buttons t]
+              ["Add buttons to head" gnus-article-add-buttons-to-head t]
+              ["Stop page breaking" gnus-summary-stop-page-breaking t]
+              ["Toggle MIME" gnus-summary-toggle-mime t]
+              ["Verbose header" gnus-summary-verbose-headers t]
+              ["Toggle header" gnus-summary-toggle-header t])
+             ("Output"
+              ["Save in default format" gnus-summary-save-article t]
+              ["Save in file" gnus-summary-save-article-file t]
+              ["Save in Unix mail format" gnus-summary-save-article-mail t]
+              ["Save in MH folder" gnus-summary-save-article-folder t]
+              ["Save in VM folder" gnus-summary-save-article-vm t]
+              ["Save in RMAIL mbox" gnus-summary-save-article-rmail t]
+              ["Save body in file" gnus-summary-save-article-body-file t]
+              ["Pipe through a filter" gnus-summary-pipe-output t]
+              ["Add to SOUP packet" gnus-soup-add-article t]
+              ["Print" gnus-summary-print-article t])
+             ("Backend"
+              ["Respool article..." gnus-summary-respool-article t]
+              ["Move article..." gnus-summary-move-article
+               (gnus-check-backend-function
+                'request-move-article gnus-newsgroup-name)]
+              ["Copy article..." gnus-summary-copy-article t]
+              ["Crosspost article..." gnus-summary-crosspost-article
+               (gnus-check-backend-function
+                'request-replace-article gnus-newsgroup-name)]
+              ["Import file..." gnus-summary-import-article t]
+              ["Check if posted" gnus-summary-article-posted-p t]
+              ["Edit article" gnus-summary-edit-article
+               (not (gnus-group-read-only-p))]
+              ["Delete article" gnus-summary-delete-article
+               (gnus-check-backend-function
+                'request-expire-articles gnus-newsgroup-name)]
+              ["Query respool" gnus-summary-respool-query t]
+              ["Delete expirable articles" gnus-summary-expire-articles-now
+               (gnus-check-backend-function
+                'request-expire-articles gnus-newsgroup-name)])
+             ("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]
+              ["Postscript" gnus-uu-decode-postscript t])
+             ("Cache"
+              ["Enter article" gnus-cache-enter-article t]
+              ["Remove article" gnus-cache-remove-article t])
+             ["Select article buffer" gnus-summary-select-article-buffer t]
+             ["Enter digest buffer" gnus-summary-enter-digest-group t]
+             ["Isearch article..." gnus-summary-isearch-article 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 referenced articles" gnus-summary-refer-references t]
+             ["Fetch current thread" gnus-summary-refer-thread t]
+             ["Fetch article with id..." gnus-summary-refer-article t]
+             ["Redisplay" gnus-summary-show-article t])))
+      (easy-menu-define
+       gnus-summary-article-menu gnus-summary-mode-map ""
+       (cons "Article" innards))
+
+      (easy-menu-define
+       gnus-article-commands-menu gnus-article-mode-map ""
+       (cons "Commands" innards)))

 
     (easy-menu-define
      gnus-summary-thread-menu gnus-summary-mode-map ""
 
     (easy-menu-define
      gnus-summary-thread-menu gnus-summary-mode-map ""

@@ -1777,7 +1676,9 @@ increase the score of each group you read."
        ["Mark above" gnus-uu-mark-over t]
        ["Mark series" gnus-uu-mark-series t]
        ["Mark region" gnus-uu-mark-region t]
        ["Mark above" gnus-uu-mark-over t]
        ["Mark series" gnus-uu-mark-series t]
        ["Mark region" gnus-uu-mark-region t]

+       ["Unmark region" gnus-uu-unmark-region t]

        ["Mark by regexp..." gnus-uu-mark-by-regexp t]
        ["Mark by regexp..." gnus-uu-mark-by-regexp t]

+        ["Unmark by regexp..." gnus-uu-unmark-by-regexp t]

        ["Mark all" gnus-uu-mark-all t]
        ["Mark buffer" gnus-uu-mark-buffer t]
        ["Mark sparse" gnus-uu-mark-sparse t]
        ["Mark all" gnus-uu-mark-all t]
        ["Mark buffer" gnus-uu-mark-buffer t]
        ["Mark sparse" gnus-uu-mark-sparse t]

@@ -2603,6 +2504,7 @@ the thread are to be displayed."
       (and (consp elem)                        ; Has to be a cons.
           (consp (cdr elem))           ; The cdr has to be a list.
           (symbolp (car elem))         ; Has to be a symbol in there.
       (and (consp elem)                        ; Has to be a cons.
           (consp (cdr elem))           ; The cdr has to be a list.
           (symbolp (car elem))         ; Has to be a symbol in there.

+          (not (memq (car elem) '(quit-config))) ; Ignore quit-config.

           (ignore-errors               ; So we set it.
             (make-local-variable (car elem))
             (set (car elem) (eval (nth 1 elem))))))))
           (ignore-errors               ; So we set it.
             (make-local-variable (car elem))
             (set (car elem) (eval (nth 1 elem))))))))

@@ -3235,19 +3137,23 @@ If NO-DISPLAY, don't generate a summary buffer."
     (when headers
       (car headers))))
 
     (when headers
       (car headers))))
 

-(defun gnus-parent-headers (headers &optional generation)
+(defun gnus-parent-headers (in-headers &optional generation)

   "Return the headers of the GENERATIONeth parent of HEADERS."
   (unless generation
     (setq generation 1))
   (let ((parent t)
   "Return the headers of the GENERATIONeth parent of HEADERS."
   (unless generation
     (setq generation 1))
   (let ((parent t)

+       (headers in-headers)

        references)
        references)

-    (while (and parent headers (not (zerop generation)))
-      (setq references (mail-header-references headers))
+    (while (and parent
+               headers
+               (not (zerop generation))
+               (setq references (mail-header-references headers)))

       (when (and references
                 (setq parent (gnus-parent-id references))
                 (setq headers (car (gnus-id-to-thread parent))))
        (decf generation)))
       (when (and references
                 (setq parent (gnus-parent-id references))
                 (setq headers (car (gnus-id-to-thread parent))))
        (decf generation)))

-    headers))
+    (and (not (eq headers in-headers))
+        headers)))

 
 (defun gnus-id-to-thread (id)
   "Return the (sub-)thread where ID appears."
 
 (defun gnus-id-to-thread (id)
   "Return the (sub-)thread where ID appears."

@@ -3651,7 +3557,10 @@ or a straight list of headers."
          (when gnus-tmp-header
            ;; We may have an old dummy line to output before this
            ;; article.
          (when gnus-tmp-header
            ;; We may have an old dummy line to output before this
            ;; article.

-           (when gnus-tmp-dummy-line
+           (when (and gnus-tmp-dummy-line
+                      (gnus-subject-equal
+                       gnus-tmp-dummy-line
+                       (mail-header-subject gnus-tmp-header)))

              (gnus-summary-insert-dummy-line
               gnus-tmp-dummy-line (mail-header-number gnus-tmp-header))
              (setq gnus-tmp-dummy-line nil))
              (gnus-summary-insert-dummy-line
               gnus-tmp-dummy-line (mail-header-number gnus-tmp-header))
              (setq gnus-tmp-dummy-line nil))

@@ -3856,11 +3765,11 @@ If READ-ALL is non-nil, all articles in the group are selected."
                           articles gnus-newsgroup-name
                           ;; We might want to fetch old headers, but
                           ;; not if there is only 1 article.
                           articles gnus-newsgroup-name
                           ;; We might want to fetch old headers, but
                           ;; not if there is only 1 article.

-                          (and gnus-fetch-old-headers
-                               (or (and
+                          (and (or (and

                                     (not (eq gnus-fetch-old-headers 'some))
                                     (not (numberp gnus-fetch-old-headers)))
                                     (not (eq gnus-fetch-old-headers 'some))
                                     (not (numberp gnus-fetch-old-headers)))

-                                   (> (length articles) 1))))))
+                                   (> (length articles) 1))
+                               gnus-fetch-old-headers))))

                (gnus-get-newsgroup-headers-xover
                 articles nil nil gnus-newsgroup-name t)
              (gnus-get-newsgroup-headers)))
                (gnus-get-newsgroup-headers-xover
                 articles nil nil gnus-newsgroup-name t)
              (gnus-get-newsgroup-headers)))

@@ -5069,12 +4978,7 @@ The prefix argument ALL means to select all articles."
                 t)))
        (unless (listp (cdr gnus-newsgroup-killed))
          (setq gnus-newsgroup-killed (list gnus-newsgroup-killed)))
                 t)))
        (unless (listp (cdr gnus-newsgroup-killed))
          (setq gnus-newsgroup-killed (list gnus-newsgroup-killed)))

-       (let ((headers gnus-newsgroup-headers)
-             (gnus-newsgroup-scored 
-              (if (and (not gnus-save-score)
-                       (not non-destructive))
-                  nil
-                gnus-newsgroup-scored)))
+       (let ((headers gnus-newsgroup-headers))

          ;; Set the new ranges of read articles.
          (save-excursion
            (set-buffer gnus-group-buffer)
          ;; Set the new ranges of read articles.
          (save-excursion
            (set-buffer gnus-group-buffer)

@@ -5082,7 +4986,13 @@ The prefix argument ALL means to select all articles."
          (gnus-update-read-articles
           group (append gnus-newsgroup-unreads gnus-newsgroup-unselected))
          ;; Set the current article marks.
          (gnus-update-read-articles
           group (append gnus-newsgroup-unreads gnus-newsgroup-unselected))
          ;; Set the current article marks.

-         (gnus-update-marks)
+         (let ((gnus-newsgroup-scored 
+                (if (and (not gnus-save-score)
+                         (not non-destructive))
+                    nil
+                  gnus-newsgroup-scored)))
+           (save-excursion
+             (gnus-update-marks)))

          ;; Do the cross-ref thing.
          (when gnus-use-cross-reference
            (gnus-mark-xrefs-as-read group headers gnus-newsgroup-unreads))
          ;; Do the cross-ref thing.
          (when gnus-use-cross-reference
            (gnus-mark-xrefs-as-read group headers gnus-newsgroup-unreads))

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 0652061..e48b14f 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -925,7 +925,7 @@ ARG is passed to the first function."
 
 (defun gnus-alive-p ()
   "Say whether Gnus is running or not."
 
 (defun gnus-alive-p ()
   "Say whether Gnus is running or not."

-  (and gnus-group-buffer
+  (and (boundp 'gnus-group-buffer)

        (get-buffer gnus-group-buffer)
        (save-excursion
         (set-buffer gnus-group-buffer)
        (get-buffer gnus-group-buffer)
        (save-excursion
         (set-buffer gnus-group-buffer)

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 46c38fb..1caef47 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -353,7 +353,9 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
   "v" gnus-uu-mark-over
   "s" gnus-uu-mark-series
   "r" gnus-uu-mark-region
   "v" gnus-uu-mark-over
   "s" gnus-uu-mark-series
   "r" gnus-uu-mark-region

+  "g" gnus-uu-unmark-region

   "R" gnus-uu-mark-by-regexp
   "R" gnus-uu-mark-by-regexp

+  "G" gnus-uu-unmark-by-regexp

   "t" gnus-uu-mark-thread
   "T" gnus-uu-unmark-thread
   "a" gnus-uu-mark-all
   "t" gnus-uu-mark-thread
   "T" gnus-uu-unmark-thread
   "a" gnus-uu-mark-all

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index b32c64f..bb0e475 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -366,6 +366,10 @@ call it with the value of the `gnus-data' text property."
   (gnus-xmas-menu-add tree
     gnus-tree-menu))
 
   (gnus-xmas-menu-add tree
     gnus-tree-menu))
 

+(defun gnus-xmas-draft-menu-add ()
+  (gnus-xmas-menu-add draft
+    gnus-draft-menu))
+

 (defun gnus-xmas-server-menu-add ()
   (gnus-xmas-menu-add menu
     gnus-server-server-menu gnus-server-connections-menu))
 (defun gnus-xmas-server-menu-add ()
   (gnus-xmas-menu-add menu
     gnus-server-server-menu gnus-server-connections-menu))

@@ -517,7 +521,8 @@ call it with the value of the `gnus-data' text property."
   (add-hook 'gnus-agent-summary-mode-hook 'gnus-xmas-agent-summary-menu-add)
   (add-hook 'gnus-agent-group-mode-hook 'gnus-xmas-agent-group-menu-add)
   (add-hook 'gnus-agent-server-mode-hook 'gnus-xmas-agent-server-menu-add)
   (add-hook 'gnus-agent-summary-mode-hook 'gnus-xmas-agent-summary-menu-add)
   (add-hook 'gnus-agent-group-mode-hook 'gnus-xmas-agent-group-menu-add)
   (add-hook 'gnus-agent-server-mode-hook 'gnus-xmas-agent-server-menu-add)

-  
+
+  (add-hook 'gnus-draft-mode-hook 'gnus-xmas-draft-menu-add)

   (add-hook 'gnus-summary-mode-hook
            'gnus-xmas-switch-horizontal-scrollbar-off)
   (add-hook 'gnus-tree-mode-hook 'gnus-xmas-switch-horizontal-scrollbar-off))
   (add-hook 'gnus-summary-mode-hook
            'gnus-xmas-switch-horizontal-scrollbar-off)
   (add-hook 'gnus-tree-mode-hook 'gnus-xmas-switch-horizontal-scrollbar-off))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 482420a..682359f 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -250,11 +250,11 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 

-(defconst gnus-version-number "6.2.3"
+(defconst gnus-version-number "6.2.4"

   "Version number for this version of gnus.")
 
 (defconst gnus-version
   "Version number for this version of gnus.")
 
 (defconst gnus-version

-  (format "Semi-gnus %s (based on Gnus 5.6.6; for SEMI 1.3)"
+  (format "Semi-gnus %s (based on Gnus 5.6.7; for SEMI 1.3)"

           gnus-version-number)
   "Version string for this version of gnus.")
 
           gnus-version-number)
   "Version string for this version of gnus.")
 

@@ -708,7 +708,12 @@ All other Gnus path variables are initialized from this variable."
 
 (defcustom gnus-directory (or (getenv "SAVEDIR")
                              (nnheader-concat gnus-home-directory "News/"))
 
 (defcustom gnus-directory (or (getenv "SAVEDIR")
                              (nnheader-concat gnus-home-directory "News/"))

-  "*Directory variable from which all other Gnus file variables are derived."
+  "*Directory variable from which all other Gnus file variables are derived.
+
+Note that Gnus is mostly loaded when the `.gnus.el' file is read.
+This means that other directory variables that are initialized from
+this variable won't be set properly if you set this variable in `.gnus.el'.
+Set this variable in `.emacs' instead."

   :group 'gnus-files
   :type 'directory)
 
   :group 'gnus-files
   :type 'directory)
 

@@ -2411,10 +2416,19 @@ also examines the topic parameters."
 
 (defun gnus-group-parameter-value (params symbol &optional allow-list)
   "Return the value of SYMBOL in group PARAMS."
 
 (defun gnus-group-parameter-value (params symbol &optional allow-list)
   "Return the value of SYMBOL in group PARAMS."

-  (or (car (memq symbol params))       ; It's either a simple symbol, 
-      (and (or allow-list
-              (atom (cdr (assq symbol params)))) ; and it's not a local variable
-          (cdr (assq symbol params))))) ; but a cons.
+  ;; We only wish to return group parameters (dotted lists) and
+  ;; not local variables, which may have the same names.
+  ;; But first we handle single elements...
+  (or (car (memq symbol params))
+      ;; Handle alist.
+      (let (elem)
+       (catch 'found
+         (while (setq elem (pop params))
+           (when (and (consp elem)
+                      (eq (car elem) symbol)
+                      (or allow-list
+                          (atom (cdr elem))))
+             (throw 'found (cdr elem))))))))

 
 (defun gnus-group-add-parameter (group param)
   "Add parameter PARAM to GROUP."
 
 (defun gnus-group-add-parameter (group param)
   "Add parameter PARAM to GROUP."

diff --git a/lisp/message.el b/lisp/message.el
index 9605ff5..5ec1728 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -408,7 +408,9 @@ might set this variable to '(\"-f\" \"you@some.where\")."
        ((boundp 'gnus-select-method)
         gnus-select-method)
        (t '(nnspool "")))
        ((boundp 'gnus-select-method)
         gnus-select-method)
        (t '(nnspool "")))

-  "*Method used to post news."
+  "*Method used to post news.
+Note that when posting from inside Gnus, for instance, this
+variable isn't used."

   :group 'message-news
   :group 'message-sending
   ;; This should be the `gnus-select-method' widget, but that might
   :group 'message-news
   :group 'message-sending
   ;; This should be the `gnus-select-method' widget, but that might

diff --git a/lisp/nntp.el b/lisp/nntp.el
index fa99b1e..67c6957 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -144,10 +144,6 @@ by one.")
 If the gap between two consecutive articles is bigger than this
 variable, split the XOVER request into two requests.")
 
 If the gap between two consecutive articles is bigger than this
 variable, split the XOVER request into two requests.")
 

-(defvoo nntp-connection-timeout nil
-  "*Number of seconds to wait before an nntp connection times out.
-If this variable is nil, which is the default, no timers are set.")
-

 (defvoo nntp-prepare-server-hook nil
   "*Hook run before a server is opened.
 If can be used to set up a server remotely, for instance.  Say you
 (defvoo nntp-prepare-server-hook nil
   "*Hook run before a server is opened.
 If can be used to set up a server remotely, for instance.  Say you

@@ -676,15 +672,16 @@ server there that you can connect to.  See also
 
 (deffoo nntp-close-server (&optional server)
   (nntp-possibly-change-group nil server t)
 
 (deffoo nntp-close-server (&optional server)
   (nntp-possibly-change-group nil server t)

-  (let (process)
-    (while (setq process (car (pop nntp-connection-alist)))
+  (let ((process (nntp-find-connection nntp-server-buffer)))
+    (while process

       (when (memq (process-status process) '(open run))
        (ignore-errors
          (nntp-send-string process "QUIT")
          (unless (eq nntp-open-connection-function 'nntp-open-network-stream)
            (sleep-for 1))))
       (when (buffer-name (process-buffer process))
       (when (memq (process-status process) '(open run))
        (ignore-errors
          (nntp-send-string process "QUIT")
          (unless (eq nntp-open-connection-function 'nntp-open-network-stream)
            (sleep-for 1))))
       (when (buffer-name (process-buffer process))

-       (kill-buffer (process-buffer process))))
+       (kill-buffer (process-buffer process)))
+      (setq process (car (pop nntp-connection-alist))))

     (nnoo-close-server 'nntp)))
 
 (deffoo nntp-request-close ()
     (nnoo-close-server 'nntp)))
 
 (deffoo nntp-request-close ()

diff --git a/lisp/score-mode.el b/lisp/score-mode.el
index f488947..42264ed 100644 (file)
--- a/lisp/score-mode.el
+++ b/lisp/score-mode.el
@@ -46,7 +46,7 @@
   (define-key gnus-score-mode-map "\C-c\C-p" 'gnus-score-pretty-print))
 
 (defvar score-mode-syntax-table
   (define-key gnus-score-mode-map "\C-c\C-p" 'gnus-score-pretty-print))
 
 (defvar score-mode-syntax-table

-  (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table)))
+  (let ((table (copy-syntax-table lisp-mode-syntax-table)))

     (modify-syntax-entry ?| "w" table)
     table)
   "Syntax table used in score-mode buffers.")
     (modify-syntax-entry ?| "w" table)
     table)
   "Syntax table used in score-mode buffers.")

diff --git a/texi/ChangeLog b/texi/ChangeLog
index b92670f..1986659 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 29 21:52:28 1998  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus.texi (Key Index): Untabified.
+       (Group Parameters): Fix.
+

 Sun Apr 26 15:32:45 1998  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
 
        * gnus.texi (Summary Post Commands): Ref to Message.
 Sun Apr 26 15:32:45 1998  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
 
        * gnus.texi (Summary Post Commands): Ref to Message.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 0737bfc..c99e60d 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus

-@settitle Semi-gnus 6.1.2 Manual
+@settitle Semi-gnus 6.2.4 Manual

 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp

@@ -316,7 +316,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
 @tex
 
 @titlepage

-@title Semi-gnus 6.1.2 Manual
+@title Semi-gnus 6.2.4 Manual

 
 @author by Lars Magne Ingebrigtsen
 @page
 
 @author by Lars Magne Ingebrigtsen
 @page

@@ -359,7 +359,7 @@ internationalization/localization and multiscript features based on MULE
 API.  So Semi-gnus does not discriminate various language communities.
 Oh, if you are a Klingon, please wait Unicode Next Generation.
 
 API.  So Semi-gnus does not discriminate various language communities.
 Oh, if you are a Klingon, please wait Unicode Next Generation.
 

-This manual corresponds to Semi-gnus 6.1.2.
+This manual corresponds to Semi-gnus 6.2.4.

 
 @end ifinfo
 
 
 @end ifinfo
 

@@ -1286,10 +1286,10 @@ background is dark:
 
 (setq gnus-group-highlight
       '(((> unread 200) . my-group-face-1)
 
 (setq gnus-group-highlight
       '(((> unread 200) . my-group-face-1)

-       ((and (< level 3) (zerop unread)) . my-group-face-2)
-       ((< level 3) . my-group-face-3)
-       ((zerop unread) . my-group-face-4)
-       (t . my-group-face-5)))
+        ((and (< level 3) (zerop unread)) . my-group-face-2)
+        ((< level 3) . my-group-face-3)
+        ((zerop unread) . my-group-face-4)
+        (t . my-group-face-5)))

 @end lisp
 
 Also @pxref{Faces and Fonts}.
 @end lisp
 
 Also @pxref{Faces and Fonts}.

@@ -2074,8 +2074,8 @@ the symbols @code{never} or @code{immediate}.
 @item score-file
 @cindex score file group parameter
 Elements that look like @code{(score-file . "file")} will make
 @item score-file
 @cindex score file group parameter
 Elements that look like @code{(score-file . "file")} will make

-@file{file} into the current adaptive score file for the group in
-question.  All adaptive score entries will be put into this file.
+@file{file} into the current score file for the group in question.  All
+interactive score entries will be put into this file.

 
 @item adapt-file
 @cindex adapt file group parameter
 
 @item adapt-file
 @cindex adapt file group parameter

@@ -12714,9 +12714,9 @@ their own home score files:
 @lisp
 (setq gnus-home-score-file
       ;; All groups that match the regexp "\\.emacs"
 @lisp
 (setq gnus-home-score-file
       ;; All groups that match the regexp "\\.emacs"

-      '("\\.emacs" "emacs.SCORE")
-      ;; All the comp groups in one score file
-       ("^comp" "comp.SCORE"))
+      '(("\\.emacs" "emacs.SCORE")
+        ;; All the comp groups in one score file
+        ("^comp" "comp.SCORE")))

 @end lisp
 
 @vindex gnus-home-adapt-file
 @end lisp
 
 @vindex gnus-home-adapt-file

@@ -15106,6 +15106,11 @@ Most Gnus storage path variables will be initialized from this variable,
 which defaults to the @samp{SAVEDIR} environment variable, or
 @file{~/News/} if that variable isn't set.
 
 which defaults to the @samp{SAVEDIR} environment variable, or
 @file{~/News/} if that variable isn't set.
 

+Note that gnus is mostly loaded when the @file{.gnus.el} file is read.
+This means that other directory variables that are initialized from this
+variable won't be set properly if you set this variable in
+@file{.gnus.el}.  Set this variable in @file{.emacs} instead.
+

 @item gnus-default-directory
 @vindex gnus-default-directory
 Not related to the above variable at all---this variable says what the
 @item gnus-default-directory
 @vindex gnus-default-directory
 Not related to the above variable at all---this variable says what the

@@ -15714,7 +15719,7 @@ actually are people who are using Gnus.  Who'd'a thunk it!
 * ding Gnus::          New things in Gnus 5.0/5.1, the first new Gnus.
 * September Gnus::     The Thing Formally Known As Gnus 5.3/5.3.
 * Red Gnus::           Third time best---Gnus 5.4/5.5.
 * ding Gnus::          New things in Gnus 5.0/5.1, the first new Gnus.
 * September Gnus::     The Thing Formally Known As Gnus 5.3/5.3.
 * Red Gnus::           Third time best---Gnus 5.4/5.5.

-* Quassia Gnus::       Two times two is four, or Gnus 5.6.6.
+* Quassia Gnus::       Two times two is four, or Gnus 5.6.7.

 @end menu
 
 These lists are, of course, just @emph{short} overviews of the
 @end menu
 
 These lists are, of course, just @emph{short} overviews of the

@@ -16249,7 +16254,7 @@ Emphasized text can be properly fontisized:
 @node Quassia Gnus
 @subsubsection Quassia Gnus
 
 @node Quassia Gnus
 @subsubsection Quassia Gnus
 

-New features in Gnus 5.6.6:
+New features in Gnus 5.6.7:

 
 @itemize @bullet
 
 
 @itemize @bullet
 

@@ -17040,7 +17045,7 @@ They could be used like this:
 
 <expr> would be a boolean expression on the labels, e.g.
 
 
 <expr> would be a boolean expression on the labels, e.g.
 

-       `/ l bug & !fixed RET'
+`/ l bug & !fixed RET'

 @end example
 
 would show all the messages which are labeled `bug' but not labeled
 @end example
 
 would show all the messages which are labeled `bug' but not labeled

@@ -17102,14 +17107,14 @@ as a single spoiler warning and hide it all, replacing it with a "Next Page"
 button:
 
 
 button:
 
 

-       ^L's
+^L's

 
 

-       more than n blank lines
+more than n blank lines

 
 

-       more than m identical lines
-       (which should be replaced with button to show them)
+more than m identical lines
+(which should be replaced with button to show them)

 
 

-       any whitespace surrounding any of the above
+any whitespace surrounding any of the above

 
 
 @item
 
 
 @item

@@ -17139,30 +17144,30 @@ Yes. I think the algorithm is as follows:
 Group-mode
 
    show-list-of-articles-in-group
 Group-mode
 
    show-list-of-articles-in-group

-       if (key-pressed == SPACE)
-               if (no-more-articles-in-group-to-select)
-                       if (articles-selected)
-                               start-reading-selected-articles;
-                       junk-unread-articles;
-                       next-group;
-                else
-                       show-next-page;
-
-        else if (key-pressed = '.')
-               if (consolidated-menus)         # same as hide-thread in Gnus
-                       select-thread-under-cursor;
-               else
-                       select-article-under-cursor;
+        if (key-pressed == SPACE)
+                if (no-more-articles-in-group-to-select)
+                        if (articles-selected)
+                                start-reading-selected-articles;
+                        junk-unread-articles;
+                        next-group;
+                 else
+                        show-next-page;
+
+         else if (key-pressed = '.')
+                if (consolidated-menus)         # same as hide-thread in Gnus
+                        select-thread-under-cursor;
+                else
+                        select-article-under-cursor;

 
 
 Article-mode
 
 
 Article-mode

-       if (key-pressed == SPACE)
-               if (more-pages-in-article)
-                       next-page;
-               else if (more-selected-articles-to-read)
-                       next-article;
-               else
-                       next-group;
+        if (key-pressed == SPACE)
+                if (more-pages-in-article)
+                        next-page;
+                else if (more-selected-articles-to-read)
+                        next-article;
+                else
+                        next-group;

 @end example
 
 @item
 @end example
 
 @item

@@ -17179,7 +17184,7 @@ the wildcard expression).
 @item
 It would be nice if it also handled
 
 @item
 It would be nice if it also handled
 

-       <URL:news://sunsite.auc.dk/>
+        <URL:news://sunsite.auc.dk/>

 
 which should correspond to `B nntp RET sunsite.auc.dk' in *Group*.
 
 
 which should correspond to `B nntp RET sunsite.auc.dk' in *Group*.
 

@@ -17373,16 +17378,16 @@ Mac, MS (etc) characters into ISO 8859-1.
     (let ((buffer-read-only nil))
       (goto-char (point-min))
       (while (search-forward "\221" nil t)
     (let ((buffer-read-only nil))
       (goto-char (point-min))
       (while (search-forward "\221" nil t)

-       (replace-match "`" t t))
+        (replace-match "`" t t))

       (goto-char (point-min))
       (while (search-forward "\222" nil t)
       (goto-char (point-min))
       (while (search-forward "\222" nil t)

-       (replace-match "'" t t))
+        (replace-match "'" t t))

       (goto-char (point-min))
       (while (search-forward "\223" nil t)
       (goto-char (point-min))
       (while (search-forward "\223" nil t)

-       (replace-match "\"" t t))
+        (replace-match "\"" t t))

       (goto-char (point-min))
       (while (search-forward "\224" nil t)
       (goto-char (point-min))
       (while (search-forward "\224" nil t)

-       (replace-match "\"" t t)))))
+        (replace-match "\"" t t)))))

 @end example
 
 @item
 @end example
 
 @item

@@ -17390,7 +17395,7 @@ Mac, MS (etc) characters into ISO 8859-1.
  (add-hook 'gnus-exit-query-functions
 '(lambda ()
    (if (and (file-exists-p nnmail-spool-file)
  (add-hook 'gnus-exit-query-functions
 '(lambda ()
    (if (and (file-exists-p nnmail-spool-file)

-           (> (nnheader-file-size nnmail-spool-file) 0))
+            (> (nnheader-file-size nnmail-spool-file) 0))

        (yes-or-no-p "New mail has arrived.  Quit Gnus anyways? ")
        (y-or-n-p "Are you sure you want to quit Gnus? "))))
 @end example
        (yes-or-no-p "New mail has arrived.  Quit Gnus anyways? ")
        (y-or-n-p "Are you sure you want to quit Gnus? "))))
 @end example

diff --git a/texi/message.texi b/texi/message.texi
index 0f5ca1f..728dc7e 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename message
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename message

-@settitle Message 5.6.6 Manual
+@settitle Message 5.6.7 Manual

 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp

@@ -42,7 +42,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
 @tex
 
 @titlepage

-@title Message 5.6.6 Manual
+@title Message 5.6.7 Manual

 
 @author by Lars Magne Ingebrigtsen
 @page
 
 @author by Lars Magne Ingebrigtsen
 @page

@@ -83,7 +83,7 @@ Message mode buffers.
 * Key Index::         List of Message mode keys.
 @end menu
 
 * Key Index::         List of Message mode keys.
 @end menu
 

-This manual corresponds to Message 5.6.6.  Message is distributed with
+This manual corresponds to Message 5.6.7.  Message is distributed with

 the Gnus distribution bearing the same version number as this manual
 has. 
 
 the Gnus distribution bearing the same version number as this manual
 has.