Richard Russon [Sun, 1 May 2016 21:44:15 +0000 (22:44 +0100)]
merge: sidebar
* build fix
* Make <sidebar-next-new> only find *new* mail
* drop spurious attribute setting
* fix typo
* allow sidebar functions when sidebar is hidden
Richard Russon [Sun, 1 May 2016 21:43:11 +0000 (22:43 +0100)]
merge: bug-fixes
* build tweak to allow testing
* Create a wrapper sys_socket.h to work around Solaris namespace issues. (closes #3833)
* automatic post-release commit for mutt-1.6.1
Richard Russon [Sun, 1 May 2016 13:39:59 +0000 (14:39 +0100)]
merge: upstream
* 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
Richard Russon [Sun, 1 May 2016 13:35:55 +0000 (14:35 +0100)]
merge: upstream
* 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
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.
Richard Russon [Fri, 15 Apr 2016 22:15:26 +0000 (23:15 +0100)]
merge: notmuch
* enabling notmuch enables sidebar
* conditional include if <sys/syscall.h>
* minor style changes to match sidebar
* fix typo
* change sidebar-toggle function to match sidebar
* change wiki references to website
Richard Russon [Fri, 15 Apr 2016 20:58:47 +0000 (21:58 +0100)]
merge: notmuch
* enabling notmuch enables sidebar
* conditional include if <sys/syscall.h>
* change sidebar-toggle function to match sidebar
* change wiki references to website
Richard Russon [Fri, 15 Apr 2016 13:58:35 +0000 (14:58 +0100)]
merge: sidebar
* note config changes in the readme
* fix formatting
* fix refresh of pager
* try hard to keep track of the open mailbox
* allow the user to change mailboxes again
* fix crash caused by sidebar_folder_indent
* minor code tidy
* allow sidebar_divider_char to be longer
Olaf Lessenich [Thu, 14 Apr 2016 22:23:28 +0000 (23:23 +0100)]
allow the user to change mailboxes again
"unmailboxes *" used to cause Sidebar to crash. The bug-fix for this
introduced another bug that prevented users from changing to a
non-Sidebar folder.
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.
projects / neomutt / log