From 4aaf1a53f9342778ad5b75e74cb0a914889139ed Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Thu, 20 Apr 2000 23:47:09 +0000 Subject: [PATCH] * flow-fill.el: Renamed from fill-flowed. * message.el (message-forward-ignored-headers): Default to removing CTE. --- lisp/ChangeLog | 26 +++++++++++++++++++++++ lisp/{fill-flowed.el => flow-fill.el} | 0 lisp/gnus-score.el | 4 ++-- lisp/gnus-util.el | 30 +++++++++++++++++++-------- lisp/message.el | 11 +++++----- lisp/nntp.el | 2 +- lisp/nnvirtual.el | 12 +++++------ 7 files changed, 61 insertions(+), 24 deletions(-) rename lisp/{fill-flowed.el => flow-fill.el} (100%) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4bf83f3d2..558332e04 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,35 @@ +2000-04-21 01:24:41 Lars Magne Ingebrigtsen + + * flow-fill.el: Renamed from fill-flowed. + + * message.el (message-forward-ignored-headers): Default to + removing CTE. + +2000-04-21 00:48:48 + + * message.el (message-mode): Don't fill headers. + +2000-04-20 23:12:43 Lars Magne Ingebrigtsen + + * message.el (message-pipe-buffer-body): Use shell + +2000-02-21 Yoshiki Hayashi + + * nnvirtual.el (nnvirtual-request-article): + Bind gnus-override-method to nil. + (nnvirtual-request-update-mark): Don't update mark when + article is not there. + 2000-04-20 16:35:41 Shenghuo ZHU * mm-uu.el (mm-uu-dissect): Check forwarded message. 2000-04-20 21:17:48 Lars Magne Ingebrigtsen + * gnus-util.el (gnus-parse-netrc): Allow "port". + (gnus-netrc-machine): Take a port param. + (gnus-netrc-machine): + * gnus-art.el (gnus-request-article-this-buffer): Allow re-selecting referenced articles. diff --git a/lisp/fill-flowed.el b/lisp/flow-fill.el similarity index 100% rename from lisp/fill-flowed.el rename to lisp/flow-fill.el diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index 1a390c602..67493d900 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -2820,10 +2820,10 @@ If ADAPT, return the home adaptive file instead." ;; Function. ((gnus-functionp elem) (funcall elem group)) - ;; Regexp-file cons + ;; Regexp-file cons. ((consp elem) (when (string-match (gnus-globalify-regexp (car elem)) group) - (replace-match (cadr elem) t nil group )))))) + (replace-match (cadr elem) t nil group)))))) (when found (if (file-name-absolute-p found) found diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 88b3996a6..b8c08ed13 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -805,7 +805,8 @@ ARG is passed to the first function." (when (file-exists-p file) (with-temp-buffer (let ((tokens '("machine" "default" "login" - "password" "account" "macdef" "force")) + "password" "account" "macdef" "force" + "port")) alist elem result pair) (insert-file-contents file) (goto-char (point-min)) @@ -853,16 +854,27 @@ ARG is passed to the first function." (forward-line 1)) (nreverse result))))) -(defun gnus-netrc-machine (list machine) +(defun gnus-netrc-machine (list machine &optional port) "Return the netrc values from LIST for MACHINE or for the default entry." - (let ((rest list)) - (while (and list - (not (equal (cdr (assoc "machine" (car list))) machine))) + (let ((rest list) + result) + (while list + (when (equal (cdr (assoc "machine" (car list))) machine) + (push (car list) result)) (pop list)) - (car (or list - (progn (while (and rest (not (assoc "default" (car rest)))) - (pop rest)) - rest))))) + (unless result + ;; No machine name matches, so we look for default entries. + (while rest + (when (assoc "default" (car rest)) + (push (car rest) result)) + (pop rest))) + (setq result (nreverse result)) + (if (null result) + nil + (while (and result + (not (equalp port (or (gnus-netrc-get result) "nntp")))) + (pop result)) + result))) (defun gnus-netrc-get (alist type) "Return the value of token TYPE from ALIST." diff --git a/lisp/message.el b/lisp/message.el index c9ded5574..355f12487 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -308,7 +308,7 @@ The provided functions are: :group 'message-interface :type 'regexp) -(defcustom message-forward-ignored-headers nil +(defcustom message-forward-ignored-headers "Content-Transfer-Encoding" "*All headers that match this regexp will be deleted when forwarding a message." :group 'message-forwarding :type '(choice (const :tag "None" nil) @@ -1462,6 +1462,8 @@ M-RET message-newline-and-reformat (break the line and reformat)." (setq adaptive-fill-first-line-regexp (concat "[ \t]*[-a-z0-9A-Z]*\\(>[ \t]*\\)+[ \t]*\\|" adaptive-fill-first-line-regexp)) + (make-local-variable 'auto-fill-inhibit-regexp) + (setq auto-fill-inhibit-regexp "^[A-Z][^: \n\t]+:") (mm-enable-multibyte) (make-local-variable 'indent-tabs-mode) ;Turn off tabs for indentation. (setq indent-tabs-mode nil) @@ -1748,11 +1750,8 @@ Mail and USENET news headers are not rotated." (save-restriction (when (message-goto-body) (narrow-to-region (point) (point-max))) - (let ((body (buffer-substring (point-min) (point-max)))) - (unless (equal 0 (call-process-region - (point-min) (point-max) program t t)) - (insert body) - (message "%s failed" program)))))) + (shell-command-on-region + (point-min) (point-max) program nil t)))) (defun message-rename-buffer (&optional enter-string) "Rename the *message* buffer to \"*message* RECIPIENT\". diff --git a/lisp/nntp.el b/lisp/nntp.el index cddd8acc9..1772f791f 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -776,7 +776,7 @@ and a password. If SEND-IF-FORCE, only send authinfo to the server if the .authinfo file has the FORCE token." (let* ((list (gnus-parse-netrc nntp-authinfo-file)) - (alist (gnus-netrc-machine list nntp-address)) + (alist (gnus-netrc-machine list nntp-address "nntp")) (force (gnus-netrc-get alist "force")) (user (or (gnus-netrc-get alist "login") nntp-authinfo-user)) (passwd (gnus-netrc-get alist "password"))) diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el index 810dbe5ad..11eb1b6a4 100644 --- a/lisp/nnvirtual.el +++ b/lisp/nnvirtual.el @@ -197,8 +197,9 @@ component group will show up when you enter the virtual group.") (save-excursion (when buffer (set-buffer buffer)) - (let ((method (gnus-find-method-for-group - nnvirtual-last-accessed-component-group))) + (let* ((gnus-override-method nil) + (method (gnus-find-method-for-group + nnvirtual-last-accessed-component-group))) (funcall (gnus-get-function method 'request-article) article nil (nth 1 method) buffer))))) ;; This is a fetch by number. @@ -283,12 +284,11 @@ component group will show up when you enter the virtual group.") (deffoo nnvirtual-request-update-mark (group article mark) (let* ((nart (nnvirtual-map-article article)) - (cgroup (car nart)) - ;; The component group might be a virtual group. - (nmark (gnus-request-update-mark cgroup (cdr nart) mark))) + (cgroup (car nart))) (when (and nart (memq mark gnus-auto-expirable-marks) - (= mark nmark) + ;; The component group might be a virtual group. + (= mark (gnus-request-update-mark cgroup (cdr nart) mark)) (gnus-group-auto-expirable-p cgroup)) (setq mark gnus-expirable-mark))) mark) -- 2.25.1