[MERGE] EmacsMail improvements
Christophe TROESTLER
Christophe.Troestler+bzr at umh.ac.be
Mon Jun 30 17:39:39 BST 2008
Hi,
On Mon, 30 Jun 2008 08:23:47 +0100, Bojan Nikolic wrote:
>
> I think people agree that emacsclient should be listed as one of the
> generic options in the help of "bzr send" command.
Done.
> I don't have mew so haven't tested this but Gnus continues to work
> fine.
>
> One small item is that the message part with the patch and bundle
> seems to be marked "inline" rather than "attachment". I think
> "attachment" is preferred by people on this list.
This is strange because 1. I did not modify the code written for RMail
and Gnus and 2. I tested with Gnus and the disposition is indeed
attachment. However, since the discussion indicates that "inline" is
preferred, I have changed it. I also removed the mail-text because it
may not be defined (if gnus has not be launched before bzr send is
issued) and does not seem to be needed (I tested it).
In the attached bundle the code for RMail also changed because
etach-attach does not come with Emacs 22 (it is a separate package),
so in case it does not exists, mail-attach-file is used instead (which
includes the bundle inside the message but it is better than failing).
> >> 4) The temporary elisp file was not removed (as noted in a FIXME in
> >> the function _prepare_send_function).
>
> Also seems fine, but could you update the comment of
> _prepare_send_function to replace the FIXME paragraph with a note that
> the temporary file is deleted from elisp?
Done.
New patch attached.
Regards,
Christophe
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: christophe.troestler at umh.ac.be-20080630162330-\
# t3h0u027ipusbzho
# target_branch: ../bzr.dev/
# testament_sha1: f128bd7ea37ad2054483244d1836c92d0b5a5e50
# timestamp: 2008-06-30 18:25:44 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20080620010918-64z4xylh1ap5hgyf
#
# Begin patch
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py 2008-06-17 03:55:49 +0000
+++ bzrlib/builtins.py 2008-06-30 09:34:02 +0000
@@ -4168,7 +4168,8 @@
To use a specific mail program, set the mail_client configuration option.
(For Thunderbird 1.5, this works around some bugs.) Supported values for
specific clients are "evolution", "kmail", "mutt", and "thunderbird";
- generic options are "default", "editor", "mapi", and "xdg-email".
+ generic options are "default", "editor", "emacsclient", "mapi", and
+ "xdg-email".
If mail is being sent, a to address is required. This can be supplied
either on the commandline, by setting the submit_to configuration
=== modified file 'bzrlib/mail_client.py'
--- bzrlib/mail_client.py 2008-04-13 11:48:00 +0000
+++ bzrlib/mail_client.py 2008-06-30 16:23:30 +0000
@@ -328,31 +328,35 @@
This temporary file will be loaded at runtime in
_get_compose_commandline function.
- FIXME: this function does not remove the file. That's a wanted
+ This function does not remove the file. That's a wanted
behaviour since _get_compose_commandline won't run the send
mail function directly but return the eligible command line.
Removing our temporary file here would prevent our sendmail
- function to work.
-
- A possible workaround could be to load the function here with
- emacsclient --eval '(load temp)' but this is not robust since
- emacs could have been stopped between here and the call to
- mail client.
+ function to work. (The file is deleted by some elisp code
+ after being read by Emacs.)
"""
_defun = r"""(defun bzr-add-mime-att (file)
- "Attach FILe to a mail buffer as a MIME attachment."
+ "Attach FILE to a mail buffer as a MIME attachment."
(let ((agent mail-user-agent))
- (mail-text)
- (newline)
(if (and file (file-exists-p file))
(cond
((eq agent 'sendmail-user-agent)
- (etach-attach file))
+ (progn
+ (mail-text)
+ (newline)
+ (if (functionp 'etach-attach)
+ (etach-attach file)
+ (mail-attach-file file))))
((or (eq agent 'message-user-agent)(eq agent 'gnus-user-agent))
- (mml-attach-file file "text/x-patch" "BZR merge" "attachment"))
+ (progn
+ (mml-attach-file file "text/x-patch" "BZR merge" "inline")))
+ ((eq agent 'mew-user-agent)
+ (progn
+ (mew-draft-prepare-attachments)
+ (mew-attach-link file (file-name-nondirectory file))))
(t
- (message "Unhandled MUA")))
+ (message "Unhandled MUA, report it on bazaar at lists.canonical.com")))
(error "File %s does not exist." file))))
"""
@@ -371,9 +375,10 @@
_subject = "nil"
if to is not None:
- _to = ("\"%s\"" % self._encode_safe(to))
+ _to = ("\"%s\"" % self._encode_safe(to).replace('"', '\\"'))
if subject is not None:
- _subject = ("\"%s\"" % self._encode_safe(subject))
+ _subject = ("\"%s\"" %
+ self._encode_safe(subject).replace('"', '\\"'))
# Funcall the default mail composition function
# This will work with any mail mode including default mail-mode
@@ -385,11 +390,14 @@
# Try to attach a MIME attachment using our wrapper function
if attach_path is not None:
# Do not create a file if there is no attachment
- lmmform = '(load "%s")' % self._prepare_send_function()
+ elisp = self._prepare_send_function()
+ lmmform = '(load "%s")' % elisp
mmform = '(bzr-add-mime-att "%s")' % \
self._encode_path(attach_path, 'attachment')
+ rmform = '(delete-file "%s")' % elisp
commandline.append(lmmform)
commandline.append(mmform)
+ commandline.append(rmform)
return commandline
# Begin bundle
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
More information about the bazaar
mailing list