From dc8a73179888634c3c6aaa344f20d4289619bb21 Mon Sep 17 00:00:00 2001 From: shuhei-k Date: Fri, 20 Mar 1998 16:27:14 +0000 Subject: [PATCH] Sync up with gnus-5.6.3. --- lisp/ChangeLog | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ lisp/gnus-agent.el | 44 ++++++++++++++++++++++------ lisp/gnus-art.el | 1 + lisp/gnus-draft.el | 4 ++- lisp/gnus-msg.el | 6 ++-- lisp/gnus-sum.el | 6 ++-- lisp/nnmail.el | 2 +- 7 files changed, 131 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5187062..6aa0dae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,86 @@ +Thu Mar 19 15:18:00 1998 Lars Magne Ingebrigtsen + + * gnus.el: Gnus v5.6.3 is released. + +Thu Mar 19 15:09:14 1998 Wes Hardaker + + * gnus-win.el (gnus-delete-windows-in-gnusey-frames): Make sure + there are no nil buffers. + +1998-03-17 Per Abrahamsen + + * gnus-uu.el (gnus-uu-digest-headers): Add `Content-Type' and + `Content-Transfer-Encoding'. + +1998-03-18 Per Abrahamsen + + * message.el (message-header-lines): Added `:format'. + +1998-03-18 Simon Josefsson + + * nndoc.el: dummy request-accept-article + +Thu Mar 19 14:10:25 1998 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-summary-next-subject): Expand threads. + + * gnus-agent.el (gnus-agent-group-mode-hook, + gnus-agent-summary-mode-hook): New variables. + (gnus-agent-mode): Run them. + +1998-03-14 SL Baur + + * gnus-xmas.el (gnus-xmas-group-startup-message): Tell gnus-start + we've already drawn the pretty Gnu graphic. + +Thu Mar 19 12:44:12 1998 Lars Magne Ingebrigtsen + + * gnus-msg.el: Would use nil group names. + + * nntp.el (nntp-send-authinfo): Send authinfo to "force"d + servers. + + * gnus-util.el (gnus-parse-netrc): Accept the "force" token. + + * message.el (message-cancel-news): Compare Sender header, not + From header. + +Tue Mar 17 15:07:18 1998 Lars Magne Ingebrigtsen + + * gnus-art.el (article-hide-headers): Fold case. + +Sat Mar 14 17:57:35 1998 Lars Magne Ingebrigtsen + + * gnus-util.el (gnus-horizontal-recenter): New window-end may + return nil. + +Fri Mar 13 22:12:30 1998 Lars Magne Ingebrigtsen + + * gnus-agent.el (gnus-agent-fetch-session): Check whether server + is up before fetching. + + * gnus-win.el (gnus-window-frame-focus): New variable. + (gnus-configure-windows): Use it. + + * gnus-sum.el (gnus-summary-catchup-and-exit): Don't select next + when in an ephemeral group. + + * gnus-agent.el (gnus-agent-expire): Message end. + (gnus-agent-expire-all): New variable. + (gnus-agent-expire): Use it. + +Fri Mar 13 22:07:17 1998 Shenghuo ZHU + + * gnus-agent.el (gnus-agent-high-scored-p): Wrong value. + +Fri Mar 13 21:10:24 1998 Lars Magne Ingebrigtsen + + * nnvirtual.el (nnvirtual-request-group): Force updating of info. + +Sun Mar 8 20:46:51 1998 Lars Magne Ingebrigtsen + + * nnmail.el (nnmail-delete-incoming): Changed default. + Sun Mar 8 14:05:25 1998 Lars Magne Ingebrigtsen * gnus.el: Gnus v5.6.2 is released. diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 72bbab1..1026465 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -54,6 +54,27 @@ :group 'gnus-agent :type 'integer) +(defcustom gnus-agent-expire-all nil + "If non-nil, also expire unread, ticked and dormant articles. +If nil, only read articles will be expired." + :group 'gnus-agent + :type 'boolean) + +(defcustom gnus-agent-group-mode-hook nil + "Hook run in Agent group minor modes." + :group 'gnus-agent + :type 'hook) + +(defcustom gnus-agent-summary-mode-hook nil + "Hook run in Agent summary minor modes." + :group 'gnus-agent + :type 'hook) + +(defcustom gnus-agent-server-mode-hook nil + "Hook run in Agent summary minor modes." + :group 'gnus-agent + :type 'hook) + ;;; Internal variables (defvar gnus-agent-history-buffers nil) @@ -181,7 +202,8 @@ buffer)))) minor-mode-map-alist)) (gnus-agent-toggle-plugged gnus-plugged) - (gnus-run-hooks 'gnus-agent-mode-hook))) + (gnus-run-hooks 'gnus-agent-mode-hook + (intern (format "gnus-agent-%s-mode-hook" buffer))))) (defvar gnus-agent-group-mode-map (make-sparse-keymap)) (gnus-define-keys gnus-agent-group-mode-map @@ -822,12 +844,14 @@ the actual number of articles toggled is returned." groups group gnus-command-method) (save-excursion (while methods - (setq gnus-command-method (car methods) - groups (gnus-groups-from-server (pop methods))) - (gnus-agent-with-fetch - (while (setq group (pop groups)) - (when (<= (gnus-group-level group) gnus-agent-handle-level) - (gnus-agent-fetch-group-1 group gnus-command-method))))) + (setq gnus-command-method (car methods)) + (when (or (gnus-server-opened gnus-command-method) + (gnus-open-server gnus-command-method)) + (setq groups (gnus-groups-from-server (pop methods))) + (gnus-agent-with-fetch + (while (setq group (pop groups)) + (when (<= (gnus-group-level group) gnus-agent-handle-level) + (gnus-agent-fetch-group-1 group gnus-command-method)))))) (gnus-message 6 "Finished fetching articles into the Gnus agent")))) (defun gnus-agent-fetch-group-1 (group method) @@ -1149,7 +1173,7 @@ The following commands are available: (defun gnus-agent-high-scored-p () "Say whether an article has a high score or not." - (> gnus-score gnus-agent-low-score)) + (> gnus-score gnus-agent-high-score)) (defun gnus-category-make-function (cat) "Make a function from category CAT." @@ -1259,6 +1283,7 @@ The following commands are available: (setq article (car elem)) (when (or (null low) (< article low) + gnus-agent-expire-all (and (not (memq article unreads)) (not (memq article marked)))) ;; Find and nuke the NOV line. @@ -1284,7 +1309,8 @@ The following commands are available: (goto-char (pop histories)) (gnus-delete-line)) (gnus-agent-save-history) - (gnus-agent-close-history))))) + (gnus-agent-close-history)) + (gnus-message 4 "Expiry...done")))) ;;;###autoload (defun gnus-agent-batch () diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 02fc34c..1e8c8a0 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -641,6 +641,7 @@ always hide." (save-excursion (save-restriction (let ((buffer-read-only nil) + (case-fold-search t) (props (nconc (list 'article-type 'headers) gnus-hidden-properties)) (max (1+ (length gnus-sorted-header-list))) diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el index 912af8e..9f86512 100644 --- a/lisp/gnus-draft.el +++ b/lisp/gnus-draft.el @@ -155,7 +155,9 @@ :type 'function) ;;;!!!If this is byte-compiled, it fails miserably. -;;;!!!I have no idea why. +;;;!!!This is because `gnus-setup-message' uses uninterned symbols. +;;;!!!This has been fixed in recent versions of Emacs and XEmacs, +;;;!!!but for the time being, we'll just run this tiny function uncompiled. (progn (defun gnus-draft-setup (narticle group) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 04b3cf6..95aa5f7 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -158,10 +158,12 @@ Thank you for your help in stamping out bugs. (defmacro gnus-setup-message (config &rest forms) (let ((winconf (make-symbol "gnus-setup-message-winconf")) (buffer (make-symbol "gnus-setup-message-buffer")) - (article (make-symbol "gnus-setup-message-article"))) + (article (make-symbol "gnus-setup-message-article")) + (group (make-symbol "gnus-setup-message-group"))) `(let ((,winconf (current-window-configuration)) (,buffer (buffer-name (current-buffer))) (,article (and gnus-article-reply (gnus-summary-article-number))) + (,group gnus-newsgroup-name) (message-header-setup-hook (copy-sequence message-header-setup-hook))) (add-hook 'message-header-setup-hook 'gnus-inews-insert-gcc) @@ -172,7 +174,7 @@ Thank you for your help in stamping out bugs. (gnus-inews-add-send-actions ,winconf ,buffer ,article) (setq gnus-message-buffer (current-buffer)) (set (make-local-variable 'gnus-message-group-art) - (cons ,gnus-newsgroup-name ,article)) + (cons ,group ,article)) (make-local-variable 'gnus-newsgroup-name) (gnus-run-hooks 'gnus-message-setup-hook)) (gnus-configure-windows ,config t) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 762c59e..79e31a3 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -5484,6 +5484,7 @@ returned." (if backward (gnus-summary-find-prev unread) (gnus-summary-find-next unread))) + (gnus-summary-show-thread) (setq n (1- n))) (when (/= 0 n) (gnus-message 7 "No more%s articles" @@ -7429,7 +7430,7 @@ groups." (gnus-run-hooks 'gnus-visual-mark-article-hook)))) (defun gnus-summary-edit-wash (key) - "Perform editing command in the article buffer." + "Perform editing command KEY in the article buffer." (interactive (list (progn @@ -8102,7 +8103,8 @@ If prefix argument ALL is non-nil, all articles are marked as read." (interactive "P") (when (gnus-summary-catchup all quietly nil 'fast) ;; Select next newsgroup or exit. - (if (eq gnus-auto-select-next 'quietly) + (if (and (not (gnus-group-quit-config gnus-newsgroup-name)) + (eq gnus-auto-select-next 'quietly)) (gnus-summary-next-group nil) (gnus-summary-exit)))) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 5c0cd70..2b5fbbc 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -407,7 +407,7 @@ Example: :group 'nnmail-split :type '(repeat (cons :format "%v" symbol regexp))) -(defcustom nnmail-delete-incoming nil +(defcustom nnmail-delete-incoming t "*If non-nil, the mail backends will delete incoming files after splitting." :group 'nnmail-retrieve -- 1.7.10.4