From: Miles Bader Date: Thu, 25 Sep 2008 15:38:29 +0000 (+0000) Subject: Merge from gnus--devo--0 X-Git-Tag: emacs-pretest-23.0.90~2767 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/e52cac880512b377df736dff328243ba2d82be22 Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1429 --- diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 0da88c2d8a..0e83e08338 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,12 @@ +2008-09-24 Teodor Zlatanov + + * message.texi (Sending Variables): Added `message-confirm-send' doc. + +2008-09-24 Katsumi Yamaoka + + * gnus.texi (The Gnus Registry): Don't give argument to @item used in + @enumerate section so as to be able to be formatted with MAKEINFO=no. + 2008-09-22 Bill Wohler Release MH-E manual version 8.1. @@ -9,7 +18,7 @@ However, bump GPL to Version 3. Use @include for license text. -2008-09-19 Katsumi Yamaoka +2008-09-19 Katsumi Yamaoka * gnus.texi (Top, Setup, Fancy splitting to parent) (Store custom flags and keywords, Store arbitrary data): Clean up diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index cf6d65282a..672fda1fb5 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -26506,7 +26506,6 @@ Save table: (spam-stat-save) @node The Gnus Registry @section The Gnus Registry - @cindex registry @cindex split @cindex track @@ -26521,26 +26520,29 @@ Although they will be explained in detail shortly, here's a quick list of said features in case your attention span is... never mind. @enumerate +@item +Split messages to their parent -@item Split messages to their parent This keeps discussions in the same group. You can use the subject and the sender in addition to the Message-ID. Several strategies are available. -@item Store custom flags and keywords +@item +Store custom flags and keywords + The registry can store custom flags and keywords for a message. For instance, you can mark a message ``To-Do'' this way and the flag will persist whether the message is in the nnimap, nnml, nnmaildir, etc. backends. -@item Store arbitrary data +@item +Store arbitrary data + Through a simple ELisp API, the registry can remember any data for a message. A built-in inverse map, when activated, allows quick lookups of all messages matching a particular set of criteria. - @end enumerate - @menu * Setup:: * Fancy splitting to parent:: diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 02bf0f4985..353089da26 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -2223,6 +2223,11 @@ non-@code{nil}, attach local files as external parts. If non-@code{nil} wait for and display errors when sending a message; if @code{nil} let the mailer mail back a message to report errors. +@item message-confirm-send +@vindex message-confirm-send +If non-@code{nil} display a y/n prompt before actually sending the +message. + @end table diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 068821d4bd..e53a6a5245 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,17 @@ +2008-09-24 Teodor Zlatanov + + * message.el (message-confirm-send): Add appropriate version. + +2008-09-22 Teodor Zlatanov + + * mm-view.el (mm-pkcs7-enveloped-magic): Fix extra parenthesis in + defvar. + +2008-09-22 Daiki Ueno + + * mm-view.el (mm-pkcs7-signed-magic): Use literals. + (mm-pkcs7-enveloped-magic): Ditto. + 2008-09-17 Simon Josefsson * sieve-manage.el (sieve-manage-is-string): Accept literals too. diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 6014493241..3ec15d0083 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -445,6 +445,7 @@ nil means let mailer mail back a message to report errors." "Non-nil means when sending a message ask for y/n confirmation." :group 'message-sending :group 'message-mail + :version "22.3" ;; No Gnus :link '(custom-manual "(message)Sending Variables") :type 'boolean) @@ -6296,13 +6297,22 @@ are not included." (if (gnus-alive-p) (setq message-draft-article (nndraft-request-associate-buffer "drafts")) + + ;; If Gnus were alive, draft messages would be saved in the drafts folder. + ;; But Gnus is not alive, so arrange to save the draft message in a + ;; regular file in message-auto-save-directory. Append a unique + ;; time-based suffix to the filename to allow multiple drafts to be saved + ;; simultaneously without overwriting each other (which mimics the + ;; functionality of the Gnus drafts folder). (setq buffer-file-name (expand-file-name + (concat (if (memq system-type '(ms-dos ms-windows windows-nt cygwin cygwin32 win32 w32 mswindows)) "message" "*message*") + (format-time-string "-%Y%m%d-%H%M%S")) message-auto-save-directory)) (setq buffer-auto-save-file-name (make-auto-save-file-name))) (clear-visited-file-modtime) diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index bfadd47200..473948e19c 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -599,20 +599,14 @@ ;; id-signedData OBJECT IDENTIFIER ::= { iso(1) member-body(2) ;; us(840) rsadsi(113549) pkcs(1) pkcs7(7) 2 } (defvar mm-pkcs7-signed-magic - (funcall (if (fboundp 'unibyte-string) 'unibyte-string 'string) - ?\x30 ?\x5c ?\x28 ?\x80 ?\x5c ?\x7c ?\x81 ?\x2e ?\x5c - ?\x7c ?\x82 ?\x2e ?\x2e ?\x5c ?\x7c ?\x83 ?\x2e ?\x2e - ?\x2e ?\x5c ?\x29 ?\x06 ?\x09 ?\x5c ?\x2a ?\x86 ?\x48 - ?\x86 ?\xf7 ?\x0d ?\x01 ?\x07 ?\x02)) + "\x30\x5c\x28\x80\x5c\x7c\x81\x2e\x5c\x7c\x82\x2e\x2e\x5c\x7c\x83\x2e\x2e\ +\x2e\x5c\x29\x06\x09\x5c\x2a\x86\x48\x86\xf7\x0d\x01\x07\x02") ;; id-envelopedData OBJECT IDENTIFIER ::= { iso(1) member-body(2) ;; us(840) rsadsi(113549) pkcs(1) pkcs7(7) 3 } (defvar mm-pkcs7-enveloped-magic - (funcall (if (fboundp 'unibyte-string) 'unibyte-string 'string) - ?\x30 ?\x5c ?\x28 ?\x80 ?\x5c ?\x7c ?\x81 ?\x2e ?\x5c - ?\x7c ?\x82 ?\x2e ?\x2e ?\x5c ?\x7c ?\x83 ?\x2e ?\x2e - ?\x2e ?\x5c ?\x29 ?\x06 ?\x09 ?\x5c ?\x2a ?\x86 ?\x48 - ?\x86 ?\xf7 ?\x0d ?\x01 ?\x07 ?\x03)) + "\x30\x5c\x28\x80\x5c\x7c\x81\x2e\x5c\x7c\x82\x2e\x2e\x5c\x7c\x83\x2e\x2e\ +\x2e\x5c\x29\x06\x09\x5c\x2a\x86\x48\x86\xf7\x0d\x01\x07\x03") (defun mm-view-pkcs7-get-type (handle) (mm-with-unibyte-buffer