Re: Encryption unusable on XEmacs

[Daiki Ueno <ueno@unixuser.org>]

[-- Attachment #1: Type: text/plain, Size: 924 bytes --]

Ted Zlatanov <tzz@lifelogs.com> writes:

> On Wed, 02 Mar 2011 18:28:13 +0100 Michael Piotrowski <mxp@dynalabs.de> wrote: 
>
> MP> On 2011-03-02, Julien Danjou <julien@danjou.info> wrote:
>>>> The effect is that `mml2015-epg-encrypt' is unable to get the recipient
>>>> from the message and prompts for it.
>>> 
>>> Why? I cannot see why it would fail.
>
> MP> If message-options is buffer-local, it fails.  This is reproducible.
> MP> Whether this is a bug in XEmacs or due to XEmacs-only code at some
> MP> point, I don't know.
>
> Me neither.  I put in code to do the old behavior for XEmacs but hope
> that someone who uses it can tell what's wrong.

I guess the cause is: mml-generate-mime calls mml-generate-mime-1,
etc. in mm-with-multibyte-buffer.  On XEmacs, however,
mm-with-multibyte-buffer is defined using with-temp-buffer and local
variables are not copied into the new buffer.

Here is a patch (not tested).


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-mm-with-multibyte-buffer-Inherit-local-variables.patch --]
[-- Type: text/x-diff, Size: 1274 bytes --]

From 02e2d68fa6e440e6d9435ca3e90b11c9392431b1 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 3 Mar 2011 06:38:41 +0900
Subject: [PATCH] (mm-with-multibyte-buffer): Inherit local variables.

---
 lisp/mm-util.el |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 435c3bb..683d143 100644
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -1226,9 +1226,18 @@ Use unibyte mode for this."
 (defmacro mm-with-multibyte-buffer (&rest forms)
   "Create a temporary buffer, and evaluate FORMS there like `progn'.
 Use multibyte mode for this."
-  `(with-temp-buffer
-     (mm-enable-multibyte)
-     ,@forms))
+  (let ((variables (make-symbol "variables")))
+    `(let ((,variables (buffer-local-variables)))
+       (with-temp-buffer
+	 ;; copy local variables from the original buffer
+	 (while ,variables
+	   ;; a variable may be a constant and setting it may fail
+	   (condition-case nil
+	       (set (car (car ,variables)) (cdr (car ,variables)))
+	     (error))
+	   (setq ,variables (cdr ,variables)))
+	 (mm-enable-multibyte)
+	 ,@forms))))
 (put 'mm-with-multibyte-buffer 'lisp-indent-function 0)
 (put 'mm-with-multibyte-buffer 'edebug-form-spec '(body))
 
-- 
1.7.2.3


[-- Attachment #3: Type: text/plain, Size: 25 bytes --]


Regards,
-- 
Daiki Ueno