From: Mark Walters <markwalters1009@gmail.com>
To: Tomi Ollila <tomi.ollila@iki.fi>,
notmuch@notmuchmail.org, sojkam1@fel.cvut.cz
Cc: tomi.ollila@iki.fi
Subject: Re: [PATCH 2/2] emacs: prefer notmuch-emacs-version in User-Agent: header
Date: Mon, 03 Aug 2015 09:15:23 +0100 [thread overview]
Message-ID: <87zj28wzxg.fsf@qmul.ac.uk> (raw)
In-Reply-To: <1438526894-19657-2-git-send-email-tomi.ollila@iki.fi>
On Sun, 02 Aug 2015, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> 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.
> ---
>
> Note that I did not create notmuch-guess-emacs-version (or something)
> function. The idea is good but there is one HARD problem: naming it.
> Also, I personally suspect that no-one is going to need that function in
> coming years...
This pair of patches look good to me +1.
Best wishes
Mark
>
> emacs/notmuch-lib.el | 4 ++++
> emacs/notmuch-mua.el | 5 ++++-
> emacs/notmuch.el | 4 ----
> 3 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
> index e16a1b9..201d7ec 100644
> --- a/emacs/notmuch-lib.el
> +++ b/emacs/notmuch-lib.el
> @@ -25,6 +25,10 @@
> (require 'mm-decode)
> (require 'cl)
>
> +(unless (require 'notmuch-version nil t)
> + (defconst notmuch-emacs-version "unknown"
> + "Placeholder variable when notmuch-version.el[c] is not available."))
> +
> (autoload 'notmuch-jump-search "notmuch-jump"
> "Jump to a saved search by shortcut key." t)
>
> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
> index 934f6c9..3e52d5e 100644
> --- a/emacs/notmuch-mua.el
> +++ b/emacs/notmuch-mua.el
> @@ -118,7 +118,10 @@ (defun notmuch-mua-user-agent-full ()
>
> (defun notmuch-mua-user-agent-notmuch ()
> "Generate a `User-Agent:' string suitable for notmuch."
> - (concat "Notmuch/" (notmuch-cli-version) " (http://notmuchmail.org)"))
> + (let ((notmuch-version (if (string= notmuch-emacs-version "unknown")
> + (notmuch-cli-version)
> + notmuch-emacs-version)))
> + (concat "Notmuch/" notmuch-version " (http://notmuchmail.org)")))
>
> (defun notmuch-mua-user-agent-emacs ()
> "Generate a `User-Agent:' string suitable for notmuch."
> diff --git a/emacs/notmuch.el b/emacs/notmuch.el
> index 6564816..5284e77 100644
> --- a/emacs/notmuch.el
> +++ b/emacs/notmuch.el
> @@ -61,10 +61,6 @@
> (require 'notmuch-message)
> (require 'notmuch-parser)
>
> -(unless (require 'notmuch-version nil t)
> - (defconst notmuch-emacs-version "unknown"
> - "Placeholder variable when notmuch-version.el[c] is not available."))
> -
> (defcustom notmuch-search-result-format
> `(("date" . "%12s ")
> ("count" . "%-7s ")
> --
> 1.9.3
next prev parent reply other threads:[~2015-08-03 8:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-02 14:48 [PATCH 1/2] emacs: renamed function notmuch-version to notmuch-cli-version Tomi Ollila
2015-08-02 14:48 ` [PATCH 2/2] emacs: prefer notmuch-emacs-version in User-Agent: header Tomi Ollila
2015-08-03 8:15 ` Mark Walters [this message]
2015-08-04 18:59 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zj28wzxg.fsf@qmul.ac.uk \
--to=markwalters1009@gmail.com \
--cc=notmuch@notmuchmail.org \
--cc=sojkam1@fel.cvut.cz \
--cc=tomi.ollila@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).