From: yamaoka Date: Sun, 21 Apr 2002 22:48:56 +0000 (+0000) Subject: Synch with Oort Gnus. X-Git-Tag: t-gnus-6_15_6-03-quimby~4 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=71f7bf87345c515d437d8f74f1ec3f6e636aca85;p=elisp%2Fgnus.git- Synch with Oort Gnus. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6483ffd..661855e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,46 @@ +2002-04-21 Paul Jarc + + * nnmaildir.el (nnmaildir-request-update-info, + nnmaildir-request-group, nnmaildir-retrieve-groups): remove + unnecessary calls to nnmaildir-request-scan. + +2002-04-20 Josh Huber + + * gnus-msg.el: + * gnus-msg.el (gnus-message-replysign): New. + * gnus-msg.el (gnus-message-replyencrypt): New. + * gnus-msg.el (gnus-message-replysignencrypted): New. + * gnus-msg.el (gnus-summary-reply): Use the three new variables + (above) to automatically encrypt/sign to encrypted/signed + messages. + * message.el: + * message.el (message-mode-map): Add keybinding for + `message-to-list-only' + * message.el (message-mode): Add description for + `message-to-list-only' + * message.el (message-to-list-only): New. + * message.el (message-make-mft): Changed to use the cl loop macro, + and added optional flag to return only the matched list. (for use + in new message-to-list-only function) + +2002-04-20 Josh Huber + + * gnus-msg.el: + * gnus-msg.el (gnus-message-replysign): + * gnus-msg.el (gnus-replysign): New. + * gnus-msg.el (gnus-replyencrypt): New. + * gnus-msg.el (gnus-replysignencrypted): New. + * gnus-msg.el (gnus-summary-reply): + * message.el: + * message.el (message-mode-map): + * message.el (message-mode): + * message.el (message-to-list-only): New. + * message.el (message-make-mft): + +2002-04-19 ShengHuo ZHU + + * gnus-win.el (gnus-configure-windows-hook): Fix typo. + 2002-04-18 Josh Huber * message.el (message-gen-unsubscribed-mft): accept a prefix @@ -96,7 +139,7 @@ 2002-04-01 Jesper Harder * message.el (message-buffer-naming-style): Remove. - + 2002-04-02 ShengHuo ZHU * gnus-group.el (gnus-group-make-tool-bar): Load tool-bar first. @@ -125,7 +168,7 @@ (spam-address-whitelisted-p): New function. * dns.el (query-dns): Use TCP when make-network-process isn't - available. + available. (dns-servers): New variable. (dns-parse-resolv-conf): New function. (query-dns): Use it. diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 5908c9b..2b373f5 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -226,6 +226,26 @@ This variable is used only when `gnus-post-method' is `current'." :group 'gnus-group-foreign :type '(repeat (symbol :tab "Back end"))) +(defcustom gnus-message-replysign + nil + "Automatically sign replys to signed messages. +See also the `mml-default-sign-method' variable." + :group 'gnus-message + :type 'boolean) + +(defcustom gnus-message-replyencrypt + nil + "Automatically encrypt replys to encrypted messages. +See also the `mml-default-encrypt-method' variable." + :group 'gnus-message + :type 'boolean) + +(defcustom gnus-message-replysignencrypted + nil + "Setting this causes automatically encryped messages to also be signed." + :group 'gnus-message + :type 'boolean) + ;;; Internal variables. (defvar gnus-inhibit-posting-styles nil @@ -1101,7 +1121,21 @@ If VERY-WIDE, make a very wide reply." (goto-char (point-max))) (message-reply nil wide) (when yank - (gnus-inews-yank-articles yank))))) + (gnus-inews-yank-articles yank)) +;; (when (or gnus-message-replysign gnus-message-replyencrypt) +;; (let (signed encrypted) +;; (save-excursion +;; (set-buffer (or gnus-article-buffer article-buffer)) +;; (setq signed (memq 'signed gnus-article-wash-types)) +;; (setq encrypted (memq 'encrypted gnus-article-wash-types))) +;; (cond ((and gnus-message-replysign signed) +;; (mml-secure-message mml-default-sign-method 'sign)) +;; ((and gnus-message-replyencrypt encrypted) +;; (mml-secure-message mml-default-encrypt-method +;; (if gnus-message-replysignencrypted +;; 'signencrypt +;; 'encrypt)))))) + ))) (defun gnus-summary-reply-with-original (n &optional wide) "Start composing a reply mail to the current message. diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el index 9d5188b..1234d2f 100644 --- a/lisp/gnus-win.el +++ b/lisp/gnus-win.el @@ -198,7 +198,7 @@ See the Gnus manual for an explanation of the syntax used.") (defcustom gnus-configure-windows-hook nil "*A hook called when configuring windows." - :group 'gnus-windowns + :group 'gnus-windows :type 'hook) ;;; Internal variables. diff --git a/lisp/message.el b/lisp/message.el index bb1190e..42a281a 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1800,6 +1800,7 @@ Point is left at the beginning of the narrowed-to region." (define-key message-mode-map "\C-c\C-t" 'message-insert-to) (define-key message-mode-map "\C-c\C-n" 'message-insert-newsgroups) + (define-key message-mode-map "\C-c\C-l" 'message-to-list-only) (define-key message-mode-map "\C-c\C-u" 'message-insert-or-toggle-importance) (define-key message-mode-map "\C-c\M-n" 'message-insert-disposition-notification-to) @@ -1979,6 +1980,7 @@ C-c C-f move to a header field (and create it if there isn't): C-c C-f C-i cycle through Importance values C-c C-f c move to Mail-Copies-To C-c C-t `message-insert-to' (add a To header to a news followup) +C-c C-l `message-to-list-only' (removes all but list address in to/cc) C-c C-n `message-insert-newsgroups' (add a Newsgroup header to a news reply) C-c C-b `message-goto-body' (move to beginning of message text). C-c C-i `message-goto-signature' (move to the beginning of the signature). @@ -4541,8 +4543,20 @@ give as trustworthy answer as possible." (or mail-host-address (message-make-fqdn))) -(defun message-make-mft () - "Return the Mail-Followup-To header." +(defun message-to-list-only () + (interactive) + (let ((listaddr (message-make-mft t))) + (when listaddr + (save-excursion + (message-remove-header "to") + (message-remove-header "cc") + (message-position-on-field "To" "X-Draft-From") + (insert listaddr))))) + +(defun message-make-mft (&optional only-show-subscribed) + "Return the Mail-Followup-To header. If passed the optional +argument `only-show-subscribed' only return the subscribed address (and +not the additional To and Cc header contents)." (let* ((case-fold-search t) (to (message-fetch-field "To")) (cc (message-fetch-field "cc")) @@ -4572,16 +4586,16 @@ give as trustworthy answer as possible." (mapcar 'funcall message-subscribed-address-functions)))) (save-match-data - (when (eval - (apply 'append '(or) - (mapcar - #'(lambda (regexp) - (mapcar - #'(lambda (recipient) - `(string-match ,regexp ,recipient)) - recipients)) - mft-regexps))) - msg-recipients)))) + (let ((subscribed-lists nil) + (list + (loop for recipient in recipients + when (loop for regexp in mft-regexps + when (string-match regexp recipient) return t) + return recipient))) + (when list + (if only-show-subscribed + list + msg-recipients)))))) ;; Dummy to avoid byte-compile warning. (defvar mule-version) diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el index 2d21303..8e323a4 100644 --- a/lisp/nnmaildir.el +++ b/lisp/nnmaildir.el @@ -785,7 +785,6 @@ by nnmaildir-request-article.") (erase-buffer) (while groups (setq gname (car groups) groups (cdr groups)) - (nnmaildir-request-scan gname server) (setq group (nnmaildir--prepare nil gname)) (if (null group) (insert "411 no such news group\n") (setq ct-min (nnmaildir--article-count group)) @@ -802,7 +801,6 @@ by nnmaildir-request-article.") 'group) (defun nnmaildir-request-update-info (gname info &optional server) - (nnmaildir-request-scan gname server) (let ((group (nnmaildir--prepare server gname)) pgname nlist flist last always-marks never-marks old-marks dotfile num dir markdirs marks mark ranges articles article read end new-marks ls @@ -869,7 +867,6 @@ by nnmaildir-request-article.") info))) (defun nnmaildir-request-group (gname &optional server fast) - (nnmaildir-request-scan gname server) (let ((group (nnmaildir--prepare server gname)) ct-min deactivate-mark) (nnmaildir--with-nntp-buffer