From 33b407cada72da452cdd10722b816b2b33eb11ad Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 22 Jun 2003 22:16:24 +0000 Subject: [PATCH] Synch to Gnus 200306221327. --- lisp/ChangeLog | 9 +++++++++ lisp/mm-util.el | 7 ++++--- lisp/mm-view.el | 3 ++- texi/ChangeLog | 4 ++++ texi/message-ja.texi | 9 +++++++-- texi/message.texi | 9 +++++++-- 6 files changed, 33 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 77b377d..5dccdae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2003-06-20 Jesper Harder + + * mm-util.el (mm-append-to-file): Say "Appended to". Suggested by + Dan Jacobson . + + * mm-view.el (mm-inline-message): Bind + gnus-original-article-buffer to the buffer in the mml handle + holding the message. + 2003-06-20 Katsumi Yamaoka * message.el (sender, from): No need to bind them. diff --git a/lisp/mm-util.el b/lisp/mm-util.el index 6d14862..682788d 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -703,10 +703,10 @@ Equivalent to `progn' in XEmacs" (defun mm-insert-file-contents (filename &optional visit beg end replace inhibit) - "Like `insert-file-contents', q.v., but only reads in the file. + "Like `insert-file-contents', but only reads in the file. A buffer may be modified in several ways after reading into the buffer due to advanced Emacs features, such as file-name-handlers, format decoding, -find-file-hooks, etc. +`find-file-hooks', etc. If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'. This function ensures that none of these modifications will take place." (let ((format-alist nil) @@ -745,7 +745,8 @@ If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'." (append mm-inhibit-file-name-handlers inhibit-file-name-handlers) inhibit-file-name-handlers))) - (append-to-file start end filename))) + (write-region start end filename t 'no-message) + (message "Appended to %s" filename))) (defun mm-write-region (start end filename &optional append visit lockname coding-system inhibit) diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 4fba52b..5a57a92 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -439,7 +439,8 @@ map."))) gnus-article-prepare-hook (gnus-newsgroup-charset (or charset gnus-newsgroup-charset))) - (run-hooks 'gnus-article-decode-hook) + (let ((gnus-original-article-buffer (mm-handle-buffer handle))) + (run-hooks 'gnus-article-decode-hook)) (gnus-article-prepare-display) (setq handles gnus-article-mime-handles)) (goto-char (point-min)) diff --git a/texi/ChangeLog b/texi/ChangeLog index a3033a9..d850590 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2003-06-22 Simon Josefsson + + * message.texi (Security): Mention S/MIME passphrases. + 2003-06-20 Jesper Harder * gnus.texi: Add @command. diff --git a/texi/message-ja.texi b/texi/message-ja.texi index bfeac71..0c5e15a 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -1051,8 +1051,13 @@ $ openssl pkcs12 -in ns.p12 -clcerts -nodes > key+cert.pem The @file{key+cert.pem} file should be pointed to from the @code{smime-keys} variable. You should now be able to send signed mail. -@emph{Note!} Your private key is stored unencrypted in the file, so take -care in handling it. +@emph{Note!} Your private key is now stored unencrypted in the file, +so take care in handling it. Storing encrypted keys on the disk are +supported, and Gnus will ask you for a passphrase before invoking +OpenSSL. Read the OpenSSL documentation for how to achieve this. If +you use unencrypted keys (e.g., if they are on a secure storage, or if +you are on a secure single user machine) simply press @code{RET} at +the passphrase prompt. @subsection Using PGP/MIME diff --git a/texi/message.texi b/texi/message.texi index f4ec956..64f03d4 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1034,8 +1034,13 @@ $ openssl pkcs12 -in ns.p12 -clcerts -nodes > key+cert.pem The @file{key+cert.pem} file should be pointed to from the @code{smime-keys} variable. You should now be able to send signed mail. -@emph{Note!} Your private key is stored unencrypted in the file, so take -care in handling it. +@emph{Note!} Your private key is now stored unencrypted in the file, +so take care in handling it. Storing encrypted keys on the disk are +supported, and Gnus will ask you for a passphrase before invoking +OpenSSL. Read the OpenSSL documentation for how to achieve this. If +you use unencrypted keys (e.g., if they are on a secure storage, or if +you are on a secure single user machine) simply press @code{RET} at +the passphrase prompt. @subsection Using PGP/MIME -- 1.7.10.4