2021-01-10 15:00:47 +01:00
|
|
|
;;; notmuch-draft.el --- functions for postponing and editing drafts -*- lexical-binding: t -*-
|
2016-11-13 15:08:48 +01:00
|
|
|
;;
|
|
|
|
;; Copyright © Mark Walters
|
|
|
|
;; Copyright © David Bremner
|
2018-10-22 16:44:54 +02:00
|
|
|
;; Copyright © Leo Gaspard
|
2016-11-13 15:08:48 +01:00
|
|
|
;;
|
|
|
|
;; This file is part of Notmuch.
|
|
|
|
;;
|
|
|
|
;; Notmuch is free software: you can redistribute it and/or modify it
|
|
|
|
;; under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
;;
|
|
|
|
;; Notmuch is distributed in the hope that it will be useful, but
|
|
|
|
;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
;; General Public License for more details.
|
|
|
|
;;
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;
|
|
|
|
;; Authors: Mark Walters <markwalters1009@gmail.com>
|
|
|
|
;; David Bremner <david@tethera.net>
|
2018-10-22 16:44:54 +02:00
|
|
|
;; Leo Gaspard <leo@gaspard.io>
|
2016-11-13 15:08:48 +01:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
emacs: improve how cl-lib and pcase are required
We need to load `cl-lib' at run-time because we use more from it than
just macros. Never-the-less many, but not all libraries required it
only at compile-time, which we got away with because at least some
libraries already required it at run-time as well.
We use `cl-lib' and (currently to a lesser extend) `pcase' throughout
the code-base, which means that we should require these features in
most libraries.
In the past we tried to only require these features in just the
libraries that actually need them, without fully succeeding. We did
not succeed in doing so because that means we would have to check
every time that we use a function from these features whether they
are already being required in the current library.
An alternative would be to add the `require' forms at the top of every
library but that is a bit annoying too.
In order to make sure that these features are loaded when needed but
also to keep the noise down we only require them in "notmuch-lib.el",
which most other libraries require, and in most of the few libraries
that do not do so, namely "notmuch-draft.el", "notmuch-message.el" and
"notmuch-parser.el". ("coolj.el", "make-deps.el", various generated
libraries, and "notmuch-compat.el" are left touched.)
2021-01-10 15:01:07 +01:00
|
|
|
(require 'cl-lib)
|
|
|
|
(require 'pcase)
|
2021-01-10 15:01:08 +01:00
|
|
|
(require 'subr-x)
|
emacs: improve how cl-lib and pcase are required
We need to load `cl-lib' at run-time because we use more from it than
just macros. Never-the-less many, but not all libraries required it
only at compile-time, which we got away with because at least some
libraries already required it at run-time as well.
We use `cl-lib' and (currently to a lesser extend) `pcase' throughout
the code-base, which means that we should require these features in
most libraries.
In the past we tried to only require these features in just the
libraries that actually need them, without fully succeeding. We did
not succeed in doing so because that means we would have to check
every time that we use a function from these features whether they
are already being required in the current library.
An alternative would be to add the `require' forms at the top of every
library but that is a bit annoying too.
In order to make sure that these features are loaded when needed but
also to keep the noise down we only require them in "notmuch-lib.el",
which most other libraries require, and in most of the few libraries
that do not do so, namely "notmuch-draft.el", "notmuch-message.el" and
"notmuch-parser.el". ("coolj.el", "make-deps.el", various generated
libraries, and "notmuch-compat.el" are left touched.)
2021-01-10 15:01:07 +01:00
|
|
|
|
2016-11-13 15:08:48 +01:00
|
|
|
(require 'notmuch-maildir-fcc)
|
|
|
|
(require 'notmuch-tag)
|
|
|
|
|
|
|
|
(declare-function notmuch-show-get-message-id "notmuch-show" (&optional bare))
|
2016-11-13 15:08:50 +01:00
|
|
|
(declare-function notmuch-message-mode "notmuch-mua")
|
2016-11-13 15:08:48 +01:00
|
|
|
|
emacs: make headings outline-minor-mode compatible
`outline-minor-mode' treats comments that begin with three or more
semicolons as headings. That makes it very convenient to navigate
code and to show/hide parts of a file.
Elips libraries typically have four top-level sections, e.g.:
;;; notmuch.el --- run notmuch within emacs...
;;; Commentary:...
;;; Code:...
;;; notmuch.el ends here
In this package many libraries lack a "Commentary:" section, which is
not optimal but okay for most libraries, except major entry points.
Depending on how one chooses to look at it, the "... ends here" line
is not really a heading that begins a section, because it should never
have a "section" body (after all it marks eof).
If the file is rather short, then I left "Code:" as the only section
that contains code. Otherwise I split the file into multiple sibling
sections. The "Code:" section continues to contain `require' and
`declare-function' forms and other such "front matter".
If and only if I have split the code into multiple sections anyway,
then I also added an additional section named just "_" before the
`provide' form and shortly before the "...end here" line. This
section could also be called "Back matter", but I feel it would be
distracting to be that explicit about it. (The IMO unnecessary but
unfortunately still obligatory "... ends here" line is already
distracting enough as far as I am concerned.)
Before this commit some libraries already uses section headings, some
of them consistently. When a library already had some headings, then
this commit often sticks to that style, even at the cost inconsistent
styling across all libraries.
A very limited number of variable and function definitions have to be
moved around because they would otherwise end up in sections they do
not belong into.
Sections, including but not limited to their heading, can and should
be further improved in the future.
2021-01-10 15:00:46 +01:00
|
|
|
;;; Options
|
|
|
|
|
2016-11-13 15:08:48 +01:00
|
|
|
(defgroup notmuch-draft nil
|
|
|
|
"Saving and editing drafts in Notmuch."
|
|
|
|
:group 'notmuch)
|
|
|
|
|
|
|
|
(defcustom notmuch-draft-tags '("+draft")
|
2021-07-19 13:31:09 +02:00
|
|
|
"List of tag changes to apply when saving a draft message in the database.
|
2016-11-13 15:08:48 +01:00
|
|
|
|
|
|
|
Tags starting with \"+\" (or not starting with either \"+\" or
|
|
|
|
\"-\") in the list will be added, and tags starting with \"-\"
|
|
|
|
will be removed from the message being stored.
|
|
|
|
|
|
|
|
For example, if you wanted to give the message a \"draft\" tag
|
|
|
|
but not the (normally added by default) \"inbox\" tag, you would
|
|
|
|
set:
|
|
|
|
(\"+draft\" \"-inbox\")"
|
|
|
|
:type '(repeat string)
|
|
|
|
:group 'notmuch-draft)
|
|
|
|
|
|
|
|
(defcustom notmuch-draft-folder "drafts"
|
|
|
|
"Folder to save draft messages in.
|
|
|
|
|
|
|
|
This should be specified relative to the root of the notmuch
|
|
|
|
database. It will be created if necessary."
|
|
|
|
:type 'string
|
|
|
|
:group 'notmuch-draft)
|
|
|
|
|
|
|
|
(defcustom notmuch-draft-quoted-tags '()
|
|
|
|
"Mml tags to quote.
|
|
|
|
|
|
|
|
This should be a list of mml tags to quote before saving. You do
|
|
|
|
not need to include \"secure\" as that is handled separately.
|
|
|
|
|
|
|
|
If you include \"part\" then attachments will not be saved with
|
|
|
|
the draft -- if not then they will be saved with the draft. The
|
|
|
|
former means the attachments may not still exist when you resume
|
|
|
|
the message, the latter means that the attachments as they were
|
|
|
|
when you postponed will be sent with the resumed message.
|
|
|
|
|
|
|
|
Note you may get strange results if you change this between
|
|
|
|
postponing and resuming a message."
|
|
|
|
:type '(repeat string)
|
|
|
|
:group 'notmuch-send)
|
|
|
|
|
2016-11-13 15:08:49 +01:00
|
|
|
(defcustom notmuch-draft-save-plaintext 'ask
|
2021-01-10 15:01:01 +01:00
|
|
|
"Whether to allow saving plaintext when it seems encryption is intended.
|
|
|
|
When a message contains mml tags, then that suggest it is
|
|
|
|
intended to be encrypted. If the user requests that such a
|
|
|
|
message is saved locally, then this option controls whether
|
|
|
|
that is allowed. Beside a boolean, this can also be `ask'."
|
2016-11-13 15:08:49 +01:00
|
|
|
:type '(radio
|
|
|
|
(const :tag "Never" nil)
|
|
|
|
(const :tag "Ask every time" ask)
|
|
|
|
(const :tag "Always" t))
|
|
|
|
:group 'notmuch-draft
|
|
|
|
:group 'notmuch-crypto)
|
|
|
|
|
emacs: make headings outline-minor-mode compatible
`outline-minor-mode' treats comments that begin with three or more
semicolons as headings. That makes it very convenient to navigate
code and to show/hide parts of a file.
Elips libraries typically have four top-level sections, e.g.:
;;; notmuch.el --- run notmuch within emacs...
;;; Commentary:...
;;; Code:...
;;; notmuch.el ends here
In this package many libraries lack a "Commentary:" section, which is
not optimal but okay for most libraries, except major entry points.
Depending on how one chooses to look at it, the "... ends here" line
is not really a heading that begins a section, because it should never
have a "section" body (after all it marks eof).
If the file is rather short, then I left "Code:" as the only section
that contains code. Otherwise I split the file into multiple sibling
sections. The "Code:" section continues to contain `require' and
`declare-function' forms and other such "front matter".
If and only if I have split the code into multiple sections anyway,
then I also added an additional section named just "_" before the
`provide' form and shortly before the "...end here" line. This
section could also be called "Back matter", but I feel it would be
distracting to be that explicit about it. (The IMO unnecessary but
unfortunately still obligatory "... ends here" line is already
distracting enough as far as I am concerned.)
Before this commit some libraries already uses section headings, some
of them consistently. When a library already had some headings, then
this commit often sticks to that style, even at the cost inconsistent
styling across all libraries.
A very limited number of variable and function definitions have to be
moved around because they would otherwise end up in sections they do
not belong into.
Sections, including but not limited to their heading, can and should
be further improved in the future.
2021-01-10 15:00:46 +01:00
|
|
|
;;; Internal
|
|
|
|
|
2016-11-13 15:08:49 +01:00
|
|
|
(defvar notmuch-draft-encryption-tag-regex
|
|
|
|
"<#\\(part encrypt\\|secure.*mode=.*encrypt>\\)"
|
2020-05-24 21:17:56 +02:00
|
|
|
"Regular expression matching mml tags indicating encryption of part or message.")
|
2016-11-13 15:08:49 +01:00
|
|
|
|
2020-11-16 22:28:38 +01:00
|
|
|
(defvar-local notmuch-draft-id nil
|
2020-05-24 21:17:56 +02:00
|
|
|
"Message-id of the most recent saved draft of this message.")
|
2016-11-13 15:08:48 +01:00
|
|
|
|
|
|
|
(defun notmuch-draft--mark-deleted ()
|
|
|
|
"Tag the last saved draft deleted.
|
|
|
|
|
|
|
|
Used when a new version is saved, or the message is sent."
|
|
|
|
(when notmuch-draft-id
|
|
|
|
(notmuch-tag notmuch-draft-id '("+deleted"))))
|
|
|
|
|
|
|
|
(defun notmuch-draft-quote-some-mml ()
|
2020-11-16 22:28:30 +01:00
|
|
|
"Quote the mml tags in `notmuch-draft-quoted-tags'."
|
2016-11-13 15:08:48 +01:00
|
|
|
(save-excursion
|
|
|
|
;; First we deal with any secure tag separately.
|
|
|
|
(message-goto-body)
|
|
|
|
(when (looking-at "<#secure[^\n]*>\n")
|
|
|
|
(let ((secure-tag (match-string 0)))
|
|
|
|
(delete-region (match-beginning 0) (match-end 0))
|
|
|
|
(message-add-header (concat "X-Notmuch-Emacs-Secure: " secure-tag))))
|
|
|
|
;; This is copied from mml-quote-region but only quotes the
|
|
|
|
;; specified tags.
|
|
|
|
(when notmuch-draft-quoted-tags
|
|
|
|
(let ((re (concat "<#!*/?\\("
|
|
|
|
(mapconcat 'regexp-quote notmuch-draft-quoted-tags "\\|")
|
|
|
|
"\\)")))
|
|
|
|
(message-goto-body)
|
|
|
|
(while (re-search-forward re nil t)
|
|
|
|
;; Insert ! after the #.
|
|
|
|
(goto-char (+ (match-beginning 0) 2))
|
|
|
|
(insert "!"))))))
|
|
|
|
|
2016-11-13 15:08:50 +01:00
|
|
|
(defun notmuch-draft-unquote-some-mml ()
|
2020-11-16 22:28:30 +01:00
|
|
|
"Unquote the mml tags in `notmuch-draft-quoted-tags'."
|
2016-11-13 15:08:50 +01:00
|
|
|
(save-excursion
|
|
|
|
(when notmuch-draft-quoted-tags
|
|
|
|
(let ((re (concat "<#!+/?\\("
|
|
|
|
(mapconcat 'regexp-quote notmuch-draft-quoted-tags "\\|")
|
|
|
|
"\\)")))
|
|
|
|
(message-goto-body)
|
|
|
|
(while (re-search-forward re nil t)
|
|
|
|
;; Remove one ! from after the #.
|
|
|
|
(goto-char (+ (match-beginning 0) 2))
|
|
|
|
(delete-char 1))))
|
|
|
|
(let (secure-tag)
|
|
|
|
(save-restriction
|
|
|
|
(message-narrow-to-headers)
|
2020-11-16 22:28:41 +01:00
|
|
|
(setq secure-tag (message-fetch-field "X-Notmuch-Emacs-Secure" t))
|
2016-11-13 15:08:50 +01:00
|
|
|
(message-remove-header "X-Notmuch-Emacs-Secure"))
|
|
|
|
(message-goto-body)
|
|
|
|
(when secure-tag
|
|
|
|
(insert secure-tag "\n")))))
|
|
|
|
|
2016-11-13 15:08:49 +01:00
|
|
|
(defun notmuch-draft--has-encryption-tag ()
|
2021-01-10 15:01:01 +01:00
|
|
|
"Return non-nil if there is an mml secure tag."
|
2016-11-13 15:08:49 +01:00
|
|
|
(save-excursion
|
|
|
|
(message-goto-body)
|
2020-11-16 22:28:41 +01:00
|
|
|
(re-search-forward notmuch-draft-encryption-tag-regex nil t)))
|
2016-11-13 15:08:49 +01:00
|
|
|
|
|
|
|
(defun notmuch-draft--query-encryption ()
|
2021-01-10 15:01:01 +01:00
|
|
|
"Return non-nil if we should save a message that should be encrypted.
|
2016-11-13 15:08:49 +01:00
|
|
|
|
|
|
|
`notmuch-draft-save-plaintext' controls the behaviour."
|
2020-04-25 22:18:07 +02:00
|
|
|
(cl-case notmuch-draft-save-plaintext
|
2020-08-08 13:49:38 +02:00
|
|
|
((ask)
|
|
|
|
(unless (yes-or-no-p
|
|
|
|
"(Customize `notmuch-draft-save-plaintext' to avoid this warning)
|
2016-11-13 15:08:49 +01:00
|
|
|
This message contains mml tags that suggest it is intended to be encrypted.
|
|
|
|
Really save and index an unencrypted copy? ")
|
2020-08-08 13:49:38 +02:00
|
|
|
(error "Save aborted")))
|
|
|
|
((nil)
|
|
|
|
(error "Refusing to save draft with encryption tags (see `%s')"
|
|
|
|
'notmuch-draft-save-plaintext))
|
|
|
|
((t)
|
|
|
|
(ignore))))
|
2016-11-13 15:08:49 +01:00
|
|
|
|
2016-11-13 15:08:48 +01:00
|
|
|
(defun notmuch-draft--make-message-id ()
|
|
|
|
;; message-make-message-id gives the id inside a "<" ">" pair,
|
|
|
|
;; but notmuch doesn't want that form, so remove them.
|
|
|
|
(concat "draft-" (substring (message-make-message-id) 1 -1)))
|
|
|
|
|
emacs: make headings outline-minor-mode compatible
`outline-minor-mode' treats comments that begin with three or more
semicolons as headings. That makes it very convenient to navigate
code and to show/hide parts of a file.
Elips libraries typically have four top-level sections, e.g.:
;;; notmuch.el --- run notmuch within emacs...
;;; Commentary:...
;;; Code:...
;;; notmuch.el ends here
In this package many libraries lack a "Commentary:" section, which is
not optimal but okay for most libraries, except major entry points.
Depending on how one chooses to look at it, the "... ends here" line
is not really a heading that begins a section, because it should never
have a "section" body (after all it marks eof).
If the file is rather short, then I left "Code:" as the only section
that contains code. Otherwise I split the file into multiple sibling
sections. The "Code:" section continues to contain `require' and
`declare-function' forms and other such "front matter".
If and only if I have split the code into multiple sections anyway,
then I also added an additional section named just "_" before the
`provide' form and shortly before the "...end here" line. This
section could also be called "Back matter", but I feel it would be
distracting to be that explicit about it. (The IMO unnecessary but
unfortunately still obligatory "... ends here" line is already
distracting enough as far as I am concerned.)
Before this commit some libraries already uses section headings, some
of them consistently. When a library already had some headings, then
this commit often sticks to that style, even at the cost inconsistent
styling across all libraries.
A very limited number of variable and function definitions have to be
moved around because they would otherwise end up in sections they do
not belong into.
Sections, including but not limited to their heading, can and should
be further improved in the future.
2021-01-10 15:00:46 +01:00
|
|
|
;;; Commands
|
|
|
|
|
2016-11-13 15:08:48 +01:00
|
|
|
(defun notmuch-draft-save ()
|
|
|
|
"Save the current draft message in the notmuch database.
|
|
|
|
|
|
|
|
This saves the current message in the database with tags
|
2020-11-16 22:28:30 +01:00
|
|
|
`notmuch-draft-tags' (in addition to any default tags
|
2016-11-13 15:08:48 +01:00
|
|
|
applied to newly inserted messages)."
|
|
|
|
(interactive)
|
2016-11-13 15:08:49 +01:00
|
|
|
(when (notmuch-draft--has-encryption-tag)
|
|
|
|
(notmuch-draft--query-encryption))
|
2016-11-13 15:08:48 +01:00
|
|
|
(let ((id (notmuch-draft--make-message-id)))
|
|
|
|
(with-temporary-notmuch-message-buffer
|
|
|
|
;; We insert a Date header and a Message-ID header, the former
|
|
|
|
;; so that it is easier to search for the message, and the
|
|
|
|
;; latter so we have a way of accessing the saved message (for
|
|
|
|
;; example to delete it at a later time). We check that the
|
2020-11-16 22:28:30 +01:00
|
|
|
;; user has these in `message-deletable-headers' (the default)
|
2016-11-13 15:08:48 +01:00
|
|
|
;; as otherwise they are doing something strange and we
|
|
|
|
;; shouldn't interfere. Note, since we are doing this in a new
|
|
|
|
;; buffer we don't change the version in the compose buffer.
|
|
|
|
(cond
|
|
|
|
((member 'Message-ID message-deletable-headers)
|
|
|
|
(message-remove-header "Message-ID")
|
|
|
|
(message-add-header (concat "Message-ID: <" id ">")))
|
|
|
|
(t
|
2020-08-08 13:49:36 +02:00
|
|
|
(message "You have customized emacs so Message-ID is not a %s"
|
|
|
|
"deletable header, so not changing it")
|
2016-11-13 15:08:48 +01:00
|
|
|
(setq id nil)))
|
|
|
|
(cond
|
|
|
|
((member 'Date message-deletable-headers)
|
|
|
|
(message-remove-header "Date")
|
|
|
|
(message-add-header (concat "Date: " (message-make-date))))
|
|
|
|
(t
|
2020-08-08 13:49:36 +02:00
|
|
|
(message "You have customized emacs so Date is not a deletable %s"
|
|
|
|
"header, so not changing it")))
|
2016-11-13 15:08:48 +01:00
|
|
|
(message-add-header "X-Notmuch-Emacs-Draft: True")
|
|
|
|
(notmuch-draft-quote-some-mml)
|
|
|
|
(notmuch-maildir-setup-message-for-saving)
|
|
|
|
(notmuch-maildir-notmuch-insert-current-buffer
|
2020-11-16 22:28:41 +01:00
|
|
|
notmuch-draft-folder t notmuch-draft-tags))
|
2016-11-13 15:08:48 +01:00
|
|
|
;; We are now back in the original compose buffer. Note the
|
|
|
|
;; function notmuch-call-notmuch-process (called by
|
|
|
|
;; notmuch-maildir-notmuch-insert-current-buffer) signals an error
|
|
|
|
;; on failure, so to get to this point it must have
|
|
|
|
;; succeeded. Also, notmuch-draft-id is still the id of the
|
|
|
|
;; previous draft, so it is safe to mark it deleted.
|
|
|
|
(notmuch-draft--mark-deleted)
|
|
|
|
(setq notmuch-draft-id (concat "id:" id))
|
|
|
|
(set-buffer-modified-p nil)))
|
|
|
|
|
|
|
|
(defun notmuch-draft-postpone ()
|
|
|
|
"Save the draft message in the notmuch database and exit buffer."
|
|
|
|
(interactive)
|
|
|
|
(notmuch-draft-save)
|
|
|
|
(kill-buffer))
|
|
|
|
|
2016-11-13 15:08:50 +01:00
|
|
|
(defun notmuch-draft-resume (id)
|
|
|
|
"Resume editing of message with id ID."
|
emacs: make headings outline-minor-mode compatible
`outline-minor-mode' treats comments that begin with three or more
semicolons as headings. That makes it very convenient to navigate
code and to show/hide parts of a file.
Elips libraries typically have four top-level sections, e.g.:
;;; notmuch.el --- run notmuch within emacs...
;;; Commentary:...
;;; Code:...
;;; notmuch.el ends here
In this package many libraries lack a "Commentary:" section, which is
not optimal but okay for most libraries, except major entry points.
Depending on how one chooses to look at it, the "... ends here" line
is not really a heading that begins a section, because it should never
have a "section" body (after all it marks eof).
If the file is rather short, then I left "Code:" as the only section
that contains code. Otherwise I split the file into multiple sibling
sections. The "Code:" section continues to contain `require' and
`declare-function' forms and other such "front matter".
If and only if I have split the code into multiple sections anyway,
then I also added an additional section named just "_" before the
`provide' form and shortly before the "...end here" line. This
section could also be called "Back matter", but I feel it would be
distracting to be that explicit about it. (The IMO unnecessary but
unfortunately still obligatory "... ends here" line is already
distracting enough as far as I am concerned.)
Before this commit some libraries already uses section headings, some
of them consistently. When a library already had some headings, then
this commit often sticks to that style, even at the cost inconsistent
styling across all libraries.
A very limited number of variable and function definitions have to be
moved around because they would otherwise end up in sections they do
not belong into.
Sections, including but not limited to their heading, can and should
be further improved in the future.
2021-01-10 15:00:46 +01:00
|
|
|
;; Used by command `notmuch-show-resume-message'.
|
2021-08-29 21:23:29 +02:00
|
|
|
(let* ((tags (notmuch--process-lines notmuch-command "search" "--output=tags"
|
2016-11-13 15:08:50 +01:00
|
|
|
"--exclude=false" id))
|
|
|
|
(draft (equal tags (notmuch-update-tags tags notmuch-draft-tags))))
|
|
|
|
(when (or draft
|
2018-10-22 16:44:54 +02:00
|
|
|
(yes-or-no-p "Message does not appear to be a draft: edit as new? "))
|
2020-08-11 18:59:13 +02:00
|
|
|
(pop-to-buffer-same-window
|
|
|
|
(get-buffer-create (concat "*notmuch-draft-" id "*")))
|
2016-11-13 15:08:50 +01:00
|
|
|
(setq buffer-read-only nil)
|
|
|
|
(erase-buffer)
|
|
|
|
(let ((coding-system-for-read 'no-conversion))
|
2021-09-11 16:04:08 +02:00
|
|
|
(notmuch--call-process notmuch-command nil t nil "show" "--format=raw" id))
|
2016-11-13 15:08:50 +01:00
|
|
|
(mime-to-mml)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(when (re-search-forward "^$" nil t)
|
|
|
|
(replace-match mail-header-separator t t))
|
|
|
|
;; Remove the Date and Message-ID headers (unless the user has
|
|
|
|
;; explicitly customized emacs to tell us not to) as they will
|
|
|
|
;; be replaced when the message is sent.
|
|
|
|
(save-restriction
|
|
|
|
(message-narrow-to-headers)
|
|
|
|
(when (member 'Message-ID message-deletable-headers)
|
|
|
|
(message-remove-header "Message-ID"))
|
|
|
|
(when (member 'Date message-deletable-headers)
|
|
|
|
(message-remove-header "Date"))
|
2018-10-22 16:44:54 +02:00
|
|
|
(unless draft (notmuch-fcc-header-setup))
|
2016-11-13 15:08:50 +01:00
|
|
|
;; The X-Notmuch-Emacs-Draft header is a more reliable
|
|
|
|
;; indication of whether the message really is a draft.
|
|
|
|
(setq draft (> (message-remove-header "X-Notmuch-Emacs-Draft") 0)))
|
|
|
|
;; If the message is not a draft we should not unquote any mml.
|
|
|
|
(when draft
|
|
|
|
(notmuch-draft-unquote-some-mml))
|
|
|
|
(notmuch-message-mode)
|
|
|
|
(message-goto-body)
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
;; If the resumed message was a draft then set the draft
|
|
|
|
;; message-id so that we can delete the current saved draft if the
|
|
|
|
;; message is resaved or sent.
|
2020-08-08 13:49:41 +02:00
|
|
|
(setq notmuch-draft-id (and draft id)))))
|
2016-11-13 15:08:50 +01:00
|
|
|
|
emacs: make headings outline-minor-mode compatible
`outline-minor-mode' treats comments that begin with three or more
semicolons as headings. That makes it very convenient to navigate
code and to show/hide parts of a file.
Elips libraries typically have four top-level sections, e.g.:
;;; notmuch.el --- run notmuch within emacs...
;;; Commentary:...
;;; Code:...
;;; notmuch.el ends here
In this package many libraries lack a "Commentary:" section, which is
not optimal but okay for most libraries, except major entry points.
Depending on how one chooses to look at it, the "... ends here" line
is not really a heading that begins a section, because it should never
have a "section" body (after all it marks eof).
If the file is rather short, then I left "Code:" as the only section
that contains code. Otherwise I split the file into multiple sibling
sections. The "Code:" section continues to contain `require' and
`declare-function' forms and other such "front matter".
If and only if I have split the code into multiple sections anyway,
then I also added an additional section named just "_" before the
`provide' form and shortly before the "...end here" line. This
section could also be called "Back matter", but I feel it would be
distracting to be that explicit about it. (The IMO unnecessary but
unfortunately still obligatory "... ends here" line is already
distracting enough as far as I am concerned.)
Before this commit some libraries already uses section headings, some
of them consistently. When a library already had some headings, then
this commit often sticks to that style, even at the cost inconsistent
styling across all libraries.
A very limited number of variable and function definitions have to be
moved around because they would otherwise end up in sections they do
not belong into.
Sections, including but not limited to their heading, can and should
be further improved in the future.
2021-01-10 15:00:46 +01:00
|
|
|
;;; _
|
2016-11-13 15:08:50 +01:00
|
|
|
|
2016-11-13 15:08:48 +01:00
|
|
|
(add-hook 'message-send-hook 'notmuch-draft--mark-deleted)
|
|
|
|
|
|
|
|
(provide 'notmuch-draft)
|
|
|
|
|
|
|
|
;;; notmuch-draft.el ends here
|