From c966a311e2c14b6e93905cf95c76b87a5ff0e6c6 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 27 May 2001 22:40:58 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 15 +++++++++ lisp/gnus-salt.el | 2 ++ lisp/message.el | 10 +++++- lisp/mml2015.el | 82 ++++++++++++++++++++++++++++++++++---------------- texi/ChangeLog | 4 +++ texi/message-ja.texi | 14 +++++++-- texi/message.texi | 14 +++++++-- 7 files changed, 110 insertions(+), 31 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f46df50..fdb64a1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2001-05-27 Kai Gro,A_(Bjohann + + * gnus-salt.el (gnus-tree-highlight-node): Bind `default-high' and + `default-low' when evaluating `gnus-summary-highlight'. + From Raja R Harinath . + +2001-05-27 Simon Josefsson + + * message.el (message-yank-cited-prefix): New variable. + (message-indent-citation): Use it. + + * mml2015.el (mml2015-mailcrypt-verify): Store gpg stderr output + as details. + (mml2015-mailcrypt-clear-verify): Ditto. + 2001-05-24 Kai Gro,A_(Bjohann From Nevin Kapur . diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el index 2a6acc9..c90f848 100644 --- a/lisp/gnus-salt.el +++ b/lisp/gnus-salt.el @@ -666,6 +666,8 @@ Two predefined functions are available: (let* ((score (or (cdr (assq article gnus-newsgroup-scored)) gnus-summary-default-score 0)) (default gnus-summary-default-score) + (default-high gnus-summary-default-high-score) + (default-low gnus-summary-default-low-score) (mark (or (gnus-summary-article-mark article) gnus-unread-mark))) ;; Eval the cars of the lists until we find a match. (while (and list diff --git a/lisp/message.el b/lisp/message.el index 4daad57..338387b 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -697,6 +697,12 @@ an article is yanked by the command `message-yank-original' interactively." (integer :tag "Position from last ID")) :group 'message-insertion) +(defcustom message-yank-cited-prefix ">" + "*Prefix inserted on cited lines of yanked messages. +Fix `message-cite-prefix-regexp' if it is set to an abnormal value." + :type 'string + :group 'message-insertion) + (defcustom message-indentation-spaces 3 "*Number of spaces to insert at the beginning of each cited line. Used by `message-yank-original' via `message-yank-cite'." @@ -2490,7 +2496,9 @@ However, if `message-yank-prefix' is non-nil, insert that prefix on each line." (save-excursion (goto-char start) (while (< (point) (mark t)) - (insert message-yank-prefix) + (if (looking-at message-cite-prefix-regexp) + (insert message-yank-cited-prefix) + (insert message-yank-prefix)) (forward-line 1)))) (goto-char start))) diff --git a/lisp/mml2015.el b/lisp/mml2015.el index 4f83483..63b6356 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -175,38 +175,68 @@ (replace-match "-----BEGIN PGP SIGNATURE-----" t t)) (if (re-search-forward "^-----END PGP [^-]+-----\r?$" nil t) (replace-match "-----END PGP SIGNATURE-----" t t))) - (unless (condition-case err - (funcall mml2015-verify-function) - (error - (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-details (cadr err)) - nil) - (quit - (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-details "Quit.") - nil)) - (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-info "Failed") - (throw 'error handle))) + (let ((mc-gpg-debug-buffer (get-buffer-create " *gnus gpg debug*"))) + (unless (condition-case err + (prog1 + (funcall mml2015-verify-function) + (if (get-buffer " *mailcrypt stderr temp") + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-details + (with-current-buffer " *mailcrypt stderr temp" + (buffer-string)))) + (if (get-buffer " *mailcrypt stdout temp") + (kill-buffer " *mailcrypt stdout temp")) + (if (get-buffer " *mailcrypt stderr temp") + (kill-buffer " *mailcrypt stderr temp")) + (if (get-buffer " *mailcrypt status temp") + (kill-buffer " *mailcrypt status temp")) + (if (get-buffer mc-gpg-debug-buffer) + (kill-buffer mc-gpg-debug-buffer))) + (error + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-details (cadr err)) + nil) + (quit + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-details "Quit.") + nil)) + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-info "Failed") + (throw 'error handle)))) (mm-set-handle-multipart-parameter mm-security-handle 'gnus-info "OK") handle))) (defun mml2015-mailcrypt-clear-verify () - (if (condition-case err - (funcall mml2015-verify-function) - (error - (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-details (cadr err)) - nil) - (quit - (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-details "Quit.") - nil)) + (let ((mc-gpg-debug-buffer (get-buffer-create " *gnus gpg debug*"))) + (if (condition-case err + (prog1 + (funcall mml2015-verify-function) + (if (get-buffer " *mailcrypt stderr temp") + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-details + (with-current-buffer " *mailcrypt stderr temp" + (buffer-string)))) + (if (get-buffer " *mailcrypt stdout temp") + (kill-buffer " *mailcrypt stdout temp")) + (if (get-buffer " *mailcrypt stderr temp") + (kill-buffer " *mailcrypt stderr temp")) + (if (get-buffer " *mailcrypt status temp") + (kill-buffer " *mailcrypt status temp")) + (if (get-buffer mc-gpg-debug-buffer) + (kill-buffer mc-gpg-debug-buffer))) + (error + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-details (cadr err)) + nil) + (quit + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-details "Quit.") + nil)) + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-info "OK") (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-info "OK") - (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-info "Failed"))) + mm-security-handle 'gnus-info "Failed")))) (defun mml2015-mailcrypt-sign (cont) (mc-sign-generic (message-options-get 'message-sender) diff --git a/texi/ChangeLog b/texi/ChangeLog index 8659f6b..848469a 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2001-05-27 Simon Josefsson + + * message.texi (Insertion): Add message-yank-cited-prefix. + 2001-05-22 Simon Josefsson From Jesper Harder diff --git a/texi/message-ja.texi b/texi/message-ja.texi index 5c8ecf3..48a2081 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -490,8 +490,18 @@ Hallvard B Furuseth writes: @cindex quoting $B$"$J$?$,5-;v$KJVEz$+%U%)%m!<%"%C%W$r$7$F$$$k$H$-$O!"IaDL$O$"$J$?$,1~Ez$7(B $B$F$$$k?M$N$b$N$K0zMQId$rIU$1$?$$$G$7$g$&!#0zMQJ8$NA^F~$O(B @dfn{$BE=$jIU$1(B} -$B$K$h$C$F$J$5$l!"$=$l$>$l$NE=$jIU$1$i$l$?0zMQ9T$O$=$NA0(B -$B$K(B @code{message-yank-prefix} $B$rIU$1$i$l$^$9!#=i4|CM$O(B @samp{> } $B$G$9!#(B +$B$K$h$C$F$J$5$l(B ($B$9$G$K0zMQId$,IU$$$F$$$k$b$N$OBP>]30!"(B +@code{message-yank-cited-prefix} $B$r;2>H$N$3$H(B)$B!"$=$l$>$l$NE=$jIU$1$i$l$?(B +$B0zMQ9T$O$=$NA0$K(B @code{message-yank-prefix} $B$rIU$1$i$l$^$9!#=i4|CM(B +$B$O(B @samp{> } $B$G$9!#(B + +@item message-yank-cited-prefix +@vindex message-yank-cited-prefix +@cindex yanking +@cindex cited +@cindex quoting +$B$9$G$K0zMQ$5$l$?9T$K$O(B @code{message-yank-prefix} $B$NBe$o$j$K$3$NJQ?t$NFb(B +$BMF$,0zMQId$H$7$F;H$o$l$^$9!#=i4|CM$O(B @samp{>} $B$G$9!#(B @item message-yank-add-new-references @vindex message-yank-add-new-references diff --git a/texi/message.texi b/texi/message.texi index 9e7fc67..880c419 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -507,10 +507,20 @@ function is called. @cindex yanking @cindex quoting When you are replying to or following up an article, you normally want -to quote the person you are answering. Inserting quoted text is done by -@dfn{yanking}, and each quoted line you yank will have +to quote the person you are answering. Inserting quoted text is done +by @dfn{yanking}, and each quoted line you yank (except earlier +quotes, see @code{message-yank-cited-prefix}) will have @code{message-yank-prefix} prepended to it. The default is @samp{> }. +@item message-yank-cited-prefix +@vindex message-yank-cited-prefix +@cindex yanking +@cindex cited +@cindex quoting +The @code{message-yank-prefix} prefix is not used on already cited +lines, instead the contents of this variable is used as yank prefix. +The default is @samp{>}. + @item message-yank-add-new-references @vindex message-yank-add-new-references @cindex yanking -- 1.7.10.4