Mercurial > emacs
changeset 98344:7fa3e064d230
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1429
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 25 Sep 2008 15:38:29 +0000 |
| parents | 09db47fa2c88 |
| children | 952d664ebd93 |
| files | doc/misc/ChangeLog doc/misc/gnus.texi doc/misc/message.texi lisp/gnus/ChangeLog lisp/gnus/message.el lisp/gnus/mm-view.el |
| diffstat | 6 files changed, 52 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Thu Sep 25 10:45:20 2008 +0000 +++ b/doc/misc/ChangeLog Thu Sep 25 15:38:29 2008 +0000 @@ -1,3 +1,12 @@ +2008-09-24 Teodor Zlatanov <tzz@lifelogs.com> + + * message.texi (Sending Variables): Added `message-confirm-send' doc. + +2008-09-24 Katsumi Yamaoka <yamaoka@jpl.org> + + * 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 <wohler@newt.com> 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 <yamaoka@jpl.org> +2008-09-19 Katsumi Yamaoka <yamaoka@jpl.org> * gnus.texi (Top, Setup, Fancy splitting to parent) (Store custom flags and keywords, Store arbitrary data): Clean up
--- a/doc/misc/gnus.texi Thu Sep 25 10:45:20 2008 +0000 +++ b/doc/misc/gnus.texi Thu Sep 25 15:38:29 2008 +0000 @@ -26506,7 +26506,6 @@ @node The Gnus Registry @section The Gnus Registry - @cindex registry @cindex split @cindex track @@ -26521,26 +26520,29 @@ 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::
--- a/doc/misc/message.texi Thu Sep 25 10:45:20 2008 +0000 +++ b/doc/misc/message.texi Thu Sep 25 15:38:29 2008 +0000 @@ -2223,6 +2223,11 @@ 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
--- a/lisp/gnus/ChangeLog Thu Sep 25 10:45:20 2008 +0000 +++ b/lisp/gnus/ChangeLog Thu Sep 25 15:38:29 2008 +0000 @@ -1,3 +1,17 @@ +2008-09-24 Teodor Zlatanov <tzz@lifelogs.com> + + * message.el (message-confirm-send): Add appropriate version. + +2008-09-22 Teodor Zlatanov <tzz@lifelogs.com> + + * mm-view.el (mm-pkcs7-enveloped-magic): Fix extra parenthesis in + defvar. + +2008-09-22 Daiki Ueno <ueno@unixuser.org> + + * mm-view.el (mm-pkcs7-signed-magic): Use literals. + (mm-pkcs7-enveloped-magic): Ditto. + 2008-09-17 Simon Josefsson <simon@josefsson.org> * sieve-manage.el (sieve-manage-is-string): Accept literals too.
--- a/lisp/gnus/message.el Thu Sep 25 10:45:20 2008 +0000 +++ b/lisp/gnus/message.el Thu Sep 25 15:38:29 2008 +0000 @@ -445,6 +445,7 @@ "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 @@ (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)
--- a/lisp/gnus/mm-view.el Thu Sep 25 10:45:20 2008 +0000 +++ b/lisp/gnus/mm-view.el Thu Sep 25 15:38:29 2008 +0000 @@ -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