On Mon, Mar 21, 2016 at 02:35:07PM +0100, David Sterba wrote:
On Mon, Mar 21, 2016 at 12:00:04PM +0100, Karel Zak wrote:
> On Thu, Jan 07, 2016 at 07:18:16AM -0800, Thomas Klausner wrote:
> > Please merge the changes and make a release based on that version Thank you!
>
> I'll very probably merge stuff from neomutt/mutt-kz (from Richard
> Russon). The result should be mutt-kz synced with the current mutt
> upstream.
Neomutt tracks lots of branches, are you going to merge just the ones
related to mutt upstream?
Well, Richard has prepared a branch for me with notmuch stuff as well
as another features already integrated to mutt-kz. It also contains a
new sidebar (seems more readable).
Try:
git remote add -f neomutt-kz
https://github.com/neomutt/mutt-kz
git checkout -b neomutt-kz neomutt-kz/mutt-kz
./prepare
./configure --enable-hcache --enable-flock --enable-notmuch --enable-sidebar
--disable-fcntl
make
./mutt
... this is what I currently using on my workstation to test it.
I found a small difference in sidebar .muttrc stuff (some options have
been renamed, but nothing critical).
See below git diff stuff (exclude po/ docs/ README*, ).
Karel
.hgignore | 5 +
.hgsigs | 1 +
.hgtags | 2 +
Makefile.am | 21 +-
OPS | 9 -
OPS.SIDEBAR | 9 +
PATCHES | 10 +-
UPDATING | 33 +
UPDATING.kz | 6 +-
VERSION | 2 +-
browser.c | 12 +-
buffy.c | 360 ++++---
buffy.h | 13 +-
build-release | 6 +-
color.c | 198 ++--
commands.c | 4 +-
compose.c | 8 +-
configure.ac | 19 +-
copy.c | 3 +-
crypt-gpgme.c | 91 +-
crypt.c | 64 +-
curs_lib.c | 101 +-
curs_main.c | 293 +++---
flags.c | 8 +-
flymake.am | 12 +
functions.h | 43 +-
globals.h | 17 +-
handler.c | 230 +++--
hcache.c | 20 +-
hdrline.c | 339 +++----
help.c | 2 +-
hook.c | 17 +
imap/Makefile.am | 1 +
imap/auth_gss.c | 6 +-
imap/command.c | 13 +-
imap/imap.c | 14 +
imap/message.c | 2 +-
imap/util.c | 2 +-
init.h | 240 +++--
keymap.c | 1 +
mailbox.h | 2 +
main.c | 28 +
mbox.c | 4 +
menu.c | 109 +-
mh.c | 63 +-
mkchangelog.sh | 2 +-
mutt.h | 13 +-
mutt_crypt.h | 4 +
mutt_curses.h | 21 +-
mutt_menu.h | 3 +
mutt_ssl.c | 2 +-
muttlib.c | 142 +--
mx.c | 32 +-
mx.h | 5 +-
pager.c | 70 +-
pgp.c | 98 +-
pop_lib.c | 1 +
protos.h | 10 +-
recvattach.c | 3 +-
sendlib.c | 3 +-
sidebar.c | 1421 ++++++++++++++++++--------
sidebar.h | 29 +-
smime.c | 2 +-
sort.h | 5 +-
txt2c.sh | 6 +-
118 files changed, 28628 insertions(+), 18737 deletions(-)
--
Karel Zak <kzak(a)redhat.com>
http://karelzak.blogspot.com