* [PATCH v2 1/9] completion: complete notmuch emacs-mua
2016-11-21 21:13 [PATCH v2 0/9] improvements around notmuch-emacs-mua Jani Nikula
@ 2016-11-21 21:13 ` Jani Nikula
2016-11-27 9:29 ` [PATCH v3] " Jani Nikula
2016-11-21 21:13 ` [PATCH v2 2/9] man: advertize notmuch-emacs-mua as notmuch emacs-mua subcommand Jani Nikula
` (7 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2016-11-21 21:13 UTC (permalink / raw)
To: notmuch
With subcommand handling for external commands we can easily complete
'notmuch emacs-mua' using the existing completion system.
---
completion/notmuch-completion.bash | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index d44b2a2811f0..cbe59e23f772 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -236,6 +236,38 @@ _notmuch_dump()
esac
}
+_notmuch_emacs_mua()
+{
+ local cur prev words cword split
+ _init_completion -s || return
+
+ $split &&
+ case "${prev}" in
+ --to|--cc|--bcc)
+ COMPREPLY=( $(compgen -W "`_notmuch_email to:${cur}`" -- ${cur}) )
+ return
+ ;;
+ --body)
+ _filedir
+ return
+ ;;
+ esac
+
+ ! $split &&
+ case "${cur}" in
+ -*)
+ local options="--subject= --to= --cc= --bcc= --body= --no-window-system --client --auto-daemon --create-frame --print --help"
+
+ compopt -o nospace
+ COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
+ ;;
+ *)
+ COMPREPLY=( $(compgen -W "`_notmuch_email to:${cur}`" -- ${cur}) )
+ return
+ ;;
+ esac
+}
+
_notmuch_insert()
{
local cur prev words cword split
@@ -496,7 +528,7 @@ _notmuch_tag()
_notmuch()
{
- local _notmuch_commands="compact config count dump help insert new reply restore search address setup show tag"
+ local _notmuch_commands="compact config count dump help insert new reply restore search address setup show tag emacs-mua"
local arg cur prev words cword split
# require bash-completion with _init_completion
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v3] completion: complete notmuch emacs-mua
2016-11-21 21:13 ` [PATCH v2 1/9] completion: complete notmuch emacs-mua Jani Nikula
@ 2016-11-27 9:29 ` Jani Nikula
0 siblings, 0 replies; 19+ messages in thread
From: Jani Nikula @ 2016-11-27 9:29 UTC (permalink / raw)
To: notmuch
With subcommand handling for external commands we can easily complete
'notmuch emacs-mua' using the existing completion system.
---
v3: complete --hello option
---
completion/notmuch-completion.bash | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index d44b2a2811f0..40012eaaffd9 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -236,6 +236,38 @@ _notmuch_dump()
esac
}
+_notmuch_emacs_mua()
+{
+ local cur prev words cword split
+ _init_completion -s || return
+
+ $split &&
+ case "${prev}" in
+ --to|--cc|--bcc)
+ COMPREPLY=( $(compgen -W "`_notmuch_email to:${cur}`" -- ${cur}) )
+ return
+ ;;
+ --body)
+ _filedir
+ return
+ ;;
+ esac
+
+ ! $split &&
+ case "${cur}" in
+ -*)
+ local options="--subject= --to= --cc= --bcc= --body= --no-window-system --client --auto-daemon --create-frame --print --help --hello"
+
+ compopt -o nospace
+ COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
+ ;;
+ *)
+ COMPREPLY=( $(compgen -W "`_notmuch_email to:${cur}`" -- ${cur}) )
+ return
+ ;;
+ esac
+}
+
_notmuch_insert()
{
local cur prev words cword split
@@ -496,7 +528,7 @@ _notmuch_tag()
_notmuch()
{
- local _notmuch_commands="compact config count dump help insert new reply restore search address setup show tag"
+ local _notmuch_commands="compact config count dump help insert new reply restore search address setup show tag emacs-mua"
local arg cur prev words cword split
# require bash-completion with _init_completion
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v2 2/9] man: advertize notmuch-emacs-mua as notmuch emacs-mua subcommand
2016-11-21 21:13 [PATCH v2 0/9] improvements around notmuch-emacs-mua Jani Nikula
2016-11-21 21:13 ` [PATCH v2 1/9] completion: complete notmuch emacs-mua Jani Nikula
@ 2016-11-21 21:13 ` Jani Nikula
2016-11-21 21:13 ` [PATCH v2 3/9] emacs: move notmuch-emacs-mua under emacs Jani Nikula
` (6 subsequent siblings)
8 siblings, 0 replies; 19+ messages in thread
From: Jani Nikula @ 2016-11-21 21:13 UTC (permalink / raw)
To: notmuch
With subcommand handling for external commands we can now hide the
implementation detail of emacs-mua being a separate notmuch-emacs-mua
script.
---
doc/man1/notmuch-emacs-mua.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst
index 651d00fa4eb8..b80aa5f9b2e5 100644
--- a/doc/man1/notmuch-emacs-mua.rst
+++ b/doc/man1/notmuch-emacs-mua.rst
@@ -5,7 +5,7 @@ notmuch-emacs-mua
SYNOPSIS
========
-**notmuch-emacs-mua** [options ...] [<to-address> ... | <mailto-url>]
+**notmuch** **emacs-mua** [options ...] [<to-address> ... | <mailto-url>]
DESCRIPTION
===========
@@ -13,7 +13,7 @@ DESCRIPTION
Start composing an email in the Notmuch Emacs UI with the specified
subject, recipients, and message body, or mailto: URL.
-Supported options for **notmuch-emacs-mua** include
+Supported options for **emacs-mua** include
``-h, --help``
Display help.
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v2 3/9] emacs: move notmuch-emacs-mua under emacs
2016-11-21 21:13 [PATCH v2 0/9] improvements around notmuch-emacs-mua Jani Nikula
2016-11-21 21:13 ` [PATCH v2 1/9] completion: complete notmuch emacs-mua Jani Nikula
2016-11-21 21:13 ` [PATCH v2 2/9] man: advertize notmuch-emacs-mua as notmuch emacs-mua subcommand Jani Nikula
@ 2016-11-21 21:13 ` Jani Nikula
2016-11-21 21:13 ` [PATCH v2 4/9] notmuch-emacs-mua: add --hello parameter Jani Nikula
` (5 subsequent siblings)
8 siblings, 0 replies; 19+ messages in thread
From: Jani Nikula @ 2016-11-21 21:13 UTC (permalink / raw)
To: notmuch
While the notmuch-emacs-mua script is a sort of cli command, it is
really a part of notmuch-emacs. Move it under the emacs directory.
---
notmuch-emacs-mua => emacs/notmuch-emacs-mua | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename notmuch-emacs-mua => emacs/notmuch-emacs-mua (100%)
diff --git a/notmuch-emacs-mua b/emacs/notmuch-emacs-mua
similarity index 100%
rename from notmuch-emacs-mua
rename to emacs/notmuch-emacs-mua
--
2.1.4
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v2 4/9] notmuch-emacs-mua: add --hello parameter
2016-11-21 21:13 [PATCH v2 0/9] improvements around notmuch-emacs-mua Jani Nikula
` (2 preceding siblings ...)
2016-11-21 21:13 ` [PATCH v2 3/9] emacs: move notmuch-emacs-mua under emacs Jani Nikula
@ 2016-11-21 21:13 ` Jani Nikula
2016-11-25 16:34 ` Tomi Ollila
2016-11-21 21:13 ` [PATCH v2 5/9] build: install notmuch-emacs-mua with notmuch-emacs Jani Nikula
` (4 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2016-11-21 21:13 UTC (permalink / raw)
To: notmuch
If the --hello parameter is given, display the notmuch hello buffer
instead of the message composition buffer if no message composition
parameters are given.
Signed-off-by: Jani Nikula <jani@nikula.org>
---
doc/man1/notmuch-emacs-mua.rst | 4 ++++
emacs/notmuch-emacs-mua | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst
index b80aa5f9b2e5..87787e20e531 100644
--- a/doc/man1/notmuch-emacs-mua.rst
+++ b/doc/man1/notmuch-emacs-mua.rst
@@ -33,6 +33,10 @@ Supported options for **emacs-mua** include
``-i, --body=``\ <file>
Specify a file to include into the body of the message.
+ ``--hello``
+ Go to the Notmuch hello screen instead of the message composition
+ window if no message composition parameters are given.
+
``--no-window-system``
Even if a window system is available, use the current terminal.
diff --git a/emacs/notmuch-emacs-mua b/emacs/notmuch-emacs-mua
index 98103972f400..a521497784ec 100755
--- a/emacs/notmuch-emacs-mua
+++ b/emacs/notmuch-emacs-mua
@@ -40,6 +40,7 @@ AUTO_DAEMON=
CREATE_FRAME=
ELISP=
MAILTO=
+HELLO=
# Short options compatible with mutt(1).
while getopts :s:c:b:i:h opt; do
@@ -63,7 +64,7 @@ while getopts :s:c:b:i:h opt; do
opt=${opt%%=*}
;;
# Long options without arguments.
- --help|--print|--no-window-system|--client|--auto-daemon|--create-frame)
+ --help|--print|--no-window-system|--client|--auto-daemon|--create-frame|--hello)
;;
*)
echo "$0: unknown long option ${opt}, or argument mismatch." >&2
@@ -112,6 +113,9 @@ while getopts :s:c:b:i:h opt; do
--create-frame)
CREATE_FRAME="-c"
;;
+ --hello)
+ HELLO=1
+ ;;
*)
# We should never end up here.
echo "$0: internal error (option ${opt})." >&2
@@ -146,6 +150,8 @@ if [ -n "${MAILTO}" ]; then
exit 1
fi
ELISP="(browse-url-mail \"${MAILTO}\")"
+elif [ -z "${ELISP}" -a -n "${HELLO}" ]; then
+ ELISP="(notmuch)"
else
ELISP="(notmuch-mua-new-mail) ${ELISP}"
fi
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v2 4/9] notmuch-emacs-mua: add --hello parameter
2016-11-21 21:13 ` [PATCH v2 4/9] notmuch-emacs-mua: add --hello parameter Jani Nikula
@ 2016-11-25 16:34 ` Tomi Ollila
0 siblings, 0 replies; 19+ messages in thread
From: Tomi Ollila @ 2016-11-25 16:34 UTC (permalink / raw)
To: Jani Nikula, notmuch
On Mon, Nov 21 2016, Jani Nikula <jani@nikula.org> wrote:
> If the --hello parameter is given, display the notmuch hello buffer
> instead of the message composition buffer if no message composition
> parameters are given.
+1 for --hello option
Tomi
>
> Signed-off-by: Jani Nikula <jani@nikula.org>
> ---
> doc/man1/notmuch-emacs-mua.rst | 4 ++++
> emacs/notmuch-emacs-mua | 8 +++++++-
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst
> index b80aa5f9b2e5..87787e20e531 100644
> --- a/doc/man1/notmuch-emacs-mua.rst
> +++ b/doc/man1/notmuch-emacs-mua.rst
> @@ -33,6 +33,10 @@ Supported options for **emacs-mua** include
> ``-i, --body=``\ <file>
> Specify a file to include into the body of the message.
>
> + ``--hello``
> + Go to the Notmuch hello screen instead of the message composition
> + window if no message composition parameters are given.
> +
> ``--no-window-system``
> Even if a window system is available, use the current terminal.
>
> diff --git a/emacs/notmuch-emacs-mua b/emacs/notmuch-emacs-mua
> index 98103972f400..a521497784ec 100755
> --- a/emacs/notmuch-emacs-mua
> +++ b/emacs/notmuch-emacs-mua
> @@ -40,6 +40,7 @@ AUTO_DAEMON=
> CREATE_FRAME=
> ELISP=
> MAILTO=
> +HELLO=
>
> # Short options compatible with mutt(1).
> while getopts :s:c:b:i:h opt; do
> @@ -63,7 +64,7 @@ while getopts :s:c:b:i:h opt; do
> opt=${opt%%=*}
> ;;
> # Long options without arguments.
> - --help|--print|--no-window-system|--client|--auto-daemon|--create-frame)
> + --help|--print|--no-window-system|--client|--auto-daemon|--create-frame|--hello)
> ;;
> *)
> echo "$0: unknown long option ${opt}, or argument mismatch." >&2
> @@ -112,6 +113,9 @@ while getopts :s:c:b:i:h opt; do
> --create-frame)
> CREATE_FRAME="-c"
> ;;
> + --hello)
> + HELLO=1
> + ;;
> *)
> # We should never end up here.
> echo "$0: internal error (option ${opt})." >&2
> @@ -146,6 +150,8 @@ if [ -n "${MAILTO}" ]; then
> exit 1
> fi
> ELISP="(browse-url-mail \"${MAILTO}\")"
> +elif [ -z "${ELISP}" -a -n "${HELLO}" ]; then
> + ELISP="(notmuch)"
> else
> ELISP="(notmuch-mua-new-mail) ${ELISP}"
> fi
> --
> 2.1.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v2 5/9] build: install notmuch-emacs-mua with notmuch-emacs
2016-11-21 21:13 [PATCH v2 0/9] improvements around notmuch-emacs-mua Jani Nikula
` (3 preceding siblings ...)
2016-11-21 21:13 ` [PATCH v2 4/9] notmuch-emacs-mua: add --hello parameter Jani Nikula
@ 2016-11-21 21:13 ` Jani Nikula
2016-11-21 21:13 ` [PATCH v2 6/9] notmuch.desktop: move under emacs as notmuch-emacs-mua.desktop Jani Nikula
` (3 subsequent siblings)
8 siblings, 0 replies; 19+ messages in thread
From: Jani Nikula @ 2016-11-21 21:13 UTC (permalink / raw)
To: notmuch
notmuch-emacs-mua is good enough to be installed with notmuch-emacs.
---
emacs/Makefile.local | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 90a57cca74ed..8ab7b1260924 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -36,6 +36,8 @@ $(dir)/notmuch-pkg.el: $(srcdir)/$(dir)/notmuch-pkg.el.tmpl
all: $(dir)/notmuch-pkg.el
install-emacs: $(dir)/notmuch-pkg.el
+emacs_mua := $(dir)/notmuch-emacs-mua
+
emacs_images := \
$(srcdir)/$(dir)/notmuch-logo.png
@@ -91,5 +93,7 @@ ifeq ($(HAVE_EMACS),1)
endif
mkdir -p "$(DESTDIR)$(emacsetcdir)"
install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
+ mkdir -p "$(DESTDIR)$(prefix)/bin/"
+ install $(emacs_mua) "$(DESTDIR)$(prefix)/bin"
CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v2 6/9] notmuch.desktop: move under emacs as notmuch-emacs-mua.desktop
2016-11-21 21:13 [PATCH v2 0/9] improvements around notmuch-emacs-mua Jani Nikula
` (4 preceding siblings ...)
2016-11-21 21:13 ` [PATCH v2 5/9] build: install notmuch-emacs-mua with notmuch-emacs Jani Nikula
@ 2016-11-21 21:13 ` Jani Nikula
2016-11-26 12:53 ` David Bremner
2016-11-21 21:13 ` [PATCH v2 7/9] emacs/desktop: update to use notmuch-emacs-mua and handle mailto Jani Nikula
` (2 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2016-11-21 21:13 UTC (permalink / raw)
To: notmuch
The notmuch.desktop file is part of notmuch-emacs. Move it under
emacs, and rename as notmuch-emacs-mua.desktop to reflect this.
---
Makefile.local | 5 -----
emacs/Makefile.local | 6 ++++++
notmuch.desktop => emacs/notmuch-emacs-mua.desktop | 0
3 files changed, 6 insertions(+), 5 deletions(-)
rename notmuch.desktop => emacs/notmuch-emacs-mua.desktop (100%)
diff --git a/Makefile.local b/Makefile.local
index 0a122ab0e208..f90a97c4a6b7 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -336,11 +336,6 @@ ifeq ($(WITH_EMACS), 1)
endif
endif
-.PHONY: install-desktop
-install-desktop:
- mkdir -p "$(DESTDIR)$(desktop_dir)"
- desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" notmuch.desktop
-
SRCS := $(SRCS) $(notmuch_client_srcs)
CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)
CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 8ab7b1260924..b47577ac1110 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -37,6 +37,7 @@ all: $(dir)/notmuch-pkg.el
install-emacs: $(dir)/notmuch-pkg.el
emacs_mua := $(dir)/notmuch-emacs-mua
+emacs_mua_desktop := $(dir)/notmuch-emacs-mua.desktop
emacs_images := \
$(srcdir)/$(dir)/notmuch-logo.png
@@ -96,4 +97,9 @@ endif
mkdir -p "$(DESTDIR)$(prefix)/bin/"
install $(emacs_mua) "$(DESTDIR)$(prefix)/bin"
+.PHONY: install-desktop
+install-desktop:
+ mkdir -p "$(DESTDIR)$(desktop_dir)"
+ desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop)
+
CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el
diff --git a/notmuch.desktop b/emacs/notmuch-emacs-mua.desktop
similarity index 100%
rename from notmuch.desktop
rename to emacs/notmuch-emacs-mua.desktop
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v2 7/9] emacs/desktop: update to use notmuch-emacs-mua and handle mailto
2016-11-21 21:13 [PATCH v2 0/9] improvements around notmuch-emacs-mua Jani Nikula
` (5 preceding siblings ...)
2016-11-21 21:13 ` [PATCH v2 6/9] notmuch.desktop: move under emacs as notmuch-emacs-mua.desktop Jani Nikula
@ 2016-11-21 21:13 ` Jani Nikula
2016-11-21 21:13 ` [PATCH v2 8/9] build: install notmuch-emacs-mua.desktop file with emacs Jani Nikula
2016-11-21 21:13 ` [PATCH v2 9/9] build: update the desktop database after installing the desktop file Jani Nikula
8 siblings, 0 replies; 19+ messages in thread
From: Jani Nikula @ 2016-11-21 21:13 UTC (permalink / raw)
To: notmuch
With the mailto: handling in notmuch-emacs-mua, we can update the
desktop file to advertize we can be set as the default application to
handle email. While at it, add GenericName and Comment to be more
informative.
With --hello, notmuch-emacs-mua will run (notmuch) if mailto: url is
not given.
---
emacs/notmuch-emacs-mua.desktop | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/emacs/notmuch-emacs-mua.desktop b/emacs/notmuch-emacs-mua.desktop
index f1600473bf60..0d9af2a4cf39 100644
--- a/emacs/notmuch-emacs-mua.desktop
+++ b/emacs/notmuch-emacs-mua.desktop
@@ -1,6 +1,9 @@
[Desktop Entry]
Name=Notmuch (emacs interface)
-Exec=emacs -f notmuch
+GenericName=Email Client
+Comment=Emacs based email client
+Exec=notmuch-emacs-mua --hello %u
+MimeType=x-scheme-handler/mailto;
Icon=emblem-mail
Terminal=false
Type=Application
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v2 8/9] build: install notmuch-emacs-mua.desktop file with emacs
2016-11-21 21:13 [PATCH v2 0/9] improvements around notmuch-emacs-mua Jani Nikula
` (6 preceding siblings ...)
2016-11-21 21:13 ` [PATCH v2 7/9] emacs/desktop: update to use notmuch-emacs-mua and handle mailto Jani Nikula
@ 2016-11-21 21:13 ` Jani Nikula
2016-11-25 16:39 ` Tomi Ollila
2016-11-21 21:13 ` [PATCH v2 9/9] build: update the desktop database after installing the desktop file Jani Nikula
8 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2016-11-21 21:13 UTC (permalink / raw)
To: notmuch
There is really no need to have a separate install target for the
desktop file. Just install the desktop file with emacs, with a
configure option to opt out.
---
configure | 13 +++++++++++++
emacs/Makefile.local | 5 ++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index f0fc466eead5..27afc8076c81 100755
--- a/configure
+++ b/configure
@@ -70,6 +70,7 @@ LIBDIR=
WITH_DOCS=1
WITH_API_DOCS=1
WITH_EMACS=1
+WITH_DESKTOP=1
WITH_BASH=1
WITH_RUBY=1
WITH_ZSH=1
@@ -141,6 +142,7 @@ Some features can be disabled (--with-feature=no is equivalent to
--without-docs Do not install documentation
--without-api-docs Do not install API man page
--without-emacs Do not install lisp file
+ --without-desktop Do not install desktop file
--without-ruby Do not install ruby bindings
--without-zsh-completion Do not install zsh completions files
--without-retry-lock Do not use blocking xapian opens, even if available
@@ -209,6 +211,14 @@ for option; do
fi
elif [ "${option}" = '--without-emacs' ] ; then
WITH_EMACS=0
+ elif [ "${option%%=*}" = '--with-desktop' ]; then
+ if [ "${option#*=}" = 'no' ]; then
+ WITH_DESKTOP=0
+ else
+ WITH_DESKTOP=1
+ fi
+ elif [ "${option}" = '--without-desktop' ] ; then
+ WITH_DESKTOP=0
elif [ "${option%%=*}" = '--with-bash-completion' ]; then
if [ "${option#*=}" = 'no' ]; then
WITH_BASH=0
@@ -1123,6 +1133,9 @@ VALGRIND_CFLAGS = ${valgrind_cflags}
# Support for emacs
WITH_EMACS = ${WITH_EMACS}
+# Support for desktop file
+WITH_DESKTOP = ${WITH_DESKTOP}
+
# Support for bash completion
WITH_BASH = ${WITH_BASH}
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index b47577ac1110..ffa8421ebd45 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -96,10 +96,9 @@ endif
install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
mkdir -p "$(DESTDIR)$(prefix)/bin/"
install $(emacs_mua) "$(DESTDIR)$(prefix)/bin"
-
-.PHONY: install-desktop
-install-desktop:
+ifeq ($(WITH_DESKTOP),1)
mkdir -p "$(DESTDIR)$(desktop_dir)"
desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop)
+endif
CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v2 8/9] build: install notmuch-emacs-mua.desktop file with emacs
2016-11-21 21:13 ` [PATCH v2 8/9] build: install notmuch-emacs-mua.desktop file with emacs Jani Nikula
@ 2016-11-25 16:39 ` Tomi Ollila
2016-11-26 9:37 ` [PATCH v3] " Jani Nikula
0 siblings, 1 reply; 19+ messages in thread
From: Tomi Ollila @ 2016-11-25 16:39 UTC (permalink / raw)
To: notmuch
On Mon, Nov 21 2016, Jani Nikula <jani@nikula.org> wrote:
> There is really no need to have a separate install target for the
> desktop file. Just install the desktop file with emacs, with a
> configure option to opt out.
This and the following patch could check with something like
if command -v desktop-file-install >/dev/null &&
command -v update-desktop-database >/dev/null; then
WITH_DESKTOP=1
else
WITH_DESKTOP=0
fi
So that poor n00b users (relatively speaking) installing notmuch-emacs
e.g. on server systems (or on any other system that does not have these
magic commands) don't get install failure.
Alternatively errors of these could be silently ignored, but then
one is left with extra "$(DESTDIR)$(desktop_dir)" directory.
Tomi
> ---
> configure | 13 +++++++++++++
> emacs/Makefile.local | 5 ++---
> 2 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index f0fc466eead5..27afc8076c81 100755
> --- a/configure
> +++ b/configure
> @@ -70,6 +70,7 @@ LIBDIR=
> WITH_DOCS=1
> WITH_API_DOCS=1
> WITH_EMACS=1
> +WITH_DESKTOP=1
> WITH_BASH=1
> WITH_RUBY=1
> WITH_ZSH=1
> @@ -141,6 +142,7 @@ Some features can be disabled (--with-feature=no is equivalent to
> --without-docs Do not install documentation
> --without-api-docs Do not install API man page
> --without-emacs Do not install lisp file
> + --without-desktop Do not install desktop file
> --without-ruby Do not install ruby bindings
> --without-zsh-completion Do not install zsh completions files
> --without-retry-lock Do not use blocking xapian opens, even if available
> @@ -209,6 +211,14 @@ for option; do
> fi
> elif [ "${option}" = '--without-emacs' ] ; then
> WITH_EMACS=0
> + elif [ "${option%%=*}" = '--with-desktop' ]; then
> + if [ "${option#*=}" = 'no' ]; then
> + WITH_DESKTOP=0
> + else
> + WITH_DESKTOP=1
> + fi
> + elif [ "${option}" = '--without-desktop' ] ; then
> + WITH_DESKTOP=0
> elif [ "${option%%=*}" = '--with-bash-completion' ]; then
> if [ "${option#*=}" = 'no' ]; then
> WITH_BASH=0
> @@ -1123,6 +1133,9 @@ VALGRIND_CFLAGS = ${valgrind_cflags}
> # Support for emacs
> WITH_EMACS = ${WITH_EMACS}
>
> +# Support for desktop file
> +WITH_DESKTOP = ${WITH_DESKTOP}
> +
> # Support for bash completion
> WITH_BASH = ${WITH_BASH}
>
> diff --git a/emacs/Makefile.local b/emacs/Makefile.local
> index b47577ac1110..ffa8421ebd45 100644
> --- a/emacs/Makefile.local
> +++ b/emacs/Makefile.local
> @@ -96,10 +96,9 @@ endif
> install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
> mkdir -p "$(DESTDIR)$(prefix)/bin/"
> install $(emacs_mua) "$(DESTDIR)$(prefix)/bin"
> -
> -.PHONY: install-desktop
> -install-desktop:
> +ifeq ($(WITH_DESKTOP),1)
> mkdir -p "$(DESTDIR)$(desktop_dir)"
> desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop)
> +endif
>
> CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el
> --
> 2.1.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v3] build: install notmuch-emacs-mua.desktop file with emacs
2016-11-25 16:39 ` Tomi Ollila
@ 2016-11-26 9:37 ` Jani Nikula
2016-11-26 17:07 ` Tomi Ollila
2016-11-29 2:09 ` David Bremner
0 siblings, 2 replies; 19+ messages in thread
From: Jani Nikula @ 2016-11-26 9:37 UTC (permalink / raw)
To: Tomi Ollila, notmuch
There is really no need to have a separate install target for the
desktop file. Just install the desktop file with emacs, with a
configure option to opt out.
---
v3: check for desktop-file-install in configure.
I don't see a reason to differentiate between "with desktop" and "have
desktop-file-install", so I'm simply setting WITH_DESKTOP=0 if
desktop-file-install is not available.
---
configure | 23 +++++++++++++++++++++++
emacs/Makefile.local | 5 ++---
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index f0fc466eead5..72db26dfc52e 100755
--- a/configure
+++ b/configure
@@ -70,6 +70,7 @@ LIBDIR=
WITH_DOCS=1
WITH_API_DOCS=1
WITH_EMACS=1
+WITH_DESKTOP=1
WITH_BASH=1
WITH_RUBY=1
WITH_ZSH=1
@@ -141,6 +142,7 @@ Some features can be disabled (--with-feature=no is equivalent to
--without-docs Do not install documentation
--without-api-docs Do not install API man page
--without-emacs Do not install lisp file
+ --without-desktop Do not install desktop file
--without-ruby Do not install ruby bindings
--without-zsh-completion Do not install zsh completions files
--without-retry-lock Do not use blocking xapian opens, even if available
@@ -209,6 +211,14 @@ for option; do
fi
elif [ "${option}" = '--without-emacs' ] ; then
WITH_EMACS=0
+ elif [ "${option%%=*}" = '--with-desktop' ]; then
+ if [ "${option#*=}" = 'no' ]; then
+ WITH_DESKTOP=0
+ else
+ WITH_DESKTOP=1
+ fi
+ elif [ "${option}" = '--without-desktop' ] ; then
+ WITH_DESKTOP=0
elif [ "${option%%=*}" = '--with-bash-completion' ]; then
if [ "${option#*=}" = 'no' ]; then
WITH_BASH=0
@@ -602,6 +612,16 @@ if [ $WITH_DOCS = "1" ] ; then
fi
fi
+if [ $WITH_DESKTOP = "1" ]; then
+ printf "Checking if desktop-file-install is available... "
+ if command -v desktop-file-install > /dev/null; then
+ printf "Yes.\n"
+ else
+ printf "No (so will not install .desktop file).\n"
+ WITH_DESKTOP=0
+ fi
+fi
+
libdir_in_ldconfig=0
printf "Checking which platform we are on... "
@@ -1123,6 +1143,9 @@ VALGRIND_CFLAGS = ${valgrind_cflags}
# Support for emacs
WITH_EMACS = ${WITH_EMACS}
+# Support for desktop file
+WITH_DESKTOP = ${WITH_DESKTOP}
+
# Support for bash completion
WITH_BASH = ${WITH_BASH}
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index b47577ac1110..ffa8421ebd45 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -96,10 +96,9 @@ endif
install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
mkdir -p "$(DESTDIR)$(prefix)/bin/"
install $(emacs_mua) "$(DESTDIR)$(prefix)/bin"
-
-.PHONY: install-desktop
-install-desktop:
+ifeq ($(WITH_DESKTOP),1)
mkdir -p "$(DESTDIR)$(desktop_dir)"
desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop)
+endif
CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v3] build: install notmuch-emacs-mua.desktop file with emacs
2016-11-26 9:37 ` [PATCH v3] " Jani Nikula
@ 2016-11-26 17:07 ` Tomi Ollila
2016-11-29 2:09 ` David Bremner
1 sibling, 0 replies; 19+ messages in thread
From: Tomi Ollila @ 2016-11-26 17:07 UTC (permalink / raw)
To: notmuch
On Sat, Nov 26 2016, Jani Nikula <jani@nikula.org> wrote:
> There is really no need to have a separate install target for the
> desktop file. Just install the desktop file with emacs, with a
> configure option to opt out.
>
> ---
>
> v3: check for desktop-file-install in configure.
This and the next change LGTM.
>
> I don't see a reason to differentiate between "with desktop" and "have
> desktop-file-install", so I'm simply setting WITH_DESKTOP=0 if
> desktop-file-install is not available.
> ---
> configure | 23 +++++++++++++++++++++++
> emacs/Makefile.local | 5 ++---
> 2 files changed, 25 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index f0fc466eead5..72db26dfc52e 100755
> --- a/configure
> +++ b/configure
> @@ -70,6 +70,7 @@ LIBDIR=
> WITH_DOCS=1
> WITH_API_DOCS=1
> WITH_EMACS=1
> +WITH_DESKTOP=1
> WITH_BASH=1
> WITH_RUBY=1
> WITH_ZSH=1
> @@ -141,6 +142,7 @@ Some features can be disabled (--with-feature=no is equivalent to
> --without-docs Do not install documentation
> --without-api-docs Do not install API man page
> --without-emacs Do not install lisp file
> + --without-desktop Do not install desktop file
> --without-ruby Do not install ruby bindings
> --without-zsh-completion Do not install zsh completions files
> --without-retry-lock Do not use blocking xapian opens, even if available
> @@ -209,6 +211,14 @@ for option; do
> fi
> elif [ "${option}" = '--without-emacs' ] ; then
> WITH_EMACS=0
> + elif [ "${option%%=*}" = '--with-desktop' ]; then
> + if [ "${option#*=}" = 'no' ]; then
> + WITH_DESKTOP=0
> + else
> + WITH_DESKTOP=1
> + fi
> + elif [ "${option}" = '--without-desktop' ] ; then
> + WITH_DESKTOP=0
> elif [ "${option%%=*}" = '--with-bash-completion' ]; then
> if [ "${option#*=}" = 'no' ]; then
> WITH_BASH=0
> @@ -602,6 +612,16 @@ if [ $WITH_DOCS = "1" ] ; then
> fi
> fi
>
> +if [ $WITH_DESKTOP = "1" ]; then
> + printf "Checking if desktop-file-install is available... "
> + if command -v desktop-file-install > /dev/null; then
> + printf "Yes.\n"
> + else
> + printf "No (so will not install .desktop file).\n"
> + WITH_DESKTOP=0
> + fi
> +fi
> +
> libdir_in_ldconfig=0
>
> printf "Checking which platform we are on... "
> @@ -1123,6 +1143,9 @@ VALGRIND_CFLAGS = ${valgrind_cflags}
> # Support for emacs
> WITH_EMACS = ${WITH_EMACS}
>
> +# Support for desktop file
> +WITH_DESKTOP = ${WITH_DESKTOP}
> +
> # Support for bash completion
> WITH_BASH = ${WITH_BASH}
>
> diff --git a/emacs/Makefile.local b/emacs/Makefile.local
> index b47577ac1110..ffa8421ebd45 100644
> --- a/emacs/Makefile.local
> +++ b/emacs/Makefile.local
> @@ -96,10 +96,9 @@ endif
> install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
> mkdir -p "$(DESTDIR)$(prefix)/bin/"
> install $(emacs_mua) "$(DESTDIR)$(prefix)/bin"
> -
> -.PHONY: install-desktop
> -install-desktop:
> +ifeq ($(WITH_DESKTOP),1)
> mkdir -p "$(DESTDIR)$(desktop_dir)"
> desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop)
> +endif
>
> CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el
> --
> 2.1.4
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v3] build: install notmuch-emacs-mua.desktop file with emacs
2016-11-26 9:37 ` [PATCH v3] " Jani Nikula
2016-11-26 17:07 ` Tomi Ollila
@ 2016-11-29 2:09 ` David Bremner
1 sibling, 0 replies; 19+ messages in thread
From: David Bremner @ 2016-11-29 2:09 UTC (permalink / raw)
To: Jani Nikula, Tomi Ollila, notmuch
Jani Nikula <jani@nikula.org> writes:
> There is really no need to have a separate install target for the
> desktop file. Just install the desktop file with emacs, with a
> configure option to opt out.
>
> ---
>
> v3: check for desktop-file-install in configure.
>
pushed to master.
d
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v2 9/9] build: update the desktop database after installing the desktop file
2016-11-21 21:13 [PATCH v2 0/9] improvements around notmuch-emacs-mua Jani Nikula
` (7 preceding siblings ...)
2016-11-21 21:13 ` [PATCH v2 8/9] build: install notmuch-emacs-mua.desktop file with emacs Jani Nikula
@ 2016-11-21 21:13 ` Jani Nikula
2016-11-26 9:43 ` [PATCH v3] " Jani Nikula
8 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2016-11-21 21:13 UTC (permalink / raw)
To: notmuch
This makes the option to choose Notmuch as mailto: handler show up in
the desktop environment settings.
---
emacs/Makefile.local | 1 +
1 file changed, 1 insertion(+)
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index ffa8421ebd45..de4f40d1316b 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -99,6 +99,7 @@ endif
ifeq ($(WITH_DESKTOP),1)
mkdir -p "$(DESTDIR)$(desktop_dir)"
desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop)
+ update-desktop-database "$(DESTDIR)$(desktop_dir)"
endif
CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v3] build: update the desktop database after installing the desktop file
2016-11-21 21:13 ` [PATCH v2 9/9] build: update the desktop database after installing the desktop file Jani Nikula
@ 2016-11-26 9:43 ` Jani Nikula
2016-11-29 2:10 ` David Bremner
0 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2016-11-26 9:43 UTC (permalink / raw)
To: notmuch, Tomi Ollila
This makes the option to choose Notmuch as mailto: handler show up in
the desktop environment settings. Ignore errors.
---
v3: ignore errors on update-desktop-database. I don't want to skip
desktop-file-install if update-desktop-database is not available, and
if update fails, it's likely a transient error anyway.
---
emacs/Makefile.local | 1 +
1 file changed, 1 insertion(+)
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index ffa8421ebd45..5fff019da73d 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -99,6 +99,7 @@ endif
ifeq ($(WITH_DESKTOP),1)
mkdir -p "$(DESTDIR)$(desktop_dir)"
desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop)
+ -update-desktop-database "$(DESTDIR)$(desktop_dir)"
endif
CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el
--
2.1.4
^ permalink raw reply related [flat|nested] 19+ messages in thread