diff options
| author |  David Bremner <bremner@debian.org> | 2012-02-04 12:01:46 -0500 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2012-02-04 12:01:46 -0500 |
| commit | d43f6c00b351424e903c2f2b71c34bc5902b467e (patch) | |
| tree | 17a4f90bd3aa1b5d31e169a790d137831dbf37ce /emacs | |
| parent | 8281430558c1b2eafc847620cd84f5ce40bf6741 (diff) | |
| parent | f38bc44653ad910abb95add6b09321da11f50581 (diff) | |
Merge commit '0.11.1'
Conflicts:
NEWS
bindings/python/notmuch/database.py
bindings/python/notmuch/message.py
notmuch.1
NEWS merged by hand, others taken from master.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch-mua.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index 023645e3..c07b67ba 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -116,7 +116,12 @@ list." (push-mark)) (set-buffer-modified-p nil) - (message-goto-body)) + (message-goto-body) + ;; Original message may contain (malicious) MML tags. We must + ;; properly quote them in the reply. Note that using `point-max' + ;; instead of `mark' here is wrong. The buffer may include user's + ;; signature which should not be MML-quoted. + (mml-quote-region (point) (point-max))) (defun notmuch-mua-forward-message () (message-forward) |