From: Lars Magne Ingebrigtsen Date: Sun, 12 Jan 2003 19:58:58 +0000 (+0000) Subject: 2003-01-12 Raymond Scholz X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=c6cae2afedb0085a5992c8fd540c655c45aca411 2003-01-12 Raymond Scholz * gnus-msg.el (gnus-confirm-mail-reply-to-news): May be a regexp or a function too. (gnus-confirm-treat-mail-like-news): New variable. Ask for confirmation even if the original article is mail. 2003-01-12 Lars Magne Ingebrigtsen * gnus-msg.el (gnus-inews-add-send-actions): Get the right articles to be marked when not yanking. 2003-01-12 François-David Collin * mm-decode.el (mm-get-part): Use mm-with-unibyte-current-buffer. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 932431e2d..ecca4c61c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,26 @@ +2003-01-12 Raymond Scholz + + * gnus-msg.el (gnus-confirm-mail-reply-to-news): May be a + regexp or a function too. + (gnus-confirm-treat-mail-like-news): New variable. Ask for + confirmation even if the original article is mail. + 2003-01-12 Lars Magne Ingebrigtsen + * gnus-msg.el (gnus-inews-add-send-actions): Get the right + articles to be marked when not yanking. + +2003-01-12 Fran,Ag(Bois-David Collin + + * mm-decode.el (mm-get-part): Use mm-with-unibyte-current-buffer. + +2003-01-12 Lars Magne Ingebrigtsen + + * gnus-fun.el (gnus-face-from-file): Autoload. + * gnus-cite.el (gnus-cite-delete-overlays): Protect against more errors. + 2003-01-12 Simon Josefsson * sieve.el (sieve-upload-and-bury): New. Suggested by diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el index aa711da04..5e9d79a3e 100644 --- a/lisp/gnus-fun.el +++ b/lisp/gnus-fun.el @@ -79,6 +79,7 @@ Output to the current buffer, replace text, and don't mingle error." (format gnus-convert-image-to-x-face-command (shell-quote-argument file))))) +;;;###autoload (defun gnus-face-from-file (file) "Return an Face header based on an image file." (interactive "fImage file name:" ) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 5349033a5..5aebc44d5 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -257,12 +257,13 @@ See also the `mml-default-encrypt-method' variable." "If non-nil, Gnus requests confirmation when replying to news. This is done because new users often reply by mistake when reading news. -This can also be a function which should return non-nil iff a -confirmation is needed, or a regexp, in which case a confirmation is -asked if the group name matches the regexp." +This can also be a function receiving the group name as the only +parameter which should return non-nil iff a confirmation is needed, or +a regexp, in which case a confirmation is asked for iff the group name +matches the regexp." :group 'gnus-message :type '(choice (const :tag "No" nil) - (const :tag "Yes" nil) + (const :tag "Yes" t) (regexp :tag "Iff group matches regexp") (function :tag "Iff function evaluates to non-nil"))) @@ -515,15 +516,19 @@ Gcc: header for archiving purposes." (setq message-newsreader (setq message-mailer (gnus-extended-version))) (message-add-action `(set-window-configuration ,winconf) 'exit 'postpone 'kill) - (message-add-action - `(when (gnus-buffer-exists-p ,buffer) - (save-excursion - (set-buffer ,buffer) - ,(when article - (if (eq config 'forward) - `(gnus-summary-mark-article-as-forwarded ',yanked) - `(gnus-summary-mark-article-as-replied ',yanked))))) - 'send)) + (let ((to-be-marked (cond + (yanked yanked) + (article (list article)) + (t nil)))) + (message-add-action + `(when (gnus-buffer-exists-p ,buffer) + (save-excursion + (set-buffer ,buffer) + ,(when to-be-marked + (if (eq config 'forward) + `(gnus-summary-mark-article-as-forwarded ',to-be-marked) + `(gnus-summary-mark-article-as-replied ',to-be-marked))))) + 'send))) (put 'gnus-setup-message 'lisp-indent-function 1) (put 'gnus-setup-message 'edebug-form-spec '(form body)) @@ -1058,9 +1063,10 @@ If VERY-WIDE, make a very wide reply." (not (or (gnus-news-group-p gnus-newsgroup-name) gnus-confirm-treat-mail-like-news)) (not (cond ((stringp gnus-confirm-mail-reply-to-news) - (string-match gnus-confirm-mail-reply-to-news gnus-newsgroup-name)) + (string-match gnus-confirm-mail-reply-to-news + gnus-newsgroup-name)) ((functionp gnus-confirm-mail-reply-to-news) - (funcall gnus-confirm-mail-reply-to-news)) + (funcall gnus-confirm-mail-reply-to-news gnus-newsgroup-name)) (t gnus-confirm-mail-reply-to-news))) (y-or-n-p "Really reply by mail to article author? ")) (let* ((article diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index 6a6d4c826..977bb8ac8 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -954,7 +954,7 @@ external if displayed external." "Return the contents of HANDLE as a string." (mm-with-unibyte-buffer (insert (with-current-buffer (mm-handle-buffer handle) - (mm-with-unibyte-current-buffer-mule4 + (mm-with-unibyte-current-buffer (buffer-string)))) (mm-decode-content-transfer-encoding (mm-handle-encoding handle)