From afc6da085731dc0dd09b46c9843195f650628534 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 19 Nov 1998 04:15:44 +0000 Subject: [PATCH] Sync up with Gnus v5.6.45. --- lisp/ChangeLog | 34 ++++++++++++++++++++++++++++++++++ lisp/gnus-agent.el | 14 ++++++++------ lisp/gnus-async.el | 12 +++++++----- lisp/gnus-cache.el | 4 +++- lisp/gnus-group.el | 1 - lisp/gnus-util.el | 5 +++-- lisp/gnus.el | 7 ++++--- lisp/message.el | 12 ++++++------ lisp/nngateway.el | 1 + lisp/nnmail.el | 3 +-- lisp/nntp.el | 6 ++++-- lisp/pop3.el | 10 ++++++---- 12 files changed, 77 insertions(+), 32 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 881cffe..459c782 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,37 @@ +Thu Nov 19 04:37:45 1998 Lars Magne Ingebrigtsen + + * gnus.el: Gnus v5.6.45 is released. + +1998-11-08 00:42:58 Andrew Innes + + * nntp.el (nntp-request-group): Allow for error codes. + +1998-10-12 Andrew Innes + + * gnus/nntp.el (nntp-possibly-change-group): Allow for unexpected + responses to GROUP command, since this may be called from a timer + with quit inhibited. + +1998-10-11 01:16:14 Lars Magne Ingebrigtsen + + * gnus-agent.el (gnus-agent-expire): Check (car expired). + +1998-10-02 04:49:27 Lars Magne Ingebrigtsen + + * gnus-cache.el (gnus-cache-generate-active): Ignore directories + that start with a dot. + +1998-10-01 07:42:40 Lars Magne Ingebrigtsen + + * nnmail.el (nnmail-article-group): Expand properly. + + * gnus-group.el (gnus-group-apropos): Also do non-active groups. + +1998-09-29 13:12:31 Lars Magne Ingebrigtsen + + * gnus-async.el (gnus-make-async-article-function): Don't use + push. + Thu Sep 24 19:29:43 1998 Lars Magne Ingebrigtsen * gnus.el: Gnus v5.6.44 is released. diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index d9c1be9..613b682 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1383,12 +1383,14 @@ The following commands are available: ;; Maybe everything has been expired from `gnus-article-alist' ;; and so the above marking as read could not be conducted, ;; or there are expired article within the range of the alist. - (when (or (not (caar gnus-agent-article-alist)) - (> (car expired) (caar gnus-agent-article-alist))) - (setcar (nthcdr 2 info) - (gnus-add-to-range - (nth 2 info) - (nreverse expired)))) + (when (and (car expired) + (or (not (caar gnus-agent-article-alist)) + (> (car expired) + (caar gnus-agent-article-alist))) ) + (setcar (nthcdr 2 info) + (gnus-add-to-range + (nth 2 info) + (nreverse expired)))) (gnus-dribble-enter (concat "(gnus-group-set-info '" (gnus-prin1-to-string info) diff --git a/lisp/gnus-async.el b/lisp/gnus-async.el index 8da43cc..870192f 100644 --- a/lisp/gnus-async.el +++ b/lisp/gnus-async.el @@ -213,11 +213,13 @@ It should return non-nil if the article is to be prefetched." (when arg (gnus-async-set-buffer) (gnus-async-with-semaphore - (push (list ',(intern (format "%s-%d" group article) - gnus-asynch-obarray) - ,mark (set-marker (make-marker) (point-max)) - ,group ,article) - gnus-async-article-alist))) + (setq + gnus-async-article-alist + (cons (list ',(intern (format "%s-%d" group article) + gnus-asynch-obarray) + ,mark (set-marker (make-marker) (point-max)) + ,group ,article) + gnus-async-article-alist)))) (if (not (gnus-buffer-live-p ,summary)) (gnus-async-with-semaphore (setq gnus-async-fetch-list nil)) diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el index 470fb21..7ac6ba2 100644 --- a/lisp/gnus-cache.el +++ b/lisp/gnus-cache.el @@ -642,6 +642,8 @@ If LOW, update the lower bound instead." (when top (gnus-message 5 "Generating the cache active file...") (setq gnus-cache-active-hashtb (gnus-make-hashtable 123))) + (when (string-match "^\\(nn[^_]+\\)_" group) + (setq group (replace-match "\\1:" t t group))) ;; Separate articles from all other files and directories. (while files (if (string-match "^[0-9]+$" (file-name-nondirectory (car files))) @@ -654,7 +656,7 @@ If LOW, update the lower bound instead." ;; Go through all the other files. (while alphs (when (and (file-directory-p (car alphs)) - (not (string-match "^\\.\\.?$" + (not (string-match "^\\." (file-name-nondirectory (car alphs))))) ;; We descend directories. (gnus-cache-generate-active (car alphs))) diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 612be02..d56f5ce 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -3048,7 +3048,6 @@ to use." (mapatoms (lambda (group) (and (string-match regexp (symbol-value group)) - (gnus-active (symbol-name group)) (push (symbol-name group) groups))) gnus-description-hashtb)) (if (not groups) diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 5359dda..7dcfdc8 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -35,6 +35,7 @@ (require 'nnheader) (require 'timezone) (require 'message) +(eval-when-compile (require 'rmail)) (eval-and-compile (autoload 'nnmail-date-to-time "nnmail") @@ -726,7 +727,7 @@ with potentially long computations." (setq filename (expand-file-name filename)) (setq rmail-default-rmail-file filename) (let ((artbuf (current-buffer)) - (tmpbuf (gnus-get-buffer-create " *Gnus-output*"))) + (tmpbuf (get-buffer-create " *Gnus-output*"))) (save-excursion (or (get-file-buffer filename) (file-exists-p filename) @@ -777,7 +778,7 @@ with potentially long computations." "Append the current article to a mail file named FILENAME." (setq filename (expand-file-name filename)) (let ((artbuf (current-buffer)) - (tmpbuf (gnus-get-buffer-create " *Gnus-output*"))) + (tmpbuf (get-buffer-create " *Gnus-output*"))) (save-excursion ;; Create the file, if it doesn't exist. (when (and (not (get-file-buffer filename)) diff --git a/lisp/gnus.el b/lisp/gnus.el index 08d2558..1465159 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -253,11 +253,11 @@ is restarted, and sometimes reloaded." (defconst gnus-product-name "Semi-gnus" "Product name of this version of gnus.") -(defconst gnus-version-number "6.8.19" +(defconst gnus-version-number "6.8.20" "Version number for this version of gnus.") (defconst gnus-version - (format "%s %s (based on Gnus 5.6.44; for SEMI 1.8, FLIM 1.8/1.9)" + (format "%s %s (based on Gnus 5.6.45; for SEMI 1.8, FLIM 1.8/1.9)" gnus-product-name gnus-version-number) "Version string for this version of gnus.") @@ -1602,7 +1602,8 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.") timezone-make-sortable-date timezone-make-time-string) ("rmailout" rmail-output) ("rmail" rmail-insert-rmail-file-header rmail-count-new-messages - rmail-show-message) + rmail-show-message rmail-summary-exists + rmail-select-summary rmail-update-summary) ("gnus-audio" :interactive t gnus-audio-play) ("gnus-xmas" gnus-xmas-splash) ("gnus-soup" :interactive t diff --git a/lisp/message.el b/lisp/message.el index 3562114..fd73309 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -694,10 +694,10 @@ the prefix.") The default is `abbrev', which uses mailabbrev. nil switches mail aliases off.") -(defcustom message-autosave-directory +(defcustom message-auto-save-directory (nnheader-concat message-directory "drafts/") - "*Directory where Message autosaves buffers if Gnus isn't running. -If nil, Message won't autosave." + "*Directory where Message auto-saves buffers if Gnus isn't running. +If nil, Message won't auto-save." :group 'message-buffers :type 'directory) @@ -2085,7 +2085,7 @@ the user from the mailer." ;; (mail-hist-put-headers-into-history)) (run-hooks 'message-sent-hook) (message "Sending...done") - ;; Mark the buffer as unmodified and delete autosave. + ;; Mark the buffer as unmodified and delete auto-save. (set-buffer-modified-p nil) (delete-auto-save-file-if-necessary t) (message-disassociate-draft) @@ -3616,12 +3616,12 @@ Headers already prepared in the buffer are not modified." (defun message-set-auto-save-file-name () "Associate the message buffer with a file in the drafts directory." - (when message-autosave-directory + (when message-auto-save-directory (if (gnus-alive-p) (setq message-draft-article (nndraft-request-associate-buffer "drafts")) (setq buffer-file-name (expand-file-name "*message*" - message-autosave-directory)) + message-auto-save-directory)) (setq buffer-auto-save-file-name (make-auto-save-file-name))) (clear-visited-file-modtime))) diff --git a/lisp/nngateway.el b/lisp/nngateway.el index 2139885..c580ac5 100644 --- a/lisp/nngateway.el +++ b/lisp/nngateway.el @@ -25,6 +25,7 @@ ;;; Code: +(eval-when-compile (require 'cl)) (require 'nnoo) (require 'message) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index d40faae..a323f87 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -1140,8 +1140,7 @@ FUNC will be called with the group name to determine the article number." ;; group twice. (not (assoc (car method) group-art))) (push (cons (if regrepp - (replace-match - (car method) nil nil (car method)) + (nnmail-expand-newtext (car method)) (car method)) (funcall func (car method))) group-art)) diff --git a/lisp/nntp.el b/lisp/nntp.el index 487c72d..9c5523d 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -652,7 +652,7 @@ If this variable is nil, which is the default, no timers are set.") (deffoo nntp-request-group (group &optional server dont-check) (nntp-possibly-change-group nil server) - (when (nntp-send-command "^21.*\n" "GROUP" group) + (when (nntp-send-command "^[245].*\n" "GROUP" group) (let ((entry (nntp-find-connection-entry nntp-server-buffer))) (setcar (cddr entry) group)))) @@ -979,7 +979,9 @@ password contained in '~/.nntp-authinfo'." (set-buffer (process-buffer (car entry))) (erase-buffer) (nntp-send-string (car entry) (concat "GROUP " group)) - (nntp-wait-for-string "^2.*\n") + ;; allow for unexpected responses, since this can be called + ;; from a timer with quit inhibited + (nntp-wait-for-string "^[245].*\n") (setcar (cddr entry) group) (erase-buffer)))))) diff --git a/lisp/pop3.el b/lisp/pop3.el index b03138c..55c2f65 100644 --- a/lisp/pop3.el +++ b/lisp/pop3.el @@ -1,10 +1,10 @@ ;;; pop3.el --- Post Office Protocol (RFC 1460) interface -;; Copyright (C) 1996,97,98 Free Software Foundation, Inc. +;; Copyright (C) 1996,1997,1998 Free Software Foundation, Inc. ;; Author: Richard L. Pieri ;; Keywords: mail, pop3 -;; Version: 1.3l+ +;; Version: 1.3m+ ;; This file is part of GNU Emacs. @@ -37,7 +37,7 @@ (require 'mail-utils) (provide 'pop3) -(defconst pop3-version "1.3l+") +(defconst pop3-version "1.3m+") (defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER") nil) "*POP3 maildrop.") @@ -116,7 +116,9 @@ Returns the process associated with the connection." (let ((process-buffer (get-buffer-create (format "trace of POP session to %s" mailhost))) (process) - (coding-system-for-read 'binary)) + (coding-system-for-read 'binary) ;; because 0000n0000 S000l 0a0 + (coding-system-for-write 'binary) ;; is st00pid + ) (save-excursion (set-buffer process-buffer) (erase-buffer) -- 1.7.10.4