Hello community,
here is the log from the commit of package maildir-utils for openSUSE:Factory
checked in at 2020-05-19 14:45:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maildir-utils (Old)
and /work/SRC/openSUSE:Factory/.maildir-utils.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maildir-utils"
Tue May 19 14:45:24 2020 rev:15 rq:806278 version:1.4.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/maildir-utils/maildir-utils.changes
2020-05-11 13:44:40.649542658 +0200
+++ /work/SRC/openSUSE:Factory/.maildir-utils.new.2738/maildir-utils.changes
2020-05-19 14:45:28.343684233 +0200
@@ -1,0 +2,10 @@
+Sun May 17 18:24:09 UTC 2020 - Michael Vetter <mvet...@suse.com>
+
+- Update to 1.4.6:
+ * mu: always sort descending within threads
+ * mu-server: disable readline support for now
+ * Fix make-mu4e-context-account
+ * mu4e-compose: fix external use (`compose-mail')
+ * mu4e: support 'no trash flag' for all mark-for-trash
+
+-------------------------------------------------------------------
Old:
----
mu-1.4.5.tar.xz
New:
----
mu-1.4.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maildir-utils.spec ++++++
--- /var/tmp/diff_new_pack.y9w5Y1/_old 2020-05-19 14:45:29.987687746 +0200
+++ /var/tmp/diff_new_pack.y9w5Y1/_new 2020-05-19 14:45:29.991687754 +0200
@@ -17,7 +17,7 @@
Name: maildir-utils
-Version: 1.4.5
+Version: 1.4.6
Release: 0
Summary: Maildir indexer and searcher
License: GPL-3.0-or-later
++++++ mu-1.4.5.tar.xz -> mu-1.4.6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/Makefile.in new/mu-1.4.6/Makefile.in
--- old/mu-1.4.5/Makefile.in 2020-05-10 10:59:42.000000000 +0200
+++ new/mu-1.4.6/Makefile.in 2020-05-17 13:55:04.000000000 +0200
@@ -15,7 +15,7 @@
@SET_MAKE@
# aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Sun May 10 11:59:42 EEST 2020
+# from AX_AM_MACROS_STATIC on Sun May 17 14:55:04 EEST 2020
VPATH = @srcdir@
am__is_gnu_make = { \
@@ -234,10 +234,10 @@
$(top_srcdir)/build-aux/missing $(top_srcdir)/gtest.mk AUTHORS \
COPYING ChangeLog INSTALL NEWS README TODO build-aux/compile \
build-aux/config.guess build-aux/config.rpath \
- build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \
- build-aux/mdate-sh build-aux/missing build-aux/texinfo.tex \
- compile config.guess config.sub depcomp install-sh ltmain.sh \
- missing
+ build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+ build-aux/ltmain.sh build-aux/mdate-sh build-aux/missing \
+ build-aux/texinfo.tex compile config.guess config.sub depcomp \
+ install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/NEWS.org new/mu-1.4.6/NEWS.org
--- old/mu-1.4.5/NEWS.org 2020-05-05 20:45:11.000000000 +0200
+++ new/mu-1.4.6/NEWS.org 2020-05-17 08:54:14.000000000 +0200
@@ -90,7 +90,7 @@
extensible.
- ~mu4e~ recognizes an attribute ~:hide t~, which will hide the bookmark
item
- from the main-screen (and speedbar), but keep it avilable through the
+ from the main-screen (and speedbar), but keep it available through the
completion UI.
- ~mu4e-maildir-shortcuts~ have also become plists. The older format is
still
@@ -109,8 +109,7 @@
the default directory for inclusion.
- The mu4e <-> mu interaction has been rewritten to communicate using
- s-expressions, with a repl for testing. If you have readline installed,
- you also get history.
+ s-expressions, with a repl for testing.
*** toys
@@ -254,7 +253,7 @@
- fix a crash when running on OpenBSD
- fix --clear-links (broken filenames)
- You can now set the MU_HOME environment variable as an
- alternative way of setting the mu homedir via the --muhome commadn-line
+ alternative way of setting the mu homedir via the --muhome command-line
parameter.
*** mu4e
@@ -366,7 +365,7 @@
- bump version to 0.9.15. From now on, odd minor version numbers
are for development versions; thus, 0.9.16 is to be the next stable
release.
- - special case text/calendar attachements to get .vcs
+ - special case text/calendar attachments to get .vcs
extensions. This makes it easier to process those with external tools.
- change the message file names to better conform to the maildir
spec; this was confusing some tools.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/aminclude_static.am
new/mu-1.4.6/aminclude_static.am
--- old/mu-1.4.5/aminclude_static.am 2020-05-10 10:59:42.000000000 +0200
+++ new/mu-1.4.6/aminclude_static.am 2020-05-17 13:55:04.000000000 +0200
@@ -1,6 +1,6 @@
# aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Sun May 10 11:59:42 EEST 2020
+# from AX_AM_MACROS_STATIC on Sun May 17 14:55:04 EEST 2020
# Code coverage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/configure new/mu-1.4.6/configure
--- old/mu-1.4.5/configure 2020-05-10 10:59:41.000000000 +0200
+++ new/mu-1.4.6/configure 2020-05-17 13:55:05.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mu 1.4.5.
+# Generated by GNU Autoconf 2.69 for mu 1.4.6.
#
# Report bugs to <https://github.com/djcb/mu/issues>.
#
@@ -592,8 +592,8 @@
# Identity of this package.
PACKAGE_NAME='mu'
PACKAGE_TARNAME='mu'
-PACKAGE_VERSION='1.4.5'
-PACKAGE_STRING='mu 1.4.5'
+PACKAGE_VERSION='1.4.6'
+PACKAGE_STRING='mu 1.4.6'
PACKAGE_BUGREPORT='https://github.com/djcb/mu/issues'
PACKAGE_URL=''
@@ -1448,7 +1448,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mu 1.4.5 to adapt to many kinds of systems.
+\`configure' configures mu 1.4.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1518,7 +1518,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mu 1.4.5:";;
+ short | recursive ) echo "Configuration of mu 1.4.6:";;
esac
cat <<\_ACEOF
@@ -1689,7 +1689,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mu configure 1.4.5
+mu configure 1.4.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2238,7 +2238,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mu $as_me 1.4.5, which was
+It was created by mu $as_me 1.4.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3215,7 +3215,7 @@
# Define the identity of the package.
PACKAGE='mu'
- VERSION='1.4.5'
+ VERSION='1.4.6'
cat >>confdefs.h <<_ACEOF
@@ -24288,7 +24288,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mu $as_me 1.4.5, which was
+This file was extended by mu $as_me 1.4.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24354,7 +24354,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mu config.status 1.4.5
+mu config.status 1.4.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/configure.ac new/mu-1.4.6/configure.ac
--- old/mu-1.4.5/configure.ac 2020-05-10 10:58:42.000000000 +0200
+++ new/mu-1.4.6/configure.ac 2020-05-17 13:53:18.000000000 +0200
@@ -15,7 +15,7 @@
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
AC_PREREQ([2.68])
-AC_INIT([mu],[1.4.5],[https://github.com/djcb/mu/issues],[mu])
+AC_INIT([mu],[1.4.6],[https://github.com/djcb/mu/issues],[mu])
AC_COPYRIGHT([Copyright (C) 2008-2020 Dirk-Jan C. Binnema])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([mu/mu.cc])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/Makefile.am new/mu-1.4.6/lib/Makefile.am
--- old/mu-1.4.5/lib/Makefile.am 2020-04-29 10:39:03.000000000 +0200
+++ new/mu-1.4.6/lib/Makefile.am 2020-05-17 08:54:14.000000000 +0200
@@ -15,7 +15,7 @@
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# enforce compiling guile (optionally) first,then this dir first
-# before decending into tests/
+# before descending into tests/
include $(top_srcdir)/gtest.mk
SUBDIRS= utils query
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/Makefile.in new/mu-1.4.6/lib/Makefile.in
--- old/mu-1.4.5/lib/Makefile.in 2020-05-10 10:59:42.000000000 +0200
+++ new/mu-1.4.6/lib/Makefile.in 2020-05-17 13:55:05.000000000 +0200
@@ -15,7 +15,7 @@
@SET_MAKE@
# aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Sun May 10 11:59:42 EEST 2020
+# from AX_AM_MACROS_STATIC on Sun May 17 14:55:04 EEST 2020
VPATH = @srcdir@
@@ -738,7 +738,7 @@
test-mu-store test-mu-flags test-mu-container test-mu-contacts
# enforce compiling guile (optionally) first,then this dir first
-# before decending into tests/
+# before descending into tests/
SUBDIRS = utils query
@HAVE_JSON_GLIB_TRUE@json_srcs = \
@HAVE_JSON_GLIB_TRUE@ mu-msg-json.c
\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/mu-contacts.hh
new/mu-1.4.6/lib/mu-contacts.hh
--- old/mu-1.4.5/lib/mu-contacts.hh 2020-02-18 20:18:37.000000000 +0100
+++ new/mu-1.4.6/lib/mu-contacts.hh 2020-05-17 13:53:18.000000000 +0200
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 2019 Dirk-Jan C. Binnema <d...@djcbsoftware.nl>
+** Copyright (C) 2020 Dirk-Jan C. Binnema <d...@djcbsoftware.nl>
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the
@@ -64,7 +64,7 @@
time_t last_seen; /**< when was this contact last seen? */
std::size_t freq; /**< how often was this contact seen? */
- int64_t tstamp; /**< Time-stamp, as per g_get_monotonic_time
*/
+ int64_t tstamp; /**< Time-stamp, as per g_get_monotonic_time
*/
};
/// All contacts
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/mu-container.c
new/mu-1.4.6/lib/mu-container.c
--- old/mu-1.4.5/lib/mu-container.c 2020-03-02 21:39:04.000000000 +0100
+++ new/mu-1.4.6/lib/mu-container.c 2020-05-17 13:53:18.000000000 +0200
@@ -365,10 +365,7 @@
static int
sort_func_child (MuContainer *a, MuContainer *b, SortFuncData *data)
{
- if (data->descending)
- return container_cmp (a, b, data->mfid);
- else
- return container_cmp (b, a, data->mfid);
+ return container_cmp (a, b, data->mfid);
}
static MuContainer*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/mu-container.h
new/mu-1.4.6/lib/mu-container.h
--- old/mu-1.4.5/lib/mu-container.h 2018-07-21 08:42:43.000000000 +0200
+++ new/mu-1.4.6/lib/mu-container.h 2020-05-17 08:54:14.000000000 +0200
@@ -168,7 +168,7 @@
gpointer user_data);
/**
- * check wither container needle is a child or sibling (recursively)
+ * check whether container needle is a child or sibling (recursively)
* of container haystack
*
* @param haystack a container
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/mu-index.h new/mu-1.4.6/lib/mu-index.h
--- old/mu-1.4.5/lib/mu-index.h 2020-04-29 17:24:41.000000000 +0200
+++ new/mu-1.4.6/lib/mu-index.h 2020-05-17 08:54:14.000000000 +0200
@@ -35,7 +35,7 @@
unsigned _processed; /* number of msgs processed or counted */
unsigned _updated; /* number of msgs new or updated */
unsigned _cleaned_up; /* number of msgs cleaned up */
- unsigned _uptodate; /* number of msgs already uptodate */
+ unsigned _uptodate; /* number of msgs already up-to-date */
};
typedef struct _MuIndexStats MuIndexStats;
@@ -94,7 +94,7 @@
* @param enter did we enter (TRUE) or leave(FALSE) the dir?
* @param user_data pointer to user data
*
- * @return MU_OK to contiue, MU_STOP to stopd or MU_ERROR in
+ * @return MU_OK to continue, MU_STOP to stopd or MU_ERROR in
* case of some error.
*/
typedef MuError (*MuIndexDirCallback) (const char* path, gboolean enter,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/query/Makefile.in
new/mu-1.4.6/lib/query/Makefile.in
--- old/mu-1.4.5/lib/query/Makefile.in 2020-05-10 10:59:42.000000000 +0200
+++ new/mu-1.4.6/lib/query/Makefile.in 2020-05-17 13:55:05.000000000 +0200
@@ -15,7 +15,7 @@
@SET_MAKE@
# aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Sun May 10 11:59:42 EEST 2020
+# from AX_AM_MACROS_STATIC on Sun May 17 14:55:04 EEST 2020
VPATH = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/utils/Makefile.in
new/mu-1.4.6/lib/utils/Makefile.in
--- old/mu-1.4.5/lib/utils/Makefile.in 2020-05-10 10:59:42.000000000 +0200
+++ new/mu-1.4.6/lib/utils/Makefile.in 2020-05-17 13:55:05.000000000 +0200
@@ -15,7 +15,7 @@
@SET_MAKE@
# aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Sun May 10 11:59:42 EEST 2020
+# from AX_AM_MACROS_STATIC on Sun May 17 14:55:04 EEST 2020
VPATH = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/utils/mu-command-parser.hh
new/mu-1.4.6/lib/utils/mu-command-parser.hh
--- old/mu-1.4.5/lib/utils/mu-command-parser.hh 2020-04-29 16:57:04.000000000
+0200
+++ new/mu-1.4.6/lib/utils/mu-command-parser.hh 2020-05-17 08:54:14.000000000
+0200
@@ -38,12 +38,13 @@
/// Commands are s-expressions with the follow properties:
/// 1) a command is a list with a command-name as its first argument
-/// 2) the rest of the parameters are pairs of colon-prefixed symbol and a
value of some type
-/// (ie. 'keyword arguments')
+/// 2) the rest of the parameters are pairs of colon-prefixed symbol and a
value of some
+/// type (ie. 'keyword arguments')
/// 3) each command is described by its CommandInfo structure, which defines
the type
/// 4) calls to the command must include all required parameters
/// 5) all parameters must be of the specified type; however the symbol 'nil'
is allowed
-/// for specify a non-required parameter to be absent; this is for
convience on the call side.
+/// for specify a non-required parameter to be absent; this is for
convenience on the
+/// call side.
/// Information about a function argument
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/utils/mu-util.h
new/mu-1.4.6/lib/utils/mu-util.h
--- old/mu-1.4.5/lib/utils/mu-util.h 2020-03-02 21:39:04.000000000 +0100
+++ new/mu-1.4.6/lib/utils/mu-util.h 2020-05-17 08:54:14.000000000 +0200
@@ -51,7 +51,7 @@
/**
* guess the maildir; first try $MAILDIR; if it is unset or
- * non-existant, try ~/Maildir if both fail, return NULL
+ * non-existent, try ~/Maildir if both fail, return NULL
*
* @return full path of the guessed Maildir, or NULL; must be freed (gfree)
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/lib/utils/mu-utils.hh
new/mu-1.4.6/lib/utils/mu-utils.hh
--- old/mu-1.4.5/lib/utils/mu-utils.hh 2020-03-02 21:39:04.000000000 +0100
+++ new/mu-1.4.6/lib/utils/mu-utils.hh 2020-05-17 08:54:14.000000000 +0200
@@ -103,7 +103,7 @@
* @param first whether to fill out incomplete dates to the start or the end;
* ie. either 1972 -> 197201010000 or 1972 -> 197212312359
*
- * @return the corresponding time_t expressed as a strng
+ * @return the corresponding time_t expressed as a string
*/
std::string date_to_time_t_string (const std::string& date, bool first);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/man/mu-easy.1 new/mu-1.4.6/man/mu-easy.1
--- old/mu-1.4.5/man/mu-easy.1 2020-03-02 21:39:04.000000000 +0100
+++ new/mu-1.4.6/man/mu-easy.1 2020-05-17 08:54:14.000000000 +0200
@@ -254,7 +254,7 @@
\fB$ mu find --fields="l" t:julius fruit\fR
.fi
-And we'll get someting like:
+And we'll get something like:
.nf
/home/someuser/Maildir/archive/cur/1266188485_0.6850.cthulhu:2,
.fi
@@ -269,7 +269,7 @@
Date: 2008-07-31T21:57:25 EEST
OF Mans First Disobedience, and the Fruit
- Of that Forbidden Tree, whose mortal tast
+ Of that Forbidden Tree, whose mortal taste
Brought Death into the World, and all our woe,
[...]
.fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/man/mu-find.1 new/mu-1.4.6/man/mu-find.1
--- old/mu-1.4.5/man/mu-find.1 2020-02-18 20:18:38.000000000 +0100
+++ new/mu-1.4.6/man/mu-find.1 2020-05-17 08:54:14.000000000 +0200
@@ -219,7 +219,7 @@
\fBofflineimap\fR.
.TP
-\fB\-\-include\-related\fR,\fB-r\fR also include messages being refered to by
+\fB\-\-include\-related\fR,\fB-r\fR also include messages being referred to by
the matched messages -- i.e.. include messages that are part of the same
message thread as some matched messages. This is useful if you want
Gmail-style 'conversations'. Note, finding these related messages make
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/man/mu-query.7 new/mu-1.4.6/man/mu-query.7
--- old/mu-1.4.5/man/mu-query.7 2020-05-04 20:03:44.000000000 +0200
+++ new/mu-1.4.6/man/mu-query.7 2020-05-17 08:54:14.000000000 +0200
@@ -162,7 +162,7 @@
from:foo@bar
.EX2
For queries that are not one-off, we would recommend the longer name
-for readabilty.
+for readability.
There are also the special fields \fBcontact:\fR, which matches all
contact-fields (\fIfrom\fR, \fIto\fR, \fIcc\fR and \fIbcc\fR), and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/man/mu.1 new/mu-1.4.6/man/mu.1
--- old/mu-1.4.5/man/mu.1 2020-04-19 23:01:07.000000000 +0200
+++ new/mu-1.4.6/man/mu.1 2020-05-17 08:54:14.000000000 +0200
@@ -115,7 +115,7 @@
.SH DATABASE AND FILE
Commands \fBmu index\fR and \fBfind\fR and \fBcfind\fR work with the database,
-while the other ones work on invidual mail files. Hence, running \fBview\fR,
+while the other ones work on individual mail files. Hence, running \fBview\fR,
\fBmkdir\fR and \fBextract\fR does not require the mu database.
The various commands are discussed in more detail in their own separate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu/Makefile.in new/mu-1.4.6/mu/Makefile.in
--- old/mu-1.4.5/mu/Makefile.in 2020-05-10 10:59:42.000000000 +0200
+++ new/mu-1.4.6/mu/Makefile.in 2020-05-17 13:55:05.000000000 +0200
@@ -15,7 +15,7 @@
@SET_MAKE@
# aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Sun May 10 11:59:42 EEST 2020
+# from AX_AM_MACROS_STATIC on Sun May 17 14:55:04 EEST 2020
VPATH = @srcdir@
am__is_gnu_make = { \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu/mu-cmd-server.cc
new/mu-1.4.6/mu/mu-cmd-server.cc
--- old/mu-1.4.5/mu/mu-cmd-server.cc 2020-05-05 10:33:19.000000000 +0200
+++ new/mu-1.4.6/mu/mu-cmd-server.cc 2020-05-17 08:54:14.000000000 +0200
@@ -20,7 +20,6 @@
#include "config.h"
#include "mu-cmd.h"
-
#include <iostream>
#include <string>
#include <algorithm>
@@ -29,33 +28,6 @@
#include <glib.h>
#include <glib/gprintf.h>
-#ifdef HAVE_LIBREADLINE
-# if defined(HAVE_READLINE_READLINE_H)
-# include <readline/readline.h>
-# elif defined(HAVE_READLINE_H)
-# include <readline.h>
-# else /* !defined(HAVE_READLINE_H) */
-extern char *readline ();
-# endif /* !defined(HAVE_READLINE_H) */
-char *cmdline = NULL;
-#else /* !defined(HAVE_READLINE_READLINE_H) */
- /* no readline */
-#endif /* HAVE_LIBREADLINE */
-
-#ifdef HAVE_READLINE_HISTORY
-# if defined(HAVE_READLINE_HISTORY_H)
-# include <readline/history.h>
-# elif defined(HAVE_HISTORY_H)
-# include <history.h>
-# else /* !defined(HAVE_HISTORY_H) */
-extern void add_history ();
-extern int write_history ();
-extern int read_history ();
-# endif /* defined(HAVE_READLINE_HISTORY_H) */
- /* no history */
-#endif /* HAVE_READLINE_HISTORY */
-
-
#include "mu-runtime.h"
#include "mu-cmd.h"
#include "mu-maildir.h"
@@ -430,7 +402,7 @@
const unsigned docid{(unsigned)get_int_or(params, "docid")};
auto msg{mu_store_get_msg (context.store, docid, &gerr)};
if (!msg)
- throw Error{Error::Code::Store, &gerr, "faile to get
message %u", docid};
+ throw Error{Error::Code::Store, &gerr, "failed to get
message %u", docid};
const auto opts{message_options(params)};
sexp = mu_msg_to_sexp (msg, docid, NULL, opts);
@@ -784,7 +756,7 @@
std::cout << ";; Commands are s-expressions of the form\n"
<< ";; (<command-name> :param1 val1 :param2 val2
...)\n"
<< ";; For instance:\n;; (help :command quit)\n"
- << ";; to get information about the 'quit'
commmand\n;;\n";
+ << ";; to get information about the 'quit'
command\n;;\n";
std::cout << ";; The following commands are available:\n";
}
@@ -1299,59 +1271,8 @@
}
-struct Readline {
- Readline (const std::string& histpath, size_t max_lines);
- ~Readline();
- std::string read_line(bool& do_quit);
- void save_line(const std::string& line);
- std::string histpath_;
- size_t max_lines_{0};
-};
-
-/// Wrapper around readline (if available) or nothing otherwise.
-#if defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_HISTORY)
-Readline::Readline (const std::string& histpath, size_t max_lines):
- histpath_{histpath}, max_lines_{max_lines}
-{
- rl_bind_key('\t', rl_insert); // default (filenames) is not useful
- using_history();
- read_history (histpath_.c_str());
-
- if (max_lines_ > 0)
- stifle_history(max_lines_);
-}
-
-Readline::~Readline () {
- write_history(histpath_.c_str());
- if (max_lines_ > 0)
- history_truncate_file (histpath_.c_str(), max_lines_);
-}
-
-std::string
-Readline::read_line(bool& do_quit)
-{
- auto buf = readline(";; mu% ");
- if (!buf) {
- do_quit = true;
- return {};
- }
- std::string line{buf};
- ::free (buf);
- return line;
-}
-
-void
-Readline::save_line(const std::string& line)
-{
- add_history(line.c_str());
-}
-#else
-Readline::Readline (const std::string& histpath, size_t max_lines) {}
-Readline::~Readline() {}
-void Readline::save_line(const std::string& line) {}
-
-std::string
-Readline::read_line(bool& do_quit)
+static std::string
+read_line(bool& do_quit)
{
std::string line;
std::cout << ";; mu> ";
@@ -1359,8 +1280,6 @@
do_quit = true;
return line;
}
-#endif // ! defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_HISTORY)
-
MuError
mu_cmd_server (MuConfig *opts, GError **err) try
@@ -1381,9 +1300,6 @@
return MU_OK;
}
- const auto
histpath{std::string{mu_runtime_path(MU_RUNTIME_PATH_CACHE)} + "/history"};
- Readline readline(histpath, 50);
-
install_sig_handler();
std::cout << ";; Welcome to the " << PACKAGE_STRING << "
command-server\n"
<< ";; Use (help) to get a list of commands, (quit) to
quit.\n";
@@ -1392,12 +1308,11 @@
std::string line;
try {
- line = readline.read_line(context.do_quit);
+ line = read_line(context.do_quit);
if (line.find_first_not_of(" \t") == std::string::npos)
continue; // skip whitespace-only lines
auto call{Sexp::parse(line)};
- readline.save_line(line);
invoke(context.command_map, call);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu/mu-cmd.c new/mu-1.4.6/mu/mu-cmd.c
--- old/mu-1.4.5/mu/mu-cmd.c 2020-04-29 14:54:45.000000000 +0200
+++ new/mu-1.4.6/mu/mu-cmd.c 2020-05-17 08:54:14.000000000 +0200
@@ -586,7 +586,7 @@
mu_store_print_info (store, opts->nocolor);
g_print ("\nstore created.\n"
"use 'mu index' to fill the database "
- "with your messsages.\n"
+ "with your messages.\n"
"see mu-index(1) for details\n");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu/test-mu-threads.c
new/mu-1.4.6/mu/test-mu-threads.c
--- old/mu-1.4.5/mu/test-mu-threads.c 2020-03-02 21:39:04.000000000 +0100
+++ new/mu-1.4.6/mu/test-mu-threads.c 2020-05-17 13:53:18.000000000 +0200
@@ -158,9 +158,9 @@
const tinfo items [] = {
{"0", "ro...@msg.id", "root0"},
- {"0:0", "child...@msg.id", "Re: child 0.1"},
- {"0:0:0", "child0....@msg.id", "Re: child 0.1.0"},
- {"0:1", "child...@msg.id", "Re: child 0.0"},
+ {"0:0", "child...@msg.id", "Re: child 0.0"},
+ {"0:1", "child...@msg.id", "Re: child 0.1"},
+ {"0:1:0", "child0....@msg.id", "Re: child 0.1.0"},
{"1", "ro...@msg.id", "root1"},
{"2", "ro...@msg.id", "root2"},
/* next one's been promoted 2.0.0 => 2.0 */
@@ -169,8 +169,8 @@
{"3", "child3.0.0....@msg.id", "Re: child 3.0.0.0"},
/* two children of absent root 4.0 */
- {"4:0", "child...@msg.id", "Re: child 4.1"},
- {"4:1", "child...@msg.id", "Re: child 4.0"}
+ {"4:0", "child...@msg.id", "Re: child 4.0"},
+ {"4:1", "child...@msg.id", "Re: child 4.1"}
};
xpath = fill_database (MU_TESTMAILDIR3);
@@ -194,17 +194,17 @@
tinfo *items;
tinfo items1 [] = {
- {"0", "cyc...@msg.id", "cycle0"},
- {"0:0", "cycle...@msg.id", "cycle0.0"},
+ {"0", "cyc...@msg.id", "cycle0"},
+ {"0:0", "cycle...@msg.id", "cycle0.0"},
{"0:0:0", "cycle0....@msg.id", "cycle0.0.0"},
- {"0:1", "rog...@msg.id", "rogue0"},
+ {"0:1", "rog...@msg.id", "rogue0"},
};
tinfo items2 [] = {
- {"0", "cycle...@msg.id", "cycle0.0"},
- {"0:0", "cycle0....@msg.id", "cycle0.0.0"},
- {"0:1", "cyc...@msg.id", "cycle0"},
- {"0:1:0", "rog...@msg.id", "rogue0" }
+ {"0", "cycle...@msg.id", "cycle0.0"},
+ {"0:0", "cyc...@msg.id", "cycle0"},
+ {"0:0:0", "rog...@msg.id", "rogue0" },
+ {"0:1", "cycle0....@msg.id", "cycle0.0.0"}
};
xpath = fill_database (MU_TESTMAILDIR3);
@@ -308,8 +308,8 @@
{ "0", "a...@msg.id", "A"},
{ "1", "d...@msg.id", "D"},
{ "2", "b...@msg.id", "B"},
- { "2:0", "e...@msg.id", "E"},
- { "2:1", "c...@msg.id", "C"},
+ { "2:0", "c...@msg.id", "C"},
+ { "2:1", "e...@msg.id", "E"},
};
const tinfo expected_desc [] = {
{ "0", "b...@msg.id", "B"},
@@ -334,8 +334,8 @@
const tinfo expected_asc [] = {
{ "0", "a...@msg.id", "A"},
{ "1", "d...@msg.id", "D"},
- { "2:0", "e...@msg.id", "E"},
- { "2:1", "c...@msg.id", "C"},
+ { "2:0", "c...@msg.id", "C"},
+ { "2:1", "e...@msg.id", "E"},
};
const tinfo expected_desc [] = {
{ "0:0", "c...@msg.id", "C"},
@@ -409,10 +409,10 @@
const tinfo expected_asc [] = {
{ "0", "a...@msg.id", "A"},
{ "1", "b...@msg.id", "B"},
- { "1:0", "e...@msg.id", "E"},
+ { "1:0", "c...@msg.id", "C"},
{ "1:1", "d...@msg.id", "D"},
{ "1:1:0", "f...@msg.id", "F"},
- { "1:2", "c...@msg.id", "C"},
+ { "1:2", "e...@msg.id", "E"},
{ "2", "g...@msg.id", "G"},
};
const tinfo expected_desc [] = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/mu4e-compose.el
new/mu-1.4.6/mu4e/mu4e-compose.el
--- old/mu-1.4.5/mu4e/mu4e-compose.el 2020-05-01 21:44:45.000000000 +0200
+++ new/mu-1.4.6/mu4e/mu4e-compose.el 2020-05-17 08:54:14.000000000 +0200
@@ -594,7 +594,7 @@
Optionally (when inline forwarding) INCLUDES contains a list of
(:file-name <filename> :mime-type <mime-type> :disposition <disposition>)
-for the attachements to include; file-name refers to
+for the attachments to include; file-name refers to
a file which our backend has conveniently saved for us (as a
tempfile)."
@@ -859,7 +859,7 @@
buffer buried."
;; create a new draft message 'resetting' (as below) is not actually needed
in this case, but
;; let's prepare for the re-edit case as well
- (mu4e~compose-handler 'new)
+ (mu4e~compose-handler-real 'new)
(when (message-goto-to) ;; reset to-address, if needed
(message-delete-line))
@@ -891,7 +891,11 @@
;; happily, we can re-use most things from message mode
;;;###autoload
(define-mail-user-agent 'mu4e-user-agent
- 'mu4e~compose-mail
+ (lambda (to subject other-headers continue switch-function yank-action
+ send-actions return-action)
+ (mu4e~start (lambda() (mu4e~compose-mail to subject other-headers continue
+ switch-function yank-action
+ send-actions return-action))))
'message-send-and-exit
'message-kill-buffer
'message-send-hook)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/mu4e-context.el
new/mu-1.4.6/mu4e/mu4e-context.el
--- old/mu-1.4.5/mu4e/mu4e-context.el 2020-05-09 22:15:12.000000000 +0200
+++ new/mu-1.4.6/mu4e/mu4e-context.el 2020-05-17 08:54:14.000000000 +0200
@@ -152,24 +152,24 @@
smtpmail-smtp-user (or smtpmail-smtp-user user-mail-address)
no-trash-flag (or no-trash-flag
(string-match (regexp-opt mu4e-no-trash-providers)
- user-mail-address)))
+ user-mail-address))
+ ;; TODO: Seems that mu4e fails to start when no default folder is set.
+ ;; The following setq is a workaround.
+ mu4e-drafts-folder (concat maildir drafts-folder)
+ mu4e-sent-folder (concat maildir sent-folder)
+ mu4e-trash-folder (concat maildir trash-folder)
+ mu4e-refile-folder (concat maildir refile-folder))
(when no-trash-flag
;; Exclude trash folder from all bookmarks. This is useful for mailboxes
;; which don't use the "trash" flag like Gmail.
(dolist (bookmark mu4e-bookmarks)
- ;; TODO: mu4e-bookmark-query does not work here, why?
- (setf (car bookmark) (format "NOT maildir:\"%s\" and %s"
- mu4e-trash-folder
- (car bookmark))))
+ (setq bookmark (plist-put bookmark :query
+ (format "NOT maildir:\"%s\" AND %s"
+ mu4e-trash-folder
+ (plist-get bookmark :query)))))
;; If this is a Gmail context, we add the maildir to the pattern list so
;; that they can be properly trashed.
(add-to-list 'mu4e-move-to-trash-patterns (concat "^" maildir)))
- ;; TODO: Seems that mu4e fails to start when no default folder is set.
- ;; The following setq is a workaround.
- (setq mu4e-drafts-folder (concat maildir drafts-folder)
- mu4e-sent-folder (concat maildir sent-folder)
- mu4e-trash-folder (concat maildir trash-folder)
- mu4e-refile-folder (concat maildir refile-folder))
(let ((context (make-mu4e-context :name name
:enter-func enter-func
:leave-func leave-func
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/mu4e-headers.el
new/mu-1.4.6/mu4e/mu4e-headers.el
--- old/mu-1.4.5/mu4e/mu4e-headers.el 2020-05-10 10:57:42.000000000 +0200
+++ new/mu-1.4.6/mu4e/mu4e-headers.el 2020-05-17 08:54:14.000000000 +0200
@@ -806,7 +806,6 @@
(mu4e~headers-defun-mark-for flag)
(mu4e~headers-defun-mark-for move)
(mu4e~headers-defun-mark-for read)
-(mu4e~headers-defun-mark-for trash)
(mu4e~headers-defun-mark-for unflag)
(mu4e~headers-defun-mark-for untrash)
(mu4e~headers-defun-mark-for unmark)
@@ -816,20 +815,18 @@
(defvar mu4e-move-to-trash-patterns '()
"List of regexps to match for moving to trash instead of flagging them.
This is particularly useful for mailboxes that don't use the
-trash flag like Gmail. See `mu4e-headers-mark-or-move-to-trash'
-and `mu4e-view-mark-or-move-to-trash'.")
+trash flag like Gmail. See `mu4e-view-mark-for-trash'.")
-(defun mu4e-headers-mark-or-move-to-trash ()
+(defun mu4e-headers-mark-for-trash ()
"Mark message for \"move\" to the trash folder if the message
maildir matches any regexp in `mu4e-move-to-trash-patterns'.
-Otherwise mark with the \"trash\" flag.
-Also see `mu4e-view-mark-or-move-to-trash'."
+Otherwise mark with the \"trash\" flag."
(interactive)
(let ((msg-dir (mu4e-message-field (mu4e-message-at-point) :maildir)))
(if (not (seq-filter (lambda (re)
(string-match re msg-dir))
mu4e-move-to-trash-patterns))
- (mu4e-headers-mark-for-trash)
+ (mu4e-headers-mark-and-next 'trash)
(mu4e-mark-set 'move (if (functionp mu4e-trash-folder)
(funcall mu4e-trash-folder
(mu4e-message-at-point))
(mu4e-get-trash-folder (mu4e-message-at-point))))
@@ -895,8 +892,8 @@
(define-key map "y" 'mu4e-select-other-view)
;; marking/unmarking ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- (define-key map (kbd "<backspace>")
'mu4e-headers-mark-or-move-to-trash)
- (define-key map (kbd "d")
'mu4e-headers-mark-or-move-to-trash)
+ (define-key map (kbd "<backspace>") 'mu4e-headers-mark-for-trash)
+ (define-key map (kbd "d") 'mu4e-headers-mark-for-trash)
(define-key map (kbd "<delete>") 'mu4e-headers-mark-for-delete)
(define-key map (kbd "<deletechar>") 'mu4e-headers-mark-for-delete)
(define-key map (kbd "D") 'mu4e-headers-mark-for-delete)
@@ -1412,7 +1409,7 @@
(unless (memq mark allowed-marks)
(mu4e-error "The mark (%s) has to be one of: %s"
mark allowed-marks)))
- ;; note: the tread id is shared by all messages in a thread
+ ;; note: the thread id is shared by all messages in a thread
(let* ((msg (mu4e-message-at-point))
(thread-id (mu4e~headers-get-thread-info msg 'thread-id))
(path (mu4e~headers-get-thread-info msg 'path))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/mu4e-main.el
new/mu-1.4.6/mu4e/mu4e-main.el
--- old/mu-1.4.5/mu4e/mu4e-main.el 2020-05-09 22:14:01.000000000 +0200
+++ new/mu-1.4.6/mu4e/mu4e-main.el 2020-05-17 08:54:14.000000000 +0200
@@ -33,7 +33,7 @@
;;; Mode
(defvar mu4e-main-buffer-hide-personal-addresses nil
- "Whether to hid trhe personal address in the main view. This
+ "Whether to hid the personal address in the main view. This
can be useful to avoid the noise when there are many.
This also hides the warning if your `user-mail-address' is not
@@ -269,7 +269,7 @@
(mu4e~main-menu))
;; `mu4e~main-view' is called from `mu4e~start', so don't call it
;; a second time here i.e. do not refresh unless specified
- ;; explicitely with REFRESH arg.
+ ;; explicitly with REFRESH arg.
(switch-to-buffer buf)
(with-current-buffer buf
(mu4e~main-view-real-1 refresh))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/mu4e-message.el
new/mu-1.4.6/mu4e/mu4e-message.el
--- old/mu-1.4.5/mu4e/mu4e-message.el 2020-03-02 21:40:49.000000000 +0100
+++ new/mu-1.4.6/mu4e/mu4e-message.el 2020-05-17 08:54:14.000000000 +0200
@@ -306,7 +306,7 @@
(defun mu4e-field-at-point (field)
"Get FIELD for the message at point.
-Eiter in the headers buffer or the view buffer. Field is a
+Either in the headers buffer or the view buffer. Field is a
symbol, see `mu4e-header-info'."
(plist-get (mu4e-message-at-point) field))
@@ -329,8 +329,8 @@
(let (
;; When HTML emails contain references to remote images,
;; retrieving these images leaks information. For example,
- ;; the sender can see when I openend the email and from which
- ;; computer (IP address). For this reason, it is preferrable
+ ;; the sender can see when I opened the email and from which
+ ;; computer (IP address). For this reason, it is preferable
;; to not retrieve images.
;; See this discussion on mu-discuss:
;; https://groups.google.com/forum/#!topic/mu-discuss/gr1cwNNZnXo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/mu4e-meta.el
new/mu-1.4.6/mu4e/mu4e-meta.el
--- old/mu-1.4.5/mu4e/mu4e-meta.el 2020-05-10 10:59:49.000000000 +0200
+++ new/mu-1.4.6/mu4e/mu4e-meta.el 2020-05-17 13:55:08.000000000 +0200
@@ -1,5 +1,5 @@
;; auto-generated
-(defconst mu4e-mu-version "1.4.5"
+(defconst mu4e-mu-version "1.4.6"
"Required mu binary version; mu4e's version must agree with this.")
(defconst mu4e-builddir "/home/djcb/Sources/mu"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/mu4e-vars.el
new/mu-1.4.6/mu4e/mu4e-vars.el
--- old/mu-1.4.5/mu4e/mu4e-vars.el 2020-05-05 20:43:01.000000000 +0200
+++ new/mu-1.4.6/mu4e/mu4e-vars.el 2020-05-17 08:54:14.000000000 +0200
@@ -1021,7 +1021,7 @@
;;; Handler functions
;;
-;; The handler funcions define what happens when we receive a certain
+;; The handler functions define what happens when we receive a certain
;; message from the server. Here we register our handler functions;
;; these connect server messages to functions to handle them.
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/mu4e-view.el
new/mu-1.4.6/mu4e/mu4e-view.el
--- old/mu-1.4.5/mu4e/mu4e-view.el 2020-05-09 22:14:01.000000000 +0200
+++ new/mu-1.4.6/mu4e/mu4e-view.el 2020-05-17 08:54:14.000000000 +0200
@@ -190,7 +190,7 @@
(define-key map [mouse-2] 'mu4e~view-save-attach-from-binding)
(define-key map (kbd "<S-return>") 'mu4e~view-save-attach-from-binding)
map)
- "Keymap used in the \"Attachements\" header field.")
+ "Keymap used in the \"Attachments\" header field.")
;;; Variables
@@ -873,7 +873,7 @@
(define-key map "A" (mu4e~native-def mu4e-view-attachment-action))
;; marking/unmarking
- (define-key map "d" 'mu4e-view-mark-or-move-to-trash)
+ (define-key map "d" 'mu4e-view-mark-for-trash)
(define-key map (kbd "<delete>") 'mu4e-view-mark-for-delete)
(define-key map (kbd "<deletechar>") 'mu4e-view-mark-for-delete)
(define-key map (kbd "D") 'mu4e-view-mark-for-delete)
@@ -1614,8 +1614,8 @@
(put ',funcname 'definition-name ',mark))))
(mu4e~view-defun-mark-for move)
-(mu4e~view-defun-mark-for trash)
(mu4e~view-defun-mark-for refile)
+(mu4e~view-defun-mark-for trash)
(mu4e~view-defun-mark-for delete)
(mu4e~view-defun-mark-for flag)
(mu4e~view-defun-mark-for unflag)
@@ -1631,13 +1631,6 @@
(mu4e~view-in-headers-context
(mu4e-mark-execute-all)))
-(defun mu4e-view-mark-or-move-to-trash (&optional n)
- "See `mu4e-headers-mark-or-move-to-trash'."
- (interactive "P")
- (mu4e~view-in-headers-context
- (mu4e-headers-mark-or-move-to-trash)
- (mu4e~headers-move (or n 1))))
-
;;; URL handling
(defun mu4e~view-get-urls-num (prompt &optional multi)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/mu4e.info new/mu-1.4.6/mu4e/mu4e.info
--- old/mu-1.4.5/mu4e/mu4e.info 2020-05-10 10:59:52.000000000 +0200
+++ new/mu-1.4.6/mu4e/mu4e.info 2020-05-17 13:55:10.000000000 +0200
@@ -19,7 +19,7 @@
mu4e manual
***********
-Welcome to mu4e 1.4.5.
+Welcome to mu4e 1.4.6.
mu4e (mu-for-emacs) is an e-mail client for GNU Emacs version 24.4 or
higher, built on top of the mu(1) e-mail search engine. mu4e is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/stamp-vti new/mu-1.4.6/mu4e/stamp-vti
--- old/mu-1.4.5/mu4e/stamp-vti 2020-05-10 10:59:51.000000000 +0200
+++ new/mu-1.4.6/mu4e/stamp-vti 2020-05-17 13:55:09.000000000 +0200
@@ -1,4 +1,4 @@
-@set UPDATED 9 May 2020
+@set UPDATED 17 May 2020
@set UPDATED-MONTH May 2020
-@set EDITION 1.4.5
-@set VERSION 1.4.5
+@set EDITION 1.4.6
+@set VERSION 1.4.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/mu4e/version.texi
new/mu-1.4.6/mu4e/version.texi
--- old/mu-1.4.5/mu4e/version.texi 2020-05-10 10:59:51.000000000 +0200
+++ new/mu-1.4.6/mu4e/version.texi 2020-05-17 13:55:09.000000000 +0200
@@ -1,4 +1,4 @@
-@set UPDATED 9 May 2020
+@set UPDATED 17 May 2020
@set UPDATED-MONTH May 2020
-@set EDITION 1.4.5
-@set VERSION 1.4.5
+@set EDITION 1.4.6
+@set VERSION 1.4.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/toys/mug/Makefile.am
new/mu-1.4.6/toys/mug/Makefile.am
--- old/mu-1.4.5/toys/mug/Makefile.am 2020-04-04 12:31:34.000000000 +0200
+++ new/mu-1.4.6/toys/mug/Makefile.am 2020-05-17 08:54:14.000000000 +0200
@@ -16,7 +16,7 @@
include $(top_srcdir)/gtest.mk
-# enforce compiling this dir first before decending into tests/
+# enforce compiling this dir first before descending into tests/
SUBDIRS= .
AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS)
\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mu-1.4.5/toys/mug/Makefile.in
new/mu-1.4.6/toys/mug/Makefile.in
--- old/mu-1.4.5/toys/mug/Makefile.in 2020-05-10 10:59:42.000000000 +0200
+++ new/mu-1.4.6/toys/mug/Makefile.in 2020-05-17 13:55:05.000000000 +0200
@@ -466,7 +466,7 @@
valgrind_tools = @valgrind_tools@
TEST_PROGS =
-# enforce compiling this dir first before decending into tests/
+# enforce compiling this dir first before descending into tests/
SUBDIRS = .
AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib $(GTK_CFLAGS)
$(WEBKIT_CFLAGS) \
-DICONDIR='"$(icondir)"' -DMUGDIR='"$(abs_srcdir)"'
\
