[MERGE] Replace mail-mode call with compose-mail from GNU Emacs.

[Andrew Bennetts]

Xavier Maillard wrote:
> Aaron Bentley <aaron <at> aaronbentley.com> writes:
[...]
> > 
> > And again, I can't merge it because it has still indents using tabs.
> 
> Well, in my editor, there is no TAB caracter. I tested all the lines and I can
> advance one caracter at a time for each line.
> 
> What's more, I have set indent-tabs-mode to nil which means "never insert tabs".
> I am clueless.

The tab characters are in this part of mail_client.py:

+  "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))
+	 ((or (eq agent 'message-user-agent)(eq agent 'gnus-user-agent))
+	  (mml-attach-file file "text/x-patch" "BZR merge" "attachment"))
+	 (t
+	  (message "Unhandled MUA")))
+      (error "File %s does not exist." file))))

Specifically, the (cond ...) lines.

The rest of the diff looked clean to me.

-Andrew.