Richard Russon [Thu, 16 Jun 2016 14:44:45 +0000 (15:44 +0100)]
merge: notmuch
* Fix IDNA functions for systems without iconv.
* Fix mutt_protect() when INLINE is set. (closes #3828)
* Create a wrapper sys_socket.h to work around Solaris namespace issues. (closes #3833)
* automatic post-release commit for mutt-1.6.1
* reduce the frequency of mailbox checks
Richard Russon [Thu, 16 Jun 2016 14:42:34 +0000 (15:42 +0100)]
merge: sidebar
* fix cursor position after sidebar redraw
* Add sidebar_format flag '%n' to display 'N' on new mail.
* Fix the case of messages in OPS.MIX and OPS.SIDEBAR
Kevin McCarthy [Wed, 27 Apr 2016 20:08:52 +0000 (13:08 -0700)]
Create a wrapper sys_socket.h to work around Solaris namespace issues. (closes #3833)
Solaris includes "sys/stream.h" inside their "sys/socket.h". This
include file adds many non-reserved macros to Mutt's namespace, two of
which conflict with existing Mutt macros.
The simplest fix would be to rename those macros in Mutt, however this
will cause difficulty with out-of-tree patches. This fix creates a
wrapper include file that preserves those existing macros and prevents
the Solaris values from entering Mutt's namespace.
Kevin McCarthy [Sun, 10 Apr 2016 23:02:06 +0000 (16:02 -0700)]
Fix mutt_protect() when INLINE is set. (closes #3828)
The oppenc changes allow security bits to be set even when not
encrypting or signing (for instance, OPPENCRYPT and INLINE).
mutt_protect() assumed that if INLINE is set, then either ENCRYPT or
SIGN must also be set. Specifically, it would end up inline-signing
the message even though neither was set.
Ensure mutt_protect() is a noop if neither SIGN or ENCRYPT are set.
In ci_send_message(), check for sign or encrypt before calling the
crypt_get_keys() / mutt_protect() block, and also in the fcc section
(since clear_content would be NULL if not).
The second change to the fcc part is somewhat redundant, but better to
be explicit and avoid the case where the subtype is somehow
"encrypted" or "signed" even though msg->security wasn't set thus.
Kevin McCarthy [Tue, 5 Apr 2016 21:31:36 +0000 (14:31 -0700)]
Fix IDNA functions for systems without iconv.
The IDNA changes for SMTPUTF8 support introduced a bug for systems
without iconv. For those systems, the local<->intl functions would
return an error due to the charset conversion failing.
Change mutt_idna.c back to being conditionally compiled, but this time
based on HAVE_ICONV. If there is no iconv, stub out the functions in
mutt_idna.h.
Richard Russon [Wed, 15 Jun 2016 15:47:22 +0000 (16:47 +0100)]
fix index_format truncation problem
mutt_wstr_trunc() didn't take index coloring into account when measuring a
string's length. When combined with a soft-fill '%* ' in the index_format it
lead to formatting problems.
Richard Russon [Sat, 11 Jun 2016 15:30:09 +0000 (16:30 +0100)]
merge: sidebar
* sync whitespace to mutt/default
* rename sidebar functions sb_* -> mutt_sb_*
* bug-fixes from mutt/default
* Setting $sidebar_width to more than 128 would cause bad things to happen.
* fix reflow properly
* temporarily disable $sidebar_refresh_time
* Fix alignment in the compose menu.
* Fix sidebar buffy stats updating on mailbox close.
Kevin McCarthy [Mon, 6 Jun 2016 01:05:41 +0000 (18:05 -0700)]
Fix sidebar buffy stats updating on mailbox close.
Move the mutt_sb_set_buffystats() call from mx_fastclose_mailbox() to
the bottom of mx_close_mailbox(). Append-only mailboxes don't have
msgcount set, so fastclose was the wrong place to be doing these
updates.
Richard Russon [Thu, 9 Jun 2016 19:06:10 +0000 (12:06 -0700)]
Fix alignment in the compose menu.
Several of the compose-panel labels didn't use the TITLE_FMT to align
themselves. This causes formatting problems when the width is changed,
e.g. by the NNTP patch.
Richard Russon [Thu, 9 Jun 2016 13:01:42 +0000 (14:01 +0100)]
temporarily disable $sidebar_refresh_time
Limiting the refresh frequency of sidebar updates was interfering with
other Mutt behaviour. Upstream, Mutt is changing how refresh is
handled. I'll adopt those changes when they're finished.
Mike Frysinger [Tue, 31 May 2016 20:17:41 +0000 (21:17 +0100)]
separate key bindings for <return> and <enter>
Split up <enter> (ctrl+j) and <return> (ctrl+m) into different bindings so
people can map them differently. The default behavior is unchanged as we
map them both to the same function.
Richard Russon [Sun, 22 May 2016 22:29:18 +0000 (23:29 +0100)]
merge: keywords
* Add reentrant hash_walk() function for iterating down a hash table.
* Adds capability to edit x-labels inside mutt, and to sort by label.
* Adds label completion.
* Unify label/keyword handling.
* Permit tab completion of pattern expressions with ~y (labels).
* add docs
* add ident to PATCHES
* doc: check for installed patches
* fix build warning
Richard Russon [Sun, 22 May 2016 15:26:11 +0000 (16:26 +0100)]
merge: sidebar
* bump dependency to 1.6.1
* Set COLUMNS to MuttIndexWindow->cols in mutt_create_filter_fd. (closes #3837)
* fix format=flowed text when the sidebar is enabled
* doc: css for sidebar intro
* doc: check for installed patches
projects / neomutt / log