Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1429

3 files changed, 28 insertions, 10 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 068821d4bdb..e53a6a52452 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 60144932416..3ec15d00831 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 bfadd47200d..473948e19c5 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