debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
notmuch/emacs/notmuch-mua.el

624 lines
24 KiB
EmacsLisp
Raw Normal View History

emacs: use lexical-bindings in all libraries Doing so causes many new compile warnings. Some of these warnings concern genuine changes in behavior that have to be addressed right away. Many other warnings are due to unused variables. Nothing has changed here, except that the byte-compiler can now detect these pre-existing and harmless issues. We delay addressing these issues so that we can focus on the important ones here. A third group of warnings concern arguments that are not actually used inside the function but which cannot be removed because the functions signature is dictated by some outside convention. Silencing these warning is also delayed until subsequent commits.
2021-01-10 15:00:47 +01:00
;;; notmuch-mua.el --- emacs style mail-user-agent -*- lexical-binding: t -*-
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
;;
;; Copyright © David Edmondson
;;
;; 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
Use https instead of http where possible Many of the external links found in the notmuch source can be resolved using https instead of http. This changeset addresses as many as i could find, without touching the e-mail corpus or expected outputs found in tests.
2016-06-02 18:26:14 +02:00
;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
;;
;; Authors: David Edmondson <dme@dme.org>
emacs: Fix packaging Refer to (info "(elisp) Library Headers") for package conventions.
2016-04-13 09:58:47 +02:00
;;; Code:
emacs: Use `cl-lib' instead of deprecated `cl' Starting with Emacs 27 the old `cl' implementation is finally considered obsolete. Previously its use was strongly discouraged at run-time but one was still allowed to use it at compile-time. For the most part the transition is very simple and boils down to adding the "cl-" prefix to some symbols. A few replacements do not follow that simple pattern; e.g. `first' is replaced with `car', even though the alias `cl-first' exists, because the latter is not idiomatic emacs-lisp. In a few cases we start using `pcase-let' or `pcase-lambda' instead of renaming e.g. `first' to `car'. That way we can remind the reader of the meaning of the various parts of the data that is being deconstructed. An obsolete `lexical-let' and a `lexical-let*' are replaced with their regular variants `let' and `let*' even though we do not at the same time enable `lexical-binding' for that file. That is the right thing to do because it does not actually make a difference in those cases whether lexical bindings are used or not, and because this should be enabled in a separate commit. We need to explicitly depend on the `cl-lib' package because Emacs 24.1 and 24.2 lack that library. When using these releases we end up using the backport from GNU Elpa. We need to explicitly require the `pcase' library because `pcase-dolist' was not autoloaded until Emacs 25.1.
2020-04-25 22:18:07 +02:00
(eval-when-compile (require 'cl-lib))
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
(require 'message)
emacs: Correctly quote non-text/plain parts in reply Quote non-text parts nicely by displaying them with mm-display-part before calling message-cite-original to quote them. HTML-only emails can now be quoted correctly. We re-use some code from notmuch-show (notmuch-show-mm-display-part-inline), which has been moved to notmuch-lib.el. Mark the test for this feature as not broken.
2012-05-05 21:30:37 +02:00
(require 'mm-view)
emacs: Use the new JSON reply format and message-cite-original Use the new JSON reply format to create replies in emacs. Quote HTML parts nicely by using mm-display-part to turn them into displayable text, then quoting them with message-cite-original. This is very useful for users who regularly receive HTML-only email. Use message-mode's message-cite-original function to create the quoted body for reply messages. In order to make this act like the existing notmuch defaults, you will need to set the following in your emacs configuration: message-citation-line-format "On %a, %d %b %Y, %f wrote:" message-citation-line-function 'message-insert-formatted-citation-line The tests have been updated to reflect the (ugly) emacs default.
2012-03-18 17:32:42 +01:00
(require 'format-spec)
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
(require 'notmuch-lib)
emacs: Automatically load "notmuch-address" "notmuch-address.el" tries to be careful to insinuate itself into message mode only if it will do something useful, so it's safe to load it all of the time.
2010-04-26 12:48:33 +02:00
(require 'notmuch-address)
emacs: check drafts for encryption tags before saving In general the user may not want to save plaintext copies of messages that they are sending encrypted, so give them a chance to abort.
2016-11-13 15:08:49 +01:00
(require 'notmuch-draft)
emacs: Use a buffer-local variable to update tags when sending replies Instead of relying on the "In-Reply-To" header, use a buffer-local variable, notmuch-message-queued-tag-changes, to add and remove tags to affected messages when the message-send-hook is triggered.
2019-04-12 14:01:11 +02:00
(require 'notmuch-message)
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
emacs/mua: Generate improved cited text for replies Use the message display code to generate message text to cite in replies. For now we set insert-headers-p function to notmuch-show-reply-insert-header-p-never so that, as before, we don't insert part buttons. With that choice of insert-headers-p function there is only one failing test: this test has a text part (an email message) listed as application/octet-stream. Notmuch show displays this part, but the reply code omitted it as it had type application/octet-stream. The new code correctly includes it. Thus update the expected output to match.
2016-02-20 19:24:38 +01:00
(declare-function notmuch-show-insert-body "notmuch-show" (msg body depth))
emacs: Fix compiler warnings. notmuch-mua.el should declare functions that it uses from notmuch-maildir-fcc.el.
2016-02-06 18:55:43 +01:00
(declare-function notmuch-fcc-header-setup "notmuch-maildir-fcc" ())
emacs: maildir import message-do-fcc We will need our own local copy of message-do-fcc so this commit just copies the code straight from message.el so that it is easier to see our local changes coming in the next commit.
2016-09-04 00:59:40 +02:00
(declare-function notmuch-maildir-message-do-fcc "notmuch-maildir-fcc" ())
emacs: postpone a message This provides initial support for postponing in the emacs frontend; resuming will follow in a later commit. On saving/postponing it uses notmuch insert to put the message in the notmuch database Current bindings are C-x C-s to save a draft, C-c C-p to postpone a draft (save and exit compose buffer). Previous drafts get tagged deleted on subsequent saves, or on the message being sent. Each draft gets its own message-id, and we use the namespace draft-.... for draft message ids (so, at least for most people, drafts are easily distinguisable).
2016-11-13 15:08:48 +01:00
(declare-function notmuch-draft-postpone "notmuch-draft" ())
(declare-function notmuch-draft-save "notmuch-draft" ())
emacs: insert quotable parts in reply as they are displayed in show view In reply, insert quotable parts using notmuch-show-insert-bodypart instead of calling notmuch-mm-display-part-inline directly to render the quoted parts as they are rendered in show view. We use a temp buffer to not leak text properties from the show renderer into the reply. This way we also don't need to worry about narrowing or point placement. Credits to Mark Walters <markwalters1009@gmail.com> and Austin Clements <amdragon@MIT.EDU> for getting this part straight. The notable change is that replies to text/calendar parts quote the pretty printed output of icalendar-import-buffer rather than the ugly raw vcalendar.
2013-09-01 19:59:53 +02:00
emacs: use lexical-bindings in all libraries Doing so causes many new compile warnings. Some of these warnings concern genuine changes in behavior that have to be addressed right away. Many other warnings are due to unused variables. Nothing has changed here, except that the byte-compiler can now detect these pre-existing and harmless issues. We delay addressing these issues so that we can focus on the important ones here. A third group of warnings concern arguments that are not actually used inside the function but which cannot be removed because the functions signature is dictated by some outside convention. Silencing these warning is also delayed until subsequent commits.
2021-01-10 15:00:47 +01:00
(defvar notmuch-show-indent-multipart)
(defvar notmuch-show-insert-header-p-function)
(defvar notmuch-show-max-text-part-size)
(defvar notmuch-show-insert-text/plain-hook)
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
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
emacs: Remove notmuch-mua-message-send-hook Currently `message-send-hook` functions are being called twice: In notmuch send common when `notmuch-mua-send-hook` functions are run (which by default includes `notmuch-mua-message-send-hook`) and in `message-send` itself. Because `message-send-hook` functions are run in `message-send` itself, we don't need also need to run them before we delegate to `message-send` Calling `notmuch-mua-message-send-hook` resulted in functions in `message-send-hook` to be called twice. This causes bugs in non-idempotent hook functions.
2020-09-12 06:45:40 +02:00
(defcustom notmuch-mua-send-hook nil
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
"Hook run before sending messages."
emacs: logically group def{custom,face}s To allow for expansion whilst keeping everything tidy and organized, move all defcustom/defface variables to the following subgroups, defined in notmuch-lib.el: - Hello - Search - Show - Send - Crypto - Hooks - External Commands - Appearance As an added benefit, defcustom keyword args are now consistently ordered as they appear @ defcustom's docstring (OCD much?). Proper defgroup docstrings and various other improvements by courtesy of Austin Clements.
2012-01-16 11:38:33 +01:00
:type 'hook
:group 'notmuch-send
:group 'notmuch-hooks)
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
emacs: Let the user choose where to compose new mails Introduce a new defcustom notmuch-mua-compose-in that allows users to specify where new mails are composed, either in the current window or in a new window or frame. Signed-off-by: Jameson Rollins <jrollins@finestructure.net>
2012-05-04 12:37:56 +02:00
(defcustom notmuch-mua-compose-in 'current-window
emacs: more cleanup since dropping support for Emacs 24 Notmuch requires at least version 25 of Emacs now. Adjust comments that previously referenced version 24 specifically, even though they also apply to later releases. Remove documentation and code that no longer applies. - `mm-shr' no longer references `gnus-inhibit-images'.
2020-11-16 22:28:24 +01:00
"Where to create the mail buffer used to compose a new message.
emacs: Let the user choose where to compose new mails Introduce a new defcustom notmuch-mua-compose-in that allows users to specify where new mails are composed, either in the current window or in a new window or frame. Signed-off-by: Jameson Rollins <jrollins@finestructure.net>
2012-05-04 12:37:56 +02:00
Possible values are `current-window' (default), `new-window' and
`new-frame'. If set to `current-window', the mail buffer will be
displayed in the current window, so the old buffer will be
restored when the mail buffer is killed. If set to `new-window'
or `new-frame', the mail buffer will be displayed in a new
window/frame that will be destroyed when the buffer is killed.
You may want to customize `message-kill-buffer-on-exit'
accordingly."
:group 'notmuch-send
:type '(choice (const :tag "Compose in the current window" current-window)
(const :tag "Compose mail in a new window" new-window)
(const :tag "Compose mail in a new frame" new-frame)))
Omit User-Agent: header by default The User-Agent: header can be fun and interesting, but it also leaks quite a bit of information about the user and their software stack. This represents a potential security risk (attackers can target the particular stack) and also an anonymity risk (a user trying to preserve their anonymity by sending mail from a non-associated account might reveal quite a lot of information if their choice of mail user agent is exposed). This change also avoids hiding the User-Agent header by default, so that people who decide they want to send it will at least see it (and can edit it if they want to) before sending. It makes sense to have safer defaults.
2016-08-09 01:35:17 +02:00
(defcustom notmuch-mua-user-agent-function nil
emacs: place only first sentence on first doc-string line
2020-11-16 22:28:28 +01:00
"Function used to generate a `User-Agent:' string.
If this is `nil' then no `User-Agent:' will be generated."
emacs: Fix notmuch-mua-user-agent defcustom The :options keyword is not meaningful for function type. Also, it was not possible to enter nil value, contrary to the notmuch-mua-user-agent defcustom documentation. Specify the alternatives using choice type, taking nil into account. Signed-off-by: Jani Nikula <jani@nikula.org>
2011-12-20 20:53:14 +01:00
:type '(choice (const :tag "No user agent string" nil)
(const :tag "Full" notmuch-mua-user-agent-full)
(const :tag "Notmuch" notmuch-mua-user-agent-notmuch)
(const :tag "Emacs" notmuch-mua-user-agent-emacs)
(function :tag "Custom user agent function"
emacs: logically group def{custom,face}s To allow for expansion whilst keeping everything tidy and organized, move all defcustom/defface variables to the following subgroups, defined in notmuch-lib.el: - Hello - Search - Show - Send - Crypto - Hooks - External Commands - Appearance As an added benefit, defcustom keyword args are now consistently ordered as they appear @ defcustom's docstring (OCD much?). Proper defgroup docstrings and various other improvements by courtesy of Austin Clements.
2012-01-16 11:38:33 +01:00
:value notmuch-mua-user-agent-full))
:group 'notmuch-send)
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
Omit User-Agent: header by default The User-Agent: header can be fun and interesting, but it also leaks quite a bit of information about the user and their software stack. This represents a potential security risk (attackers can target the particular stack) and also an anonymity risk (a user trying to preserve their anonymity by sending mail from a non-associated account might reveal quite a lot of information if their choice of mail user agent is exposed). This change also avoids hiding the User-Agent header by default, so that people who decide they want to send it will at least see it (and can edit it if they want to) before sending. It makes sense to have safer defaults.
2016-08-09 01:35:17 +02:00
(defcustom notmuch-mua-hidden-headers nil
emacs: place complete first sentence on first doc-string line
2020-11-16 22:28:29 +01:00
"Headers that are added to the `message-mode' hidden headers list."
emacs: logically group def{custom,face}s To allow for expansion whilst keeping everything tidy and organized, move all defcustom/defface variables to the following subgroups, defined in notmuch-lib.el: - Hello - Search - Show - Send - Crypto - Hooks - External Commands - Appearance As an added benefit, defcustom keyword args are now consistently ordered as they appear @ defcustom's docstring (OCD much?). Proper defgroup docstrings and various other improvements by courtesy of Austin Clements.
2012-01-16 11:38:33 +01:00
:type '(repeat string)
:group 'notmuch-send)
emacs: Hide the "User-Agent:" when composing messages Add a list of headers to those hidden by `message-mode' when composing. By default the list includes only "User-Agent:".
2010-04-26 13:50:59 +02:00
emacs: make citation function customizable. Make a new customizable variable instead of relying on message-cite-function because the default for the latter changed between emacs releases. The defcustom is borrowed from the message.el source, with minor modifications.
2015-01-14 20:57:49 +01:00
(defgroup notmuch-reply nil
"Replying to messages in notmuch"
:group 'notmuch)
(defcustom notmuch-mua-cite-function 'message-cite-original
emacs: misc doc-string improvements
2020-11-16 22:28:31 +01:00
"Function for citing an original message.
emacs: make citation function customizable. Make a new customizable variable instead of relying on message-cite-function because the default for the latter changed between emacs releases. The defcustom is borrowed from the message.el source, with minor modifications.
2015-01-14 20:57:49 +01:00
Predefined functions include `message-cite-original' and
emacs: misc doc-string improvements
2020-11-16 22:28:31 +01:00
`message-cite-original-without-signature'. Note that these
functions use `mail-citation-hook' if that is non-nil."
emacs: make citation function customizable. Make a new customizable variable instead of relying on message-cite-function because the default for the latter changed between emacs releases. The defcustom is borrowed from the message.el source, with minor modifications.
2015-01-14 20:57:49 +01:00
:type '(radio (function-item message-cite-original)
(function-item message-cite-original-without-signature)
(function-item sc-cite-original)
(function :tag "Other"))
:link '(custom-manual "(message)Insertion Variables")
:group 'notmuch-reply)
emacs/mua: Let user specify which parts get a header in citations. Add a customizable function specifying which parts get a header when replying, and give some sensible possiblities. These are, 1) all parts except multipart/*. (Subparts of a multipart part do receive a header button.) 2) only included text/* parts. 3) Exactly as in the show buffer. 4) None at all. This means the reply contains a mish-mash of all the original message's parts. In the test suite we set the choice to option 4 to match the previous behaviour.
2016-02-20 19:24:40 +01:00
(defcustom notmuch-mua-reply-insert-header-p-function
emacs: Change the default notmuch-mua-reply-insert-header-p-function Set notmuch-show-reply-insert-header-p-never as the default value for notmuch-mua-reply-insert-header-p-function.
2016-03-16 09:19:55 +01:00
'notmuch-show-reply-insert-header-p-never
emacs/mua: Let user specify which parts get a header in citations. Add a customizable function specifying which parts get a header when replying, and give some sensible possiblities. These are, 1) all parts except multipart/*. (Subparts of a multipart part do receive a header button.) 2) only included text/* parts. 3) Exactly as in the show buffer. 4) None at all. This means the reply contains a mish-mash of all the original message's parts. In the test suite we set the choice to option 4 to match the previous behaviour.
2016-02-20 19:24:40 +01:00
"Function to decide which parts get a header when replying.
This function specifies which parts of a mime message with
Fix typos as found by codespell Signed-off-by: Georg Faerber <georg@riseup.net>
2018-03-18 03:30:25 +01:00
multiple parts get a header."
emacs: Change the default notmuch-mua-reply-insert-header-p-function Set notmuch-show-reply-insert-header-p-never as the default value for notmuch-mua-reply-insert-header-p-function.
2016-03-16 09:19:55 +01:00
:type '(radio (const :tag "No part headers"
emacs: Fix indentation
2020-08-08 13:49:38 +02:00
notmuch-show-reply-insert-header-p-never)
emacs: Change the default notmuch-mua-reply-insert-header-p-function Set notmuch-show-reply-insert-header-p-never as the default value for notmuch-mua-reply-insert-header-p-function.
2016-03-16 09:19:55 +01:00
(const :tag "All except multipart/* and hidden parts"
emacs: Fix indentation
2020-08-08 13:49:38 +02:00
notmuch-show-reply-insert-header-p-trimmed)
emacs/mua: Let user specify which parts get a header in citations. Add a customizable function specifying which parts get a header when replying, and give some sensible possiblities. These are, 1) all parts except multipart/*. (Subparts of a multipart part do receive a header button.) 2) only included text/* parts. 3) Exactly as in the show buffer. 4) None at all. This means the reply contains a mish-mash of all the original message's parts. In the test suite we set the choice to option 4 to match the previous behaviour.
2016-02-20 19:24:40 +01:00
(const :tag "Only for included text parts"
emacs: Fix indentation
2020-08-08 13:49:38 +02:00
notmuch-show-reply-insert-header-p-minimal)
emacs/mua: Let user specify which parts get a header in citations. Add a customizable function specifying which parts get a header when replying, and give some sensible possiblities. These are, 1) all parts except multipart/*. (Subparts of a multipart part do receive a header button.) 2) only included text/* parts. 3) Exactly as in the show buffer. 4) None at all. This means the reply contains a mish-mash of all the original message's parts. In the test suite we set the choice to option 4 to match the previous behaviour.
2016-02-20 19:24:40 +01:00
(const :tag "Exactly as in show view"
emacs: Fix indentation
2020-08-08 13:49:38 +02:00
notmuch-show-insert-header-p)
emacs/mua: Let user specify which parts get a header in citations. Add a customizable function specifying which parts get a header when replying, and give some sensible possiblities. These are, 1) all parts except multipart/*. (Subparts of a multipart part do receive a header button.) 2) only included text/* parts. 3) Exactly as in the show buffer. 4) None at all. This means the reply contains a mish-mash of all the original message's parts. In the test suite we set the choice to option 4 to match the previous behaviour.
2016-02-20 19:24:40 +01:00
(function :tag "Other"))
:group 'notmuch-reply)
emacs: Optionally check for missing attachments in outgoing messages Query the user if the message text indicates that an attachment is expected but no MML referencing an attachment is found. This is not enabled by default - see the documentation for `notmuch-mua-attachment-check'.
2018-09-08 23:40:40 +02:00
(defcustom notmuch-mua-attachment-regexp
"\\b\\(attache\?ment\\|attached\\|attach\\|pi[èe]ce\s+jointe?\\)\\b"
"Message body text indicating that an attachment is expected.
This is not used unless `notmuch-mua-attachment-check' is added
emacs: Add missing type and group to defcustom variable Added the type 'regexp and group 'notmuch-send as properties to the customizable variable notmuch-mua-attachment-regexp.
2019-04-15 15:35:19 +02:00
to `notmuch-mua-send-hook'."
:type 'regexp
:group 'notmuch-send)
emacs: Optionally check for missing attachments in outgoing messages Query the user if the message text indicates that an attachment is expected but no MML referencing an attachment is found. This is not enabled by default - see the documentation for `notmuch-mua-attachment-check'.
2018-09-08 23:40:40 +02: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
;;; Various functions
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
emacs: Optionally check for missing attachments in outgoing messages Query the user if the message text indicates that an attachment is expected but no MML referencing an attachment is found. This is not enabled by default - see the documentation for `notmuch-mua-attachment-check'.
2018-09-08 23:40:40 +02:00
(defun notmuch-mua-attachment-check ()
"Signal an error if the message text indicates that an
attachment is expected but no MML referencing an attachment is
found.
Typically this is added to `notmuch-mua-send-hook'."
(when (and
;; When the message mentions attachment...
(save-excursion
(message-goto-body)
emacs: limit search for attachment to stop at first mime-part This commit changes the behaviour of notmuch-mua-attachment-check so that it stops searching for notmuch-mua-attachment-regexp when a new mime-part is reached. This avoids false warnings when matching words occur inside forwarded messages.
2019-12-13 00:35:35 +01:00
;; Limit search from reaching other possible parts of the message
(let ((search-limit (search-forward "\n<#" nil t)))
(message-goto-body)
emacs: Use `cl-lib' instead of deprecated `cl' Starting with Emacs 27 the old `cl' implementation is finally considered obsolete. Previously its use was strongly discouraged at run-time but one was still allowed to use it at compile-time. For the most part the transition is very simple and boils down to adding the "cl-" prefix to some symbols. A few replacements do not follow that simple pattern; e.g. `first' is replaced with `car', even though the alias `cl-first' exists, because the latter is not idiomatic emacs-lisp. In a few cases we start using `pcase-let' or `pcase-lambda' instead of renaming e.g. `first' to `car'. That way we can remind the reader of the meaning of the various parts of the data that is being deconstructed. An obsolete `lexical-let' and a `lexical-let*' are replaced with their regular variants `let' and `let*' even though we do not at the same time enable `lexical-binding' for that file. That is the right thing to do because it does not actually make a difference in those cases whether lexical bindings are used or not, and because this should be enabled in a separate commit. We need to explicitly depend on the `cl-lib' package because Emacs 24.1 and 24.2 lack that library. When using these releases we end up using the backport from GNU Elpa. We need to explicitly require the `pcase' library because `pcase-dolist' was not autoloaded until Emacs 25.1.
2020-04-25 22:18:07 +02:00
(cl-loop while (re-search-forward notmuch-mua-attachment-regexp
search-limit t)
;; For every instance of the "attachment" string
;; found, examine the text properties. If the text
;; has either a `face' or `syntax-table' property
;; then it is quoted text and should *not* cause the
;; user to be asked about a missing attachment.
if (let ((props (text-properties-at (match-beginning 0))))
(not (or (memq 'syntax-table props)
(memq 'face props))))
return t
finally return nil)))
emacs: Optionally check for missing attachments in outgoing messages Query the user if the message text indicates that an attachment is expected but no MML referencing an attachment is found. This is not enabled by default - see the documentation for `notmuch-mua-attachment-check'.
2018-09-08 23:40:40 +02:00
;; ...but doesn't have a part with a filename...
(save-excursion
(message-goto-body)
(not (re-search-forward "^<#part [^>]*filename=" nil t)))
;; ...and that's not okay...
(not (y-or-n-p "Attachment mentioned, but no attachment - is that okay?")))
;; ...signal an error.
(error "Missing attachment")))
emacs: Let the user choose where to compose new mails Introduce a new defcustom notmuch-mua-compose-in that allows users to specify where new mails are composed, either in the current window or in a new window or frame. Signed-off-by: Jameson Rollins <jrollins@finestructure.net>
2012-05-04 12:37:56 +02:00
(defun notmuch-mua-get-switch-function ()
"Get a switch function according to `notmuch-mua-compose-in'."
(cond ((eq notmuch-mua-compose-in 'current-window)
'switch-to-buffer)
((eq notmuch-mua-compose-in 'new-window)
'switch-to-buffer-other-window)
((eq notmuch-mua-compose-in 'new-frame)
'switch-to-buffer-other-frame)
(t (error "Invalid value for `notmuch-mua-compose-in'"))))
(defun notmuch-mua-maybe-set-window-dedicated ()
emacs: place complete first sentence on first doc-string line
2020-11-16 22:28:29 +01:00
"Set the selected window as dedicated according to `notmuch-mua-compose-in'."
emacs: Let the user choose where to compose new mails Introduce a new defcustom notmuch-mua-compose-in that allows users to specify where new mails are composed, either in the current window or in a new window or frame. Signed-off-by: Jameson Rollins <jrollins@finestructure.net>
2012-05-04 12:37:56 +02:00
(when (or (eq notmuch-mua-compose-in 'new-frame)
(eq notmuch-mua-compose-in 'new-window))
(set-window-dedicated-p (selected-window) t)))
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
(defun notmuch-mua-user-agent-full ()
"Generate a `User-Agent:' string suitable for notmuch."
(concat (notmuch-mua-user-agent-notmuch)
" "
(notmuch-mua-user-agent-emacs)))
(defun notmuch-mua-user-agent-notmuch ()
"Generate a `User-Agent:' string suitable for notmuch."
emacs: prefer notmuch-emacs-version in User-Agent: header Now that we have `notmuch-emacs-version' defined in notmuch emacs MUA use that as a part of User-Agent: header to provide more accurate version information when sending emails. In case some incomplete installation of notmuch emacs MUA is used and `notmuch-emacs-version' is defined as "unknown" then fall back to ask version info from cli (as it used to be before this commit). Requiring notmuch-version[.elc] and if that is missing setting "fallback" notmuch-emacs-version (to "unknown") was moved from notmuch.el to notmuch-lib.el as notmuch-mua.el (which provides User-Agent: information) require's the latter.
2015-08-02 16:48:14 +02:00
(let ((notmuch-version (if (string= notmuch-emacs-version "unknown")
(notmuch-cli-version)
notmuch-emacs-version)))
Use https instead of http where possible Many of the external links found in the notmuch source can be resolved using https instead of http. This changeset addresses as many as i could find, without touching the e-mail corpus or expected outputs found in tests.
2016-06-02 18:26:14 +02:00
(concat "Notmuch/" notmuch-version " (https://notmuchmail.org)")))
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
(defun notmuch-mua-user-agent-emacs ()
"Generate a `User-Agent:' string suitable for notmuch."
(concat "Emacs/" emacs-version " (" system-configuration ")"))
emacs: Hide the "User-Agent:" when composing messages Add a list of headers to those hidden by `message-mode' when composing. By default the list includes only "User-Agent:".
2010-04-26 13:50:59 +02:00
(defun notmuch-mua-add-more-hidden-headers ()
"Add some headers to the list that are hidden by default."
(mapc (lambda (header)
emacs: Use 'unless' instead of 'when' and 'not' Also use 'unless' in a few cases where previously 'if' was used with 'not' but without an ELSE part.
2020-08-08 13:49:42 +02:00
(unless (member header message-hidden-headers)
emacs: Hide the "User-Agent:" when composing messages Add a list of headers to those hidden by `message-mode' when composing. By default the list includes only "User-Agent:".
2010-04-26 13:50:59 +02:00
(push header message-hidden-headers)))
notmuch-mua-hidden-headers))
emacs: sign/encrypt replies to signed/encrypted messages This is a simple approach to improving security when replying to signed or encrypted messages. If the message being replied to was signed, add mml tag to sign the reply. If the message being replied to was encrypted, add mml tag to sign and encrypt the reply. This may need configuration; I for one might want to encrypt replies to encrypted messages, but not always sign replies to signed messages. This still includes a slight bug: if any mml tags are added, they are included in the region containing the quoted parts. Killing the region will kill the mml tags too.
2014-04-05 11:18:06 +02:00
(defun notmuch-mua-reply-crypto (parts)
emacs: remove auto-signing of replies to signed messages It was decided that auto-signing is potentially too troublesome for the apparently common case of users who enable crypto processing for the purpose of checking signature validity but who are not in a position to sign out-going messages. Users can still manually invoke signing as needed. Encrypting replies to encrypted messages is more of a security issue so we leave it in place.
2014-04-14 21:40:50 +02:00
"Add mml sign-encrypt flag if any part of original message is encrypted."
emacs: Use `cl-lib' instead of deprecated `cl' Starting with Emacs 27 the old `cl' implementation is finally considered obsolete. Previously its use was strongly discouraged at run-time but one was still allowed to use it at compile-time. For the most part the transition is very simple and boils down to adding the "cl-" prefix to some symbols. A few replacements do not follow that simple pattern; e.g. `first' is replaced with `car', even though the alias `cl-first' exists, because the latter is not idiomatic emacs-lisp. In a few cases we start using `pcase-let' or `pcase-lambda' instead of renaming e.g. `first' to `car'. That way we can remind the reader of the meaning of the various parts of the data that is being deconstructed. An obsolete `lexical-let' and a `lexical-let*' are replaced with their regular variants `let' and `let*' even though we do not at the same time enable `lexical-binding' for that file. That is the right thing to do because it does not actually make a difference in those cases whether lexical bindings are used or not, and because this should be enabled in a separate commit. We need to explicitly depend on the `cl-lib' package because Emacs 24.1 and 24.2 lack that library. When using these releases we end up using the backport from GNU Elpa. We need to explicitly require the `pcase' library because `pcase-dolist' was not autoloaded until Emacs 25.1.
2020-04-25 22:18:07 +02:00
(cl-loop for part in parts
emacs: Shorten long lines
2020-08-08 13:49:36 +02:00
if (notmuch-match-content-type (plist-get part :content-type)
"multipart/encrypted")
do (mml-secure-message-sign-encrypt)
else if (notmuch-match-content-type (plist-get part :content-type)
"multipart/*")
do (notmuch-mua-reply-crypto (plist-get part :content))))
emacs: sign/encrypt replies to signed/encrypted messages This is a simple approach to improving security when replying to signed or encrypted messages. If the message being replied to was signed, add mml tag to sign the reply. If the message being replied to was encrypted, add mml tag to sign and encrypt the reply. This may need configuration; I for one might want to encrypt replies to encrypted messages, but not always sign replies to signed messages. This still includes a slight bug: if any mml tags are added, they are included in the region containing the quoted parts. Killing the region will kill the mml tags too.
2014-04-05 11:18:06 +02:00
emacs: more cleanup since dropping support for Emacs 24 Notmuch requires at least version 25 of Emacs now. Adjust comments that previously referenced version 24 specifically, even though they also apply to later releases. Remove documentation and code that no longer applies. - `mm-shr' no longer references `gnus-inhibit-images'.
2020-11-16 22:28:24 +01:00
;; There is a bug in Emacs' message.el that results in a newline
emacs: Fix the References header in reply In the new reply code, the References header gets inserted by message.el using a function called message-shorten-references. Unlike all the other header-inserting functions, it doesn't put a newline after the header, causing the next header to end up on the same line. In our case, this header happened to be User-Agent, so it's hard to notice. This is probably a bug in message.el, but we need to work around it. This fixes the problem by wrapping message-shorten-references in a function that inserts a newline after if necessary. This should protect against the message.el bug being fixed in the future.
2012-04-01 17:24:23 +02:00
;; not being inserted after the References header, so the next header
;; is concatenated to the end of it. This function fixes the problem,
;; while guarding against the possibility that some current or future
;; version of emacs has the bug fixed.
(defun notmuch-mua-insert-references (original-func header references)
(funcall original-func header references)
(unless (bolp) (insert "\n")))
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
;;; Mua reply
emacs: add support for replying just to the sender Provide reply to sender counterparts to the search and show reply functions. Add key binding 'R' to reply to sender, while keeping 'r' as reply to all, both in search and show views. Signed-off-by: Jani Nikula <jani@nikula.org>
2012-01-14 15:46:17 +01:00
(defun notmuch-mua-reply (query-string &optional sender reply-all)
emacs: convert remaining format-versions from 3 to 4 This is needed for consistent beheviour between notmuch built against gmime-2.6 and gmime-3.0 w.r.t. error reporting.
2017-07-17 17:06:11 +02:00
(let ((args '("reply" "--format=sexp" "--format-version=4"))
emacs: sign/encrypt replies to signed/encrypted messages This is a simple approach to improving security when replying to signed or encrypted messages. If the message being replied to was signed, add mml tag to sign the reply. If the message being replied to was encrypted, add mml tag to sign and encrypt the reply. This may need configuration; I for one might want to encrypt replies to encrypted messages, but not always sign replies to signed messages. This still includes a slight bug: if any mml tags are added, they are included in the region containing the quoted parts. Killing the region will kill the mml tags too.
2014-04-05 11:18:06 +02:00
(process-crypto notmuch-show-process-crypto)
emacs: Use the new JSON reply format and message-cite-original Use the new JSON reply format to create replies in emacs. Quote HTML parts nicely by using mm-display-part to turn them into displayable text, then quoting them with message-cite-original. This is very useful for users who regularly receive HTML-only email. Use message-mode's message-cite-original function to create the quoted body for reply messages. In order to make this act like the existing notmuch defaults, you will need to set the following in your emacs configuration: message-citation-line-format "On %a, %d %b %Y, %f wrote:" message-citation-line-function 'message-insert-formatted-citation-line The tests have been updated to reflect the (ugly) emacs default.
2012-03-18 17:32:42 +01:00
reply
original)
emacs: sign/encrypt replies to signed/encrypted messages This is a simple approach to improving security when replying to signed or encrypted messages. If the message being replied to was signed, add mml tag to sign the reply. If the message being replied to was encrypted, add mml tag to sign and encrypt the reply. This may need configuration; I for one might want to encrypt replies to encrypted messages, but not always sign replies to signed messages. This still includes a slight bug: if any mml tags are added, they are included in the region containing the quoted parts. Killing the region will kill the mml tags too.
2014-04-05 11:18:06 +02:00
(when process-crypto
cli/reply: make --decrypt take a keyword This brings the --decrypt argument to "notmuch reply" into line with the other --decrypt arguments (in "show", "new", "insert", and "reindex"). This patch is really just about bringing consistency to the user interface. We also use the recommended form in the emacs MUA when replying, and update test T350 to match.
2017-12-19 17:40:55 +01:00
(setq args (append args '("--decrypt=true"))))
emacs: add support for replying just to the sender Provide reply to sender counterparts to the search and show reply functions. Add key binding 'R' to reply to sender, while keeping 'r' as reply to all, both in search and show views. Signed-off-by: Jani Nikula <jani@nikula.org>
2012-01-14 15:46:17 +01:00
(if reply-all
(setq args (append args '("--reply-to=all")))
(setq args (append args '("--reply-to=sender"))))
emacs: Add support for PGP/MIME verification/decryption A new emacs configuration variable "notmuch-crypto-process-mime" controls the processing of PGP/MIME signatures and encrypted parts. When this is set true, notmuch-query will use the notmuch show --decrypt flag to decrypt encrypted messages and/or calculate the sigstatus of signed messages. If sigstatus is available, notmuch-show will place a specially color-coded header at the begining of the signed message. Also included is the ability to switch decryption/verification on/off on the fly, which is bound to M-RET in notmuch-search-mode.
2011-05-26 03:01:19 +02:00
(setq args (append args (list query-string)))
emacs: dropped rest of now-unused JSON functionality Notmuch cli provides all structured data previously provided in json format now in s-expression format, rendering all current json functionality obsolete.
2013-07-06 14:49:51 +02:00
;; Get the reply object as SEXP, and parse it into an elisp object.
emacs: Use S-exp format everywhere This switches `notmuch-mua-reply' and `notmuch-query-get-threads' to the S-exp format. These were the last two uses of the JSON format in the Emacs frontend.
2013-06-24 01:43:18 +02:00
(setq reply (apply #'notmuch-call-notmuch-sexp args))
emacs: Use the new JSON reply format and message-cite-original Use the new JSON reply format to create replies in emacs. Quote HTML parts nicely by using mm-display-part to turn them into displayable text, then quoting them with message-cite-original. This is very useful for users who regularly receive HTML-only email. Use message-mode's message-cite-original function to create the quoted body for reply messages. In order to make this act like the existing notmuch defaults, you will need to set the following in your emacs configuration: message-citation-line-format "On %a, %d %b %Y, %f wrote:" message-citation-line-function 'message-insert-formatted-citation-line The tests have been updated to reflect the (ugly) emacs default.
2012-03-18 17:32:42 +01:00
;; Extract the original message to simplify the following code.
(setq original (plist-get reply :original))
;; Extract the headers of both the reply and the original message.
(let* ((original-headers (plist-get original :headers))
(reply-headers (plist-get reply :reply-headers)))
;; If sender is non-nil, set the From: header to its value.
(when sender
(plist-put reply-headers :From sender))
(let
;; Overlay the composition window on that being used to read
;; the original message.
((same-window-regexps '("\\*mail .*")))
emacs: Shorten long lines
2020-08-08 13:49:36 +02:00
;; We modify message-header-format-alist to get around
;; a bug in message.el. See the comment above on
;; notmuch-mua-insert-references.
emacs: Fix the References header in reply In the new reply code, the References header gets inserted by message.el using a function called message-shorten-references. Unlike all the other header-inserting functions, it doesn't put a newline after the header, causing the next header to end up on the same line. In our case, this header happened to be User-Agent, so it's hard to notice. This is probably a bug in message.el, but we need to work around it. This fixes the problem by wrapping message-shorten-references in a function that inserts a newline after if necessary. This should protect against the message.el bug being fixed in the future.
2012-04-01 17:24:23 +02:00
(let ((message-header-format-alist
emacs: Use `cl-lib' instead of deprecated `cl' Starting with Emacs 27 the old `cl' implementation is finally considered obsolete. Previously its use was strongly discouraged at run-time but one was still allowed to use it at compile-time. For the most part the transition is very simple and boils down to adding the "cl-" prefix to some symbols. A few replacements do not follow that simple pattern; e.g. `first' is replaced with `car', even though the alias `cl-first' exists, because the latter is not idiomatic emacs-lisp. In a few cases we start using `pcase-let' or `pcase-lambda' instead of renaming e.g. `first' to `car'. That way we can remind the reader of the meaning of the various parts of the data that is being deconstructed. An obsolete `lexical-let' and a `lexical-let*' are replaced with their regular variants `let' and `let*' even though we do not at the same time enable `lexical-binding' for that file. That is the right thing to do because it does not actually make a difference in those cases whether lexical bindings are used or not, and because this should be enabled in a separate commit. We need to explicitly depend on the `cl-lib' package because Emacs 24.1 and 24.2 lack that library. When using these releases we end up using the backport from GNU Elpa. We need to explicitly require the `pcase' library because `pcase-dolist' was not autoloaded until Emacs 25.1.
2020-04-25 22:18:07 +02:00
(cl-loop for pair in message-header-format-alist
if (eq (car pair) 'References)
collect (cons 'References
(apply-partially
'notmuch-mua-insert-references
(cdr pair)))
else
collect pair)))
emacs: Fix the References header in reply In the new reply code, the References header gets inserted by message.el using a function called message-shorten-references. Unlike all the other header-inserting functions, it doesn't put a newline after the header, causing the next header to end up on the same line. In our case, this header happened to be User-Agent, so it's hard to notice. This is probably a bug in message.el, but we need to work around it. This fixes the problem by wrapping message-shorten-references in a function that inserts a newline after if necessary. This should protect against the message.el bug being fixed in the future.
2012-04-01 17:24:23 +02:00
(notmuch-mua-mail (plist-get reply-headers :To)
emacs: sanitize subject in replies Commit a7964c86d125 ("emacs: Sanitize authors and subjects in search and show") added sanitization of header information for display. Do the same for reply subjects. This fixes the long-standing annoying artefact of certain versions of mailman using tab as folding whitespace, leading to tabs in reply subjects.
2017-09-26 20:26:08 +02:00
(notmuch-sanitize (plist-get reply-headers :Subject))
emacs: Let the user choose where to compose new mails Introduce a new defcustom notmuch-mua-compose-in that allows users to specify where new mails are composed, either in the current window or in a new window or frame. Signed-off-by: Jameson Rollins <jrollins@finestructure.net>
2012-05-04 12:37:56 +02:00
(notmuch-headers-plist-to-alist reply-headers)
nil (notmuch-mua-get-switch-function))))
emacs: Shorten long lines
2020-08-08 13:49:36 +02:00
;; Create a buffer-local queue for tag changes triggered when
;; sending the reply.
emacs: Use a buffer-local variable to update tags when sending replies Instead of relying on the "In-Reply-To" header, use a buffer-local variable, notmuch-message-queued-tag-changes, to add and remove tags to affected messages when the message-send-hook is triggered.
2019-04-12 14:01:11 +02:00
(when notmuch-message-replied-tags
(setq-local notmuch-message-queued-tag-changes
(list (cons query-string notmuch-message-replied-tags))))
emacs: Use the new JSON reply format and message-cite-original Use the new JSON reply format to create replies in emacs. Quote HTML parts nicely by using mm-display-part to turn them into displayable text, then quoting them with message-cite-original. This is very useful for users who regularly receive HTML-only email. Use message-mode's message-cite-original function to create the quoted body for reply messages. In order to make this act like the existing notmuch defaults, you will need to set the following in your emacs configuration: message-citation-line-format "On %a, %d %b %Y, %f wrote:" message-citation-line-function 'message-insert-formatted-citation-line The tests have been updated to reflect the (ugly) emacs default.
2012-03-18 17:32:42 +01:00
;; Insert the message body - but put it in front of the signature
emacs: fix notmuch-mua-reply point placement when signature involved When composing a reply, notmuch-mua-reply attempts to cite the the original message by inserting it before the user signature, if one is present. The existing method used to search the signature separator backward from the end of the buffer and then move one line up. In case of variable `message-signature-insert-empty-line' being nil this caused point to go to the beginning of '--text follows this line--' separator line, and citation was inserted there. This change checks the value of `message-signature-insert-empty-line' and doesn't move point if that is nil. Additional narrowing to the body region ensures that point never goes to the separator line (or beyond). `message-signature-setup-hook' or `message-setup-hook' may already have added some other content to the message body, therefore using simply (message-goto-body) to move point to the beginning of body might lead to unexpected results. Original patch from "Geoffrey H. Ferrari", continued with iterations from Jani and Mark.
2013-09-06 16:32:18 +02:00
;; if one is present, and after any other content
;; message*setup-hooks may have added to the message body already.
(save-restriction
(message-goto-body)
(narrow-to-region (point) (point-max))
(goto-char (point-max))
(if (re-search-backward message-signature-separator nil t)
emacs: Use 'when' instead of 'if' when there is no ELSE part
2020-08-08 13:49:43 +02:00
(when message-signature-insert-empty-line
(forward-line -1))
emacs: fix notmuch-mua-reply point placement when signature involved When composing a reply, notmuch-mua-reply attempts to cite the the original message by inserting it before the user signature, if one is present. The existing method used to search the signature separator backward from the end of the buffer and then move one line up. In case of variable `message-signature-insert-empty-line' being nil this caused point to go to the beginning of '--text follows this line--' separator line, and citation was inserted there. This change checks the value of `message-signature-insert-empty-line' and doesn't move point if that is nil. Additional narrowing to the body region ensures that point never goes to the separator line (or beyond). `message-signature-setup-hook' or `message-setup-hook' may already have added some other content to the message body, therefore using simply (message-goto-body) to move point to the beginning of body might lead to unexpected results. Original patch from "Geoffrey H. Ferrari", continued with iterations from Jani and Mark.
2013-09-06 16:32:18 +02:00
(goto-char (point-max))))
emacs: Use the new JSON reply format and message-cite-original Use the new JSON reply format to create replies in emacs. Quote HTML parts nicely by using mm-display-part to turn them into displayable text, then quoting them with message-cite-original. This is very useful for users who regularly receive HTML-only email. Use message-mode's message-cite-original function to create the quoted body for reply messages. In order to make this act like the existing notmuch defaults, you will need to set the following in your emacs configuration: message-citation-line-format "On %a, %d %b %Y, %f wrote:" message-citation-line-function 'message-insert-formatted-citation-line The tests have been updated to reflect the (ugly) emacs default.
2012-03-18 17:32:42 +01:00
(let ((from (plist-get original-headers :From))
(date (plist-get original-headers :Date))
(start (point)))
emacs: make citation function customizable. Make a new customizable variable instead of relying on message-cite-function because the default for the latter changed between emacs releases. The defcustom is borrowed from the message.el source, with minor modifications.
2015-01-14 20:57:49 +01:00
;; notmuch-mua-cite-function constructs a citation line based
;; on the From and Date headers of the original message, which
;; are assumed to be in the buffer.
emacs: Use the new JSON reply format and message-cite-original Use the new JSON reply format to create replies in emacs. Quote HTML parts nicely by using mm-display-part to turn them into displayable text, then quoting them with message-cite-original. This is very useful for users who regularly receive HTML-only email. Use message-mode's message-cite-original function to create the quoted body for reply messages. In order to make this act like the existing notmuch defaults, you will need to set the following in your emacs configuration: message-citation-line-format "On %a, %d %b %Y, %f wrote:" message-citation-line-function 'message-insert-formatted-citation-line The tests have been updated to reflect the (ugly) emacs default.
2012-03-18 17:32:42 +01:00
(insert "From: " from "\n")
(insert "Date: " date "\n\n")
emacs: Shorten long lines
2020-08-08 13:49:36 +02:00
(insert
(with-temp-buffer
(let
;; Don't attempt to clean up messages, excerpt
;; citations, etc. in the original message before
;; quoting.
((notmuch-show-insert-text/plain-hook nil)
;; Don't omit long parts.
(notmuch-show-max-text-part-size 0)
;; Insert headers for parts as appropriate for replying.
(notmuch-show-insert-header-p-function
notmuch-mua-reply-insert-header-p-function)
;; Ensure that any encrypted parts are
;; decrypted during the generation of the reply
;; text.
(notmuch-show-process-crypto process-crypto)
;; Don't indent multipart sub-parts.
(notmuch-show-indent-multipart nil))
;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
(cl-letf (((symbol-function 'notmuch-crypto-insert-sigstatus-button) #'ignore)
((symbol-function 'notmuch-crypto-insert-encstatus-button) #'ignore))
(notmuch-show-insert-body original (plist-get original :body) 0)
(buffer-substring-no-properties (point-min) (point-max))))))
emacs: Use the new JSON reply format and message-cite-original Use the new JSON reply format to create replies in emacs. Quote HTML parts nicely by using mm-display-part to turn them into displayable text, then quoting them with message-cite-original. This is very useful for users who regularly receive HTML-only email. Use message-mode's message-cite-original function to create the quoted body for reply messages. In order to make this act like the existing notmuch defaults, you will need to set the following in your emacs configuration: message-citation-line-format "On %a, %d %b %Y, %f wrote:" message-citation-line-function 'message-insert-formatted-citation-line The tests have been updated to reflect the (ugly) emacs default.
2012-03-18 17:32:42 +01:00
(set-mark (point))
(goto-char start)
;; Quote the original message according to the user's configured style.
emacs: make citation function customizable. Make a new customizable variable instead of relying on message-cite-function because the default for the latter changed between emacs releases. The defcustom is borrowed from the message.el source, with minor modifications.
2015-01-14 20:57:49 +01:00
(funcall notmuch-mua-cite-function)))
emacs: remove auto-signing of replies to signed messages It was decided that auto-signing is potentially too troublesome for the apparently common case of users who enable crypto processing for the purpose of checking signature validity but who are not in a position to sign out-going messages. Users can still manually invoke signing as needed. Encrypting replies to encrypted messages is more of a security issue so we leave it in place.
2014-04-14 21:40:50 +02:00
;; Crypto processing based crypto content of the original message
emacs: sign/encrypt replies to signed/encrypted messages This is a simple approach to improving security when replying to signed or encrypted messages. If the message being replied to was signed, add mml tag to sign the reply. If the message being replied to was encrypted, add mml tag to sign and encrypt the reply. This may need configuration; I for one might want to encrypt replies to encrypted messages, but not always sign replies to signed messages. This still includes a slight bug: if any mml tags are added, they are included in the region containing the quoted parts. Killing the region will kill the mml tags too.
2014-04-05 11:18:06 +02:00
(when process-crypto
(notmuch-mua-reply-crypto (plist-get original :body))))
emacs: push mark before signature on reply We push mark on reply so user can cut the quote. Push the mark before signature, if any, instead of end of buffer so the signature is preserved. This is consistent with message-kill-to-signature.
2014-03-28 19:04:25 +01:00
;; Push mark right before signature, if any.
(message-goto-signature)
(unless (eobp)
(end-of-line -1))
emacs: Use the new JSON reply format and message-cite-original Use the new JSON reply format to create replies in emacs. Quote HTML parts nicely by using mm-display-part to turn them into displayable text, then quoting them with message-cite-original. This is very useful for users who regularly receive HTML-only email. Use message-mode's message-cite-original function to create the quoted body for reply messages. In order to make this act like the existing notmuch defaults, you will need to set the following in your emacs configuration: message-citation-line-format "On %a, %d %b %Y, %f wrote:" message-citation-line-function 'message-insert-formatted-citation-line The tests have been updated to reflect the (ugly) emacs default.
2012-03-18 17:32:42 +01:00
(push-mark)
(message-goto-body)
(set-buffer-modified-p nil))
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02: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
;;; Mode and keymap
emacs: define notmuch-message-mode-map explicitly Key bindings should not be defined at the top-level but inside a `defvar' form. Doing it at the top-level makes it harder to reliably customize key bindings.
2020-11-08 20:02:46 +01:00
(defvar notmuch-message-mode-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "C-c C-c") #'notmuch-mua-send-and-exit)
(define-key map (kbd "C-c C-s") #'notmuch-mua-send)
(define-key map (kbd "C-c C-p") #'notmuch-draft-postpone)
(define-key map (kbd "C-x C-s") #'notmuch-draft-save)
map)
"Keymap for `notmuch-message-mode'.")
emacs: make modifications to message Fcc vars buffer-local Previously we globally modified these variables, which tended to cause problems for people using message-mode, but not notmuch-mua-mail, to send mail. User visible changes: - Calling notmuch-fcc-header-setup is no longer optional. OTOH, it seems to do the right thing if notmuch-fcc-dirs is set to nil. - The Fcc header is visible during message composition - The name in the mode line is changed, and no longer matches exactly the menu label. - Previously notmuch-mua-send-and-exit was never called. Either we misunderstood define-mail-user-agent, or it had a bug. So there was no difference if the user called message-send-and-exit directly. Now there will be. - User bindings to C-c C-c and C-c C-s in message-mode-map are overridden. The user can override them in notmuch-message-mode-map, but then they're on their own for Fcc handling.
2015-08-01 11:44:56 +02:00
(define-derived-mode notmuch-message-mode message-mode "Message[Notmuch]"
emacs docstrings: consistent indentation, newlines, periods Fixed emacs docstrings to be consistent. No functional change. - removed some (accidental) indentation - removed some trailing newlines - added trailing periods where missing (some exclusions)
2020-05-24 21:17:56 +02:00
"Notmuch message composition mode. Mostly like `message-mode'."
emacs: address completion, allow sender/recipient and filters This commit lets the user customize the address completion. It makes two changes. The first change controls whether to build the address completion list based on messages you have sent or you have received (the latter is much faster). The second change add a possible filter query to limit the messages used -- for example, setting this to date:1y.. would limit the address completions to addresses used in the last year. This speeds up the address harvest and may also make the search less cluttered as old addresses may well no longer be valid.
2016-05-20 22:13:02 +02:00
(notmuch-address-setup))
emacs: define a notmuch-compose-mode based on message mode. This is to provide a clean way of overriding e.g. keybindings when sending mail from notmuch. This is needed in particular to allow somewhere to dynamically bind certain message-mode variables which are not respected when buffer-local. See e.g. http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21174
2015-08-01 11:44:55 +02:00
emacs: Make notmuch-message-mode play nicely with flyspell Flyspell mode uses a special setting for message-mode to not spell-check message headers except Subject. Apply this setting also to notmuch-message-mode.
2015-11-03 22:02:12 +01:00
(put 'notmuch-message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
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
;;; New messages
emacs: Handle switch-function argument of notmuch-mua-mail notmuch-mua-mail ignored the switch-function argument and always used the function returned by notmuch-mua-get-switch-function instead. In order to support standard emacs interfaces (compose-mail in this case), this commit changes notmuch-mua-mail to use the switch-function argument if it is non-nil and notmuch-mua-get-switch-function otherwise.
2016-01-02 17:47:45 +01:00
(defun notmuch-mua-pop-to-buffer (name switch-function)
emacs: place complete first sentence on first doc-string line
2020-11-16 22:28:29 +01:00
"Pop to buffer NAME, and warn if it already exists and is modified.
Like `message-pop-to-buffer' but enable `notmuch-message-mode'
instead of `message-mode' and SWITCH-FUNCTION is mandatory."
emacs: Improve notmuch-message-mode initialization Recent addition of notmuch-message-mode introduced several problems: 1. When message-setup-hook is used to set buffer local variables, these settings are not effective, because all buffer local variables are immediately erased by notmuch-message-mode initialization. 2. message-mode-hook gets invoked twice - first when message-mail invokes message-mode and second when notmuch-mua-mail invokes notmuch-message-mode. This commit fixes these problems by replacing a call to message-mail with notmuch-specific code that is (hopefully) equivalent to message-mail functionality before introduction of notmuch-message-mode. We first initialize notmuch-message-mode with notmuch-mua-pop-to-buffer, which is a modified version of message-pop-to-buffer and then call message-setup-1, which is the only functionality of message-mail that is needed for notmuch.
2015-12-21 10:41:15 +01:00
(let ((buffer (get-buffer name)))
(if (and buffer
(buffer-name buffer))
(let ((window (get-buffer-window buffer 0)))
(if window
;; Raise the frame already displaying the message buffer.
(progn
emacs: Update integration with third party packages. `mm-inline-text-html-with-images' was removed from mm-decode.el in 2016 and replaced with `mm-html-inhibit-images'. `gnus-select-frame-set-input-focus' was removed from gnus-util.el in 2016 and existed only for XEmacs compatibility.
2018-10-04 11:45:45 +02:00
(select-frame-set-input-focus (window-frame window))
emacs: Improve notmuch-message-mode initialization Recent addition of notmuch-message-mode introduced several problems: 1. When message-setup-hook is used to set buffer local variables, these settings are not effective, because all buffer local variables are immediately erased by notmuch-message-mode initialization. 2. message-mode-hook gets invoked twice - first when message-mail invokes message-mode and second when notmuch-mua-mail invokes notmuch-message-mode. This commit fixes these problems by replacing a call to message-mail with notmuch-specific code that is (hopefully) equivalent to message-mail functionality before introduction of notmuch-message-mode. We first initialize notmuch-message-mode with notmuch-mua-pop-to-buffer, which is a modified version of message-pop-to-buffer and then call message-setup-1, which is the only functionality of message-mail that is needed for notmuch.
2015-12-21 10:41:15 +01:00
(select-window window))
emacs: Handle switch-function argument of notmuch-mua-mail notmuch-mua-mail ignored the switch-function argument and always used the function returned by notmuch-mua-get-switch-function instead. In order to support standard emacs interfaces (compose-mail in this case), this commit changes notmuch-mua-mail to use the switch-function argument if it is non-nil and notmuch-mua-get-switch-function otherwise.
2016-01-02 17:47:45 +01:00
(funcall switch-function buffer)
emacs: Improve notmuch-message-mode initialization Recent addition of notmuch-message-mode introduced several problems: 1. When message-setup-hook is used to set buffer local variables, these settings are not effective, because all buffer local variables are immediately erased by notmuch-message-mode initialization. 2. message-mode-hook gets invoked twice - first when message-mail invokes message-mode and second when notmuch-mua-mail invokes notmuch-message-mode. This commit fixes these problems by replacing a call to message-mail with notmuch-specific code that is (hopefully) equivalent to message-mail functionality before introduction of notmuch-message-mode. We first initialize notmuch-message-mode with notmuch-mua-pop-to-buffer, which is a modified version of message-pop-to-buffer and then call message-setup-1, which is the only functionality of message-mail that is needed for notmuch.
2015-12-21 10:41:15 +01:00
(set-buffer buffer))
(when (and (buffer-modified-p)
(not (prog1
(y-or-n-p
"Message already being composed; erase? ")
(message nil))))
(error "Message being composed")))
emacs: Handle switch-function argument of notmuch-mua-mail notmuch-mua-mail ignored the switch-function argument and always used the function returned by notmuch-mua-get-switch-function instead. In order to support standard emacs interfaces (compose-mail in this case), this commit changes notmuch-mua-mail to use the switch-function argument if it is non-nil and notmuch-mua-get-switch-function otherwise.
2016-01-02 17:47:45 +01:00
(funcall switch-function name)
emacs: Improve notmuch-message-mode initialization Recent addition of notmuch-message-mode introduced several problems: 1. When message-setup-hook is used to set buffer local variables, these settings are not effective, because all buffer local variables are immediately erased by notmuch-message-mode initialization. 2. message-mode-hook gets invoked twice - first when message-mail invokes message-mode and second when notmuch-mua-mail invokes notmuch-message-mode. This commit fixes these problems by replacing a call to message-mail with notmuch-specific code that is (hopefully) equivalent to message-mail functionality before introduction of notmuch-message-mode. We first initialize notmuch-message-mode with notmuch-mua-pop-to-buffer, which is a modified version of message-pop-to-buffer and then call message-setup-1, which is the only functionality of message-mail that is needed for notmuch.
2015-12-21 10:41:15 +01:00
(set-buffer name))
(erase-buffer)
(notmuch-message-mode)))
(defun notmuch-mua-mail (&optional to subject other-headers continue
switch-function yank-action send-actions
return-action &rest ignored)
"Invoke the notmuch mail composition window."
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
(interactive)
(when notmuch-mua-user-agent-function
(let ((user-agent (funcall notmuch-mua-user-agent-function)))
emacs: Use 'unless' instead of 'when' and 'not' Also use 'unless' in a few cases where previously 'if' was used with 'not' but without an ELSE part.
2020-08-08 13:49:42 +02:00
(unless (string= "" user-agent)
emacs: Fix two bugs in reply Bug 1: Replying from alternate addresses ---------------------------------------- The reply code was inconsistent in its use of symbols and strings for header names being passed to message.el functions. This caused the From header to be lookup up incorrectly, causing an additional From header to be added with the user's primary address instead of the correct alternate address. This is fixed by using symbols everywhere, i.e. never using strings for header names when interacting with message.el. This change also removes our use of `mail-header`, since we don't use it anywhere else, and using assq makes it clear how the header lists are expected to work. Bug 2: Duplicate headers in emacs 23.2 -------------------------------------- The message.el code in emacs 23.2 assumes that header names will always be passed as symbols, so our use of strings caused problems. The symptom was that on 23.2 (and presumably on earlier versions) the reply message would end up with two of some headers. Converting everything to symbols also fixes this issue.
2012-04-01 17:24:21 +02:00
(push (cons 'User-Agent user-agent) other-headers))))
(unless (assq 'From other-headers)
emacs: make use of `message-make-from' Please put my address in CC when replying. Thanks! From 4b9ab261a0ea8a31065e310c5150f522be86d37b Mon Sep 17 00:00:00 2001 From: stefan <aeuii@posteo.de> Date: Fri, 8 Apr 2016 22:47:06 +0200 Subject: [PATCH] emacs: make use of `message-make-from' Will respect `mail-from-style'.
2016-04-08 23:43:27 +02:00
(push (cons 'From (message-make-from
emacs: Shorten long lines
2020-08-08 13:49:36 +02:00
(notmuch-user-name)
(notmuch-user-primary-email)))
other-headers))
emacs: Handle switch-function argument of notmuch-mua-mail notmuch-mua-mail ignored the switch-function argument and always used the function returned by notmuch-mua-get-switch-function instead. In order to support standard emacs interfaces (compose-mail in this case), this commit changes notmuch-mua-mail to use the switch-function argument if it is non-nil and notmuch-mua-get-switch-function otherwise.
2016-01-02 17:47:45 +01:00
(notmuch-mua-pop-to-buffer (message-buffer-name "mail" to)
emacs: Shorten long lines
2020-08-08 13:49:36 +02:00
(or switch-function
(notmuch-mua-get-switch-function)))
emacs: Refactor notmuch-mua-mail This should be more readable.
2016-01-02 17:47:44 +01:00
(let ((headers
emacs: Don't use nconc on quoted list As pointed out by David Bremner, Elisp manual says "A common pitfall is to use a quoted constant list as a non-last argument to ‘nconc’." Since this was the case in recently added code, we fix it here.
2016-01-06 22:28:45 +01:00
(append
;; The following is copied from `message-mail'
emacs: Refactor notmuch-mua-mail This should be more readable.
2016-01-02 17:47:44 +01:00
`((To . ,(or to "")) (Subject . ,(or subject "")))
;; C-h f compose-mail says that headers should be specified as
;; (string . value); however all the rest of message expects
;; headers to be symbols, not strings (eg message-header-format-alist).
Use https instead of http where possible Many of the external links found in the notmuch source can be resolved using https instead of http. This changeset addresses as many as i could find, without touching the e-mail corpus or expected outputs found in tests.
2016-06-02 18:26:14 +02:00
;; https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html
emacs: Refactor notmuch-mua-mail This should be more readable.
2016-01-02 17:47:44 +01:00
;; We need to convert any string input, eg from rmail-start-mail.
(dolist (h other-headers other-headers)
emacs: Use 'when' instead of 'if' when there is no ELSE part
2020-08-08 13:49:43 +02:00
(when (stringp (car h))
(setcar h (intern (capitalize (car h))))))))
emacs: Tell `message-mode' that outgoing messages are email. When composing messages (including replies, etc.), indicate to `message-mode' definitively that the message is email (as opposed to Usenet news) rather than having it attempt to determine this for itself. This causes `message-mode' to observe such variables as `message-default-mail-headers', which previously happened haphazardly.
2016-04-30 08:51:48 +02:00
;; Cause `message-setup-1' to do things relevant for mail,
;; such as observe `message-default-mail-headers'.
(message-this-is-mail t))
emacs: remove kludge for Emacs 23 from notmuch-mua-mail Notmuch requires at least Emacs version 25. The `return-action' argument was added prior to Emacs 24.1 in 25ca2e61403f97b5a023164f2924d5f8aca2492a.
2020-11-16 22:28:23 +01:00
(message-setup-1 headers yank-action send-actions return-action))
emacs: make modifications to message Fcc vars buffer-local Previously we globally modified these variables, which tended to cause problems for people using message-mode, but not notmuch-mua-mail, to send mail. User visible changes: - Calling notmuch-fcc-header-setup is no longer optional. OTOH, it seems to do the right thing if notmuch-fcc-dirs is set to nil. - The Fcc header is visible during message composition - The name in the mode line is changed, and no longer matches exactly the menu label. - Previously notmuch-mua-send-and-exit was never called. Either we misunderstood define-mail-user-agent, or it had a bug. So there was no difference if the user called message-send-and-exit directly. Now there will be. - User bindings to C-c C-c and C-c C-s in message-mode-map are overridden. The user can override them in notmuch-message-mode-map, but then they're on their own for Fcc handling.
2015-08-01 11:44:56 +02:00
(notmuch-fcc-header-setup)
emacs: Sort headers when composing Always sort the headers in the message composition window.
2010-04-26 13:22:40 +02:00
(message-sort-headers)
emacs: More DWIM when editing messages For composing new messages and forwarding, leave the cursor on the 'To:' field. For replies, leave the cursor at the start of the body. In all cases, mark the buffer as not modified so that the user is not prompted if she decides to immediately kill the buffer.
2010-04-26 16:01:25 +02:00
(message-hide-headers)
(set-buffer-modified-p nil)
emacs: Let the user choose where to compose new mails Introduce a new defcustom notmuch-mua-compose-in that allows users to specify where new mails are composed, either in the current window or in a new window or frame. Signed-off-by: Jameson Rollins <jrollins@finestructure.net>
2012-05-04 12:37:56 +02:00
(notmuch-mua-maybe-set-window-dedicated)
emacs: More DWIM when editing messages For composing new messages and forwarding, leave the cursor on the 'To:' field. For replies, leave the cursor at the start of the body. In all cases, mark the buffer as not modified so that the user is not prompted if she decides to immediately kill the buffer.
2010-04-26 16:01:25 +02:00
(message-goto-to))
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
emacs: Helpers needed for the user to be able to choose the "From" address when composing a new message This adds functions and variables needed for this feature to be implemented. Once it's done, the user will be able to use a prefix argument (e.g. pressing C-u m instead of m) and be able to select a From address. By default the list of names/addresses to be used during completion will be automatically generated by the settings in the notmuch configuration file. The user can customize the notmuch-identities variable to provide an alternate list. This is based on a previous patch by Carl Worth (id:"87wrhfvk6a.fsf@yoom.home.cworth.org" and follow-ups).
2011-05-26 10:41:30 +02:00
(defcustom notmuch-identities nil
"Identities that can be used as the From: address when composing a new message.
If this variable is left unset, then a list will be constructed from the
name and addresses configured in the notmuch configuration file."
emacs: logically group def{custom,face}s To allow for expansion whilst keeping everything tidy and organized, move all defcustom/defface variables to the following subgroups, defined in notmuch-lib.el: - Hello - Search - Show - Send - Crypto - Hooks - External Commands - Appearance As an added benefit, defcustom keyword args are now consistently ordered as they appear @ defcustom's docstring (OCD much?). Proper defgroup docstrings and various other improvements by courtesy of Austin Clements.
2012-01-16 11:38:33 +01:00
:type '(repeat string)
:group 'notmuch-send)
emacs: Helpers needed for the user to be able to choose the "From" address when composing a new message This adds functions and variables needed for this feature to be implemented. Once it's done, the user will be able to use a prefix argument (e.g. pressing C-u m instead of m) and be able to select a From address. By default the list of names/addresses to be used during completion will be automatically generated by the settings in the notmuch configuration file. The user can customize the notmuch-identities variable to provide an alternate list. This is based on a previous patch by Carl Worth (id:"87wrhfvk6a.fsf@yoom.home.cworth.org" and follow-ups).
2011-05-26 10:41:30 +02:00
emacs: Add a customization allowing to always prompt for the "From" address when composing a new message
2011-05-26 19:22:41 +02:00
(defcustom notmuch-always-prompt-for-sender nil
emacs: Don't always prompt for the "From" address when replying When replying, the From: address is already filled in by notmuch reply, so most of the time there is no need to prompt the user for it.
2011-05-28 23:51:55 +02:00
"Always prompt for the From: address when composing or forwarding a message.
This is not taken into account when replying to a message, because in that case
the From: header is already filled in by notmuch."
emacs: logically group def{custom,face}s To allow for expansion whilst keeping everything tidy and organized, move all defcustom/defface variables to the following subgroups, defined in notmuch-lib.el: - Hello - Search - Show - Send - Crypto - Hooks - External Commands - Appearance As an added benefit, defcustom keyword args are now consistently ordered as they appear @ defcustom's docstring (OCD much?). Proper defgroup docstrings and various other improvements by courtesy of Austin Clements.
2012-01-16 11:38:33 +01:00
:type 'boolean
:group 'notmuch-send)
emacs: Add a customization allowing to always prompt for the "From" address when composing a new message
2011-05-26 19:22:41 +02:00
emacs: Helpers needed for the user to be able to choose the "From" address when composing a new message This adds functions and variables needed for this feature to be implemented. Once it's done, the user will be able to use a prefix argument (e.g. pressing C-u m instead of m) and be able to select a From address. By default the list of names/addresses to be used during completion will be automatically generated by the settings in the notmuch configuration file. The user can customize the notmuch-identities variable to provide an alternate list. This is based on a previous patch by Carl Worth (id:"87wrhfvk6a.fsf@yoom.home.cworth.org" and follow-ups).
2011-05-26 10:41:30 +02:00
(defvar notmuch-mua-sender-history nil)
(defun notmuch-mua-prompt-for-sender ()
emacs: Simplify and fix `notmuch-mua-prompt-for-sender' `notmuch-mua-prompt-for-sender' is over-engineered and often wrong. It attempts to detect when all identities have the same name and specialize the prompt to just the email address part. However, to do this it uses `mail-extract-address-components', which is meant for displaying email addresses, not general-purpose parsing, and hence performs many canonicalizations that can interfere with this use. For example, configuring notmuch-identities to ("Austin <austin@example.com>"), will cause `notmuch-mua-prompt-for-sender' to lose the name part entirely and return " <austin@example.com>". This patch rewrites `notmuch-mua-prompt-for-sender' to simply prompt for a full identity when notmuch-identities is configured, or to prompt for a sender address when it isn't. The original code also did several strange things, like using `eval' and specifying that this function was interactive. As a side-effect, this patch fixes these problems. And it adds a docstring.
2014-02-27 19:10:54 +01:00
"Prompt for a sender from the user's configured identities."
(if notmuch-identities
(ido-completing-read "Send mail from: " notmuch-identities
nil nil nil 'notmuch-mua-sender-history
(car notmuch-identities))
(let* ((name (notmuch-user-name))
(addrs (cons (notmuch-user-primary-email)
(notmuch-user-other-email)))
(address
(ido-completing-read (concat "Sender address for " name ": ") addrs
nil nil nil 'notmuch-mua-sender-history
(car addrs))))
emacs: make use of `message-make-from' Please put my address in CC when replying. Thanks! From 4b9ab261a0ea8a31065e310c5150f522be86d37b Mon Sep 17 00:00:00 2001 From: stefan <aeuii@posteo.de> Date: Fri, 8 Apr 2016 22:47:06 +0200 Subject: [PATCH] emacs: make use of `message-make-from' Will respect `mail-from-style'.
2016-04-08 23:43:27 +02:00
(message-make-from name address))))
emacs: Helpers needed for the user to be able to choose the "From" address when composing a new message This adds functions and variables needed for this feature to be implemented. Once it's done, the user will be able to use a prefix argument (e.g. pressing C-u m instead of m) and be able to select a From address. By default the list of names/addresses to be used during completion will be automatically generated by the settings in the notmuch configuration file. The user can customize the notmuch-identities variable to provide an alternate list. This is based on a previous patch by Carl Worth (id:"87wrhfvk6a.fsf@yoom.home.cworth.org" and follow-ups).
2011-05-26 10:41:30 +02:00
emacs: Improve interactive use documentation This improves the function documentation for many interactive commands, either by improving their documentation string where the improvement also makes sense for programmatic use or by adding a 'notmuch-doc property where it doesn't. For nearly all commands that support a prefix argument, this adds a 'notmuch-prefix-doc property to document their prefixed behavior This omits prefix documentation for a few commands where I thought the prefixed behavior was too obscure (or too complex to fit in one line).
2013-10-06 05:22:47 +02:00
(put 'notmuch-mua-new-mail 'notmuch-prefix-doc "... and prompt for sender")
emacs: Allow the user to choose the "From" address when composing a new message When pressing C-u m, the user will be prompted for the identity to use.
2011-05-26 10:41:31 +02:00
(defun notmuch-mua-new-mail (&optional prompt-for-sender)
emacs: Improve interactive use documentation This improves the function documentation for many interactive commands, either by improving their documentation string where the improvement also makes sense for programmatic use or by adding a 'notmuch-doc property where it doesn't. For nearly all commands that support a prefix argument, this adds a 'notmuch-prefix-doc property to document their prefixed behavior This omits prefix documentation for a few commands where I thought the prefixed behavior was too obscure (or too complex to fit in one line).
2013-10-06 05:22:47 +02:00
"Compose new mail.
emacs: Allow the user to choose the "From" address when composing a new message When pressing C-u m, the user will be prompted for the identity to use.
2011-05-26 10:41:31 +02:00
If PROMPT-FOR-SENDER is non-nil, the user will be prompted for
the From: address first."
(interactive "P")
(let ((other-headers
emacs: Use 'and' instead of 'when' when the return value matters Also do so for some 'if' forms that lack an ELSE part. Even go as far as using 'and' and 'not' instead of 'unless'.
2020-08-08 13:49:41 +02:00
(and (or prompt-for-sender notmuch-always-prompt-for-sender)
(list (cons 'From (notmuch-mua-prompt-for-sender))))))
emacs: Let the user choose where to compose new mails Introduce a new defcustom notmuch-mua-compose-in that allows users to specify where new mails are composed, either in the current window or in a new window or frame. Signed-off-by: Jameson Rollins <jrollins@finestructure.net>
2012-05-04 12:37:56 +02:00
(notmuch-mua-mail nil nil other-headers nil (notmuch-mua-get-switch-function))))
emacs: Allow the user to choose the "From" address when composing a new message When pressing C-u m, the user will be prompted for the identity to use.
2011-05-26 10:41:31 +02:00
emacs: Add `notmuch-show-forward-open-messages'. Add a function to forward all open messages in the current view of a thread. Bind this to "F".
2016-02-08 12:34:21 +01:00
(defun notmuch-mua-new-forward-messages (messages &optional prompt-for-sender)
"Compose a new message forwarding MESSAGES.
If PROMPT-FOR-SENDER is non-nil, the user will be prompteed for
the From: address."
(let* ((other-headers
emacs: Use 'and' instead of 'when' when the return value matters Also do so for some 'if' forms that lack an ELSE part. Even go as far as using 'and' and 'not' instead of 'unless'.
2020-08-08 13:49:41 +02:00
(and (or prompt-for-sender notmuch-always-prompt-for-sender)
(list (cons 'From (notmuch-mua-prompt-for-sender)))))
emacs: Fix indentation
2020-08-08 13:49:38 +02:00
;; Comes from the first message and is applied later.
forward-subject
;; List of accumulated message-references of forwarded messages.
forward-references
;; List of corresponding message-query.
forward-queries)
emacs: Add `notmuch-show-forward-open-messages'. Add a function to forward all open messages in the current view of a thread. Bind this to "F".
2016-02-08 12:34:21 +01:00
;; Generate the template for the outgoing message.
(notmuch-mua-mail nil "" other-headers nil (notmuch-mua-get-switch-function))
(save-excursion
;; Insert all of the forwarded messages.
(mapc (lambda (id)
(let ((temp-buffer (get-buffer-create
(concat "*notmuch-fwd-raw-" id "*"))))
;; Get the raw version of this message in the buffer.
(with-current-buffer temp-buffer
(erase-buffer)
(let ((coding-system-for-read 'no-conversion))
emacs: Shorten long lines
2020-08-08 13:49:36 +02:00
(call-process notmuch-command nil t nil
"show" "--format=raw" id))
emacs: Add `notmuch-show-forward-open-messages'. Add a function to forward all open messages in the current view of a thread. Bind this to "F".
2016-02-08 12:34:21 +01:00
;; Because we process the messages in reverse order,
;; always generate a forwarded subject, then use the
;; last (i.e. first) one.
emacs: Add References header to forwarded messages Include the message-id of forwarded messages in the new message. This ensures that the new (forwarding) message is linked to the same thread as the message being forwarded.
2019-04-12 14:01:10 +02:00
(setq forward-subject (message-make-forward-subject))
emacs: Tag forwarded messages with +forwarded (customizable) Use the buffer-local variable notmuch-message-queued-tag-changes to change tags when the forwarding message is sent.
2019-04-12 14:01:12 +02:00
(push (message-fetch-field "Message-ID") forward-references)
(push id forward-queries))
emacs: Add `notmuch-show-forward-open-messages'. Add a function to forward all open messages in the current view of a thread. Bind this to "F".
2016-02-08 12:34:21 +01:00
;; Make a copy ready to be forwarded in the
;; composition buffer.
(message-forward-make-body temp-buffer)
;; Kill the temporary buffer.
(kill-buffer temp-buffer)))
;; `message-forward-make-body' always puts the message at
;; the top, so do them in reverse order.
(reverse messages))
;; Add in the appropriate subject.
(save-restriction
(message-narrow-to-headers)
(message-remove-header "Subject")
emacs: Add References header to forwarded messages Include the message-id of forwarded messages in the new message. This ensures that the new (forwarding) message is linked to the same thread as the message being forwarded.
2019-04-12 14:01:10 +02:00
(message-add-header (concat "Subject: " forward-subject))
(message-remove-header "References")
(message-add-header (concat "References: "
(mapconcat 'identity forward-references " "))))
emacs: Shorten long lines
2020-08-08 13:49:36 +02:00
;; Create a buffer-local queue for tag changes triggered when
;; sending the message.
emacs: Tag forwarded messages with +forwarded (customizable) Use the buffer-local variable notmuch-message-queued-tag-changes to change tags when the forwarding message is sent.
2019-04-12 14:01:12 +02:00
(when notmuch-message-forwarded-tags
(setq-local notmuch-message-queued-tag-changes
emacs: Use `cl-lib' instead of deprecated `cl' Starting with Emacs 27 the old `cl' implementation is finally considered obsolete. Previously its use was strongly discouraged at run-time but one was still allowed to use it at compile-time. For the most part the transition is very simple and boils down to adding the "cl-" prefix to some symbols. A few replacements do not follow that simple pattern; e.g. `first' is replaced with `car', even though the alias `cl-first' exists, because the latter is not idiomatic emacs-lisp. In a few cases we start using `pcase-let' or `pcase-lambda' instead of renaming e.g. `first' to `car'. That way we can remind the reader of the meaning of the various parts of the data that is being deconstructed. An obsolete `lexical-let' and a `lexical-let*' are replaced with their regular variants `let' and `let*' even though we do not at the same time enable `lexical-binding' for that file. That is the right thing to do because it does not actually make a difference in those cases whether lexical bindings are used or not, and because this should be enabled in a separate commit. We need to explicitly depend on the `cl-lib' package because Emacs 24.1 and 24.2 lack that library. When using these releases we end up using the backport from GNU Elpa. We need to explicitly require the `pcase' library because `pcase-dolist' was not autoloaded until Emacs 25.1.
2020-04-25 22:18:07 +02:00
(cl-loop for id in forward-queries
collect
(cons id notmuch-message-forwarded-tags))))
emacs: Add `notmuch-show-forward-open-messages'. Add a function to forward all open messages in the current view of a thread. Bind this to "F".
2016-02-08 12:34:21 +01:00
;; `message-forward-make-body' shows the User-agent header. Hide
;; it again.
(message-hide-headers)
(set-buffer-modified-p nil))))
emacs: add support for replying just to the sender Provide reply to sender counterparts to the search and show reply functions. Add key binding 'R' to reply to sender, while keeping 'r' as reply to all, both in search and show views. Signed-off-by: Jani Nikula <jani@nikula.org>
2012-01-14 15:46:17 +01:00
(defun notmuch-mua-new-reply (query-string &optional prompt-for-sender reply-all)
emacs: `notmuch-mua-new-reply' is also not interactive Like `notmuch-mua-new-forward-message', this is meant to be invoked programmatically by something that can provide a reasonable query string. In fact, `notmuch-mua-new-reply's interactive specification didn't match its arguments, so it wouldn't have worked interactively.
2013-10-06 05:22:44 +02:00
"Compose a reply to the message identified by QUERY-STRING.
If PROMPT-FOR-SENDER is non-nil, the user will be prompted for
the From: address first. If REPLY-ALL is non-nil, the message
will be addressed to all recipients of the source message."
emacs: more cleanup since dropping support for Emacs 24 Notmuch requires at least version 25 of Emacs now. Adjust comments that previously referenced version 24 specifically, even though they also apply to later releases. Remove documentation and code that no longer applies. - `mm-shr' no longer references `gnus-inhibit-images'.
2020-11-16 22:28:24 +01:00
;; `select-active-regions' is t by default. The reply insertion code
;; sets the region to the quoted message to make it easy to delete
;; (kill-region or C-w). These two things combine to put the quoted
;; message in the primary selection.
emacs: Fix indentation
2020-08-08 13:49:38 +02:00
;;
;; This is not what the user wanted and is a privacy risk (accidental
;; pasting of the quoted message). We can avoid some of the problems
;; by let-binding select-active-regions to nil. This fixes if the
;; primary selection was previously in a non-emacs window but not if
;; it was in an emacs window. To avoid the problem in the latter case
;; we deactivate mark.
emacs: Use 'and' instead of 'when' when the return value matters Also do so for some 'if' forms that lack an ELSE part. Even go as far as using 'and' and 'not' instead of 'unless'.
2020-08-08 13:49:41 +02:00
(let ((sender (and prompt-for-sender
(notmuch-mua-prompt-for-sender)))
emacs: do not put quoted reply in primary selection In current emacs (24.3) select-active-regions is set to t by default. The reply insertion code sets the region to the quoted message to make it easy to delete (kill-region or C-w). These two things combine to put the quoted message in the primary selection. This is not what the user wanted and is a privacy risk (accidental pasting of the quoted message). We can avoid some of the problems by let-binding select-active-regions to nil. This fixes if the primary selection was previously in a non-emacs window but not if it was in an emacs window. To avoid the problem in the latter case we deactivate mark. One key test (which fails under many simpler "fixes") is: open emacs 24.3 with notmuch, open 2 windows (viewing different notmuch buffers), highlight some text in one, and then reply to a message in the other. In many of my earlier attempts to fix this big this test fails.
2013-11-17 13:04:09 +01:00
(select-active-regions nil))
(notmuch-mua-reply query-string sender reply-all)
(deactivate-mark)))
emacs: Allow the user to choose the "From" address when replying to a message When pressing C-u r, the user will be prompted for the identity to use.
2011-05-26 10:41:33 +02: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
;;; Checks
emacs: mua: check for misplaced secure mml tags Emacs message-send seems to ignore a secure mml tag anywhere except at the start of the body, and it must be followed by a newline. Since this is almost certainly not desired we check for it, and require user confirmation before sending. As the setup before message-send or message-send-and-exit is getting more complicated it is convenient to unify the two correspoinding notmuch functions.
2016-10-08 22:05:23 +02:00
(defun notmuch-mua-check-no-misplaced-secure-tag ()
"Query user if there is a misplaced secure mml tag.
Emacs message-send will (probably) ignore a secure mml tag unless
it is at the start of the body. Returns t if there is no such
tag, or the user confirms they mean it."
(save-excursion
(let ((body-start (progn (message-goto-body) (point))))
(goto-char (point-max))
(or
;; We are always fine if there is no secure tag.
emacs: do not quote self-quoting t
2020-11-16 22:28:41 +01:00
(not (search-backward "<#secure" nil t))
emacs: mua: check for misplaced secure mml tags Emacs message-send seems to ignore a secure mml tag anywhere except at the start of the body, and it must be followed by a newline. Since this is almost certainly not desired we check for it, and require user confirmation before sending. As the setup before message-send or message-send-and-exit is getting more complicated it is convenient to unify the two correspoinding notmuch functions.
2016-10-08 22:05:23 +02:00
;; There is a secure tag, so it must be at the start of the
;; body, with no secure tag earlier (i.e., in the headers).
(and (= (point) body-start)
emacs: do not quote self-quoting t
2020-11-16 22:28:41 +01:00
(not (search-backward "<#secure" nil t)))
emacs: mua: check for misplaced secure mml tags Emacs message-send seems to ignore a secure mml tag anywhere except at the start of the body, and it must be followed by a newline. Since this is almost certainly not desired we check for it, and require user confirmation before sending. As the setup before message-send or message-send-and-exit is getting more complicated it is convenient to unify the two correspoinding notmuch functions.
2016-10-08 22:05:23 +02:00
;; The user confirms they means it.
(yes-or-no-p "\
There is a <#secure> tag not at the start of the body. It is
likely that the message will be sent unsigned and unencrypted.
Really send? ")))))
(defun notmuch-mua-check-secure-tag-has-newline ()
"Query if the secure mml tag has a newline following it.
Emacs message-send will (probably) ignore a correctly placed
secure mml tag unless it is followed by a newline. Returns t if
any secure tag is followed by a newline, or the user confirms
they mean it."
(save-excursion
(message-goto-body)
(or
;; There is no (correctly placed) secure tag.
(not (looking-at "<#secure"))
;; The secure tag is followed by a newline.
(looking-at "<#secure[^\n>]*>\n")
;; The user confirms they means it.
(yes-or-no-p "\
The <#secure> tag at the start of the body is not followed by a
newline. It is likely that the message will be sent unsigned and
unencrypted. Really send? "))))
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
;;; Finishing commands
emacs: mua: extract a common message-send function. This commit adds a common message-send function for message-send and message-send-and-exit. At the moment the overlap is small, but the message-send function will get more complex.
2016-10-08 22:05:22 +02:00
(defun notmuch-mua-send-common (arg &optional exit)
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
(interactive "P")
emacs: Call `notmuch-mua-send-hook' hooks when sending a message Previously any hook functions attached to `notmuch-mua-send-hook' were ignored.
2018-09-25 17:09:10 +02:00
(run-hooks 'notmuch-mua-send-hook)
emacs: mua: check for misplaced secure mml tags Emacs message-send seems to ignore a secure mml tag anywhere except at the start of the body, and it must be followed by a newline. Since this is almost certainly not desired we check for it, and require user confirmation before sending. As the setup before message-send or message-send-and-exit is getting more complicated it is convenient to unify the two correspoinding notmuch functions.
2016-10-08 22:05:23 +02:00
(when (and (notmuch-mua-check-no-misplaced-secure-tag)
(notmuch-mua-check-secure-tag-has-newline))
emacs: Shorten long lines
2020-08-08 13:49:36 +02:00
(cl-letf (((symbol-function 'message-do-fcc)
#'notmuch-maildir-message-do-fcc))
emacs: Use `cl-lib' instead of deprecated `cl' Starting with Emacs 27 the old `cl' implementation is finally considered obsolete. Previously its use was strongly discouraged at run-time but one was still allowed to use it at compile-time. For the most part the transition is very simple and boils down to adding the "cl-" prefix to some symbols. A few replacements do not follow that simple pattern; e.g. `first' is replaced with `car', even though the alias `cl-first' exists, because the latter is not idiomatic emacs-lisp. In a few cases we start using `pcase-let' or `pcase-lambda' instead of renaming e.g. `first' to `car'. That way we can remind the reader of the meaning of the various parts of the data that is being deconstructed. An obsolete `lexical-let' and a `lexical-let*' are replaced with their regular variants `let' and `let*' even though we do not at the same time enable `lexical-binding' for that file. That is the right thing to do because it does not actually make a difference in those cases whether lexical bindings are used or not, and because this should be enabled in a separate commit. We need to explicitly depend on the `cl-lib' package because Emacs 24.1 and 24.2 lack that library. When using these releases we end up using the backport from GNU Elpa. We need to explicitly require the `pcase' library because `pcase-dolist' was not autoloaded until Emacs 25.1.
2020-04-25 22:18:07 +02:00
(if exit
(message-send-and-exit arg)
(message-send arg)))))
emacs: mua: extract a common message-send function. This commit adds a common message-send function for message-send and message-send-and-exit. At the moment the overlap is small, but the message-send function will get more complex.
2016-10-08 22:05:22 +02:00
(defun notmuch-mua-send-and-exit (&optional arg)
(interactive "P")
emacs: do not quote self-quoting t
2020-11-16 22:28:41 +01:00
(notmuch-mua-send-common arg t))
emacs: make modifications to message Fcc vars buffer-local Previously we globally modified these variables, which tended to cause problems for people using message-mode, but not notmuch-mua-mail, to send mail. User visible changes: - Calling notmuch-fcc-header-setup is no longer optional. OTOH, it seems to do the right thing if notmuch-fcc-dirs is set to nil. - The Fcc header is visible during message composition - The name in the mode line is changed, and no longer matches exactly the menu label. - Previously notmuch-mua-send-and-exit was never called. Either we misunderstood define-mail-user-agent, or it had a bug. So there was no difference if the user called message-send-and-exit directly. Now there will be. - User bindings to C-c C-c and C-c C-s in message-mode-map are overridden. The user can override them in notmuch-message-mode-map, but then they're on their own for Fcc handling.
2015-08-01 11:44:56 +02:00
(defun notmuch-mua-send (&optional arg)
(interactive "P")
emacs: mua: extract a common message-send function. This commit adds a common message-send function for message-send and message-send-and-exit. At the moment the overlap is small, but the message-send function will get more complex.
2016-10-08 22:05:22 +02:00
(notmuch-mua-send-common arg))
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
(defun notmuch-mua-kill-buffer ()
(interactive)
(message-kill-buffer))
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
;;; _
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
(define-mail-user-agent 'notmuch-user-agent
'notmuch-mua-mail 'notmuch-mua-send-and-exit
'notmuch-mua-kill-buffer 'notmuch-mua-send-hook)
emacs: Hide the "User-Agent:" when composing messages Add a list of headers to those hidden by `message-mode' when composing. By default the list includes only "User-Agent:".
2010-04-26 13:50:59 +02:00
;; Add some more headers to the list that `message-mode' hides when
;; composing a message.
(notmuch-mua-add-more-hidden-headers)
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default. This is the real commit for this functionality this time. The previous attempt to merge this code: commit 57926bc7b0f784cbacb620fda0ee5157e2e0ff27 was botched (by Carl Worth, not David) to include only the Makefile change. So the build was broken until this commit that actually adds the new file.
2010-04-22 11:03:32 +02:00
(provide 'notmuch-mua)
emacs: Fix packaging Refer to (info "(elisp) Library Headers") for package conventions.
2016-04-13 09:58:47 +02:00
;;; notmuch-mua.el ends here
Reference in a new issue Copy permalink