]> granicus.if.org Git - neomutt/log
neomutt
7 years agoInclude pattern for broken threads 623/head
somini [Wed, 7 Jun 2017 15:03:17 +0000 (16:03 +0100)]
Include pattern for broken threads

References #616

From Frederic Duval:
http://cedricduval.free.fr/mutt/patches/download/patch-1.5.1.cd.pattern_broken.1

7 years agoImprove search for mime.types 637/head
Christopher John CZETTEL [Fri, 16 Jun 2017 22:03:07 +0000 (00:03 +0200)]
Improve search for mime.types

- Make the search order sane
- Print an error if mime.types is not found

Search order is:
    /etc/mime.types
    SYSCONFDIR/mime.types
    PKGDATADIR/mime.types
    ~/.mime.types

The last matching file wins.

7 years agofix: maildir creation 639/head
Christopher John CZETTEL [Mon, 19 Jun 2017 01:54:33 +0000 (03:54 +0200)]
fix: maildir creation

- added missing recursive directory creation after user prompt
- checked for trailing '/' when saving mbox

7 years agomerge: start tidying Buffy handling
Richard Russon [Sat, 24 Jun 2017 10:26:52 +0000 (11:26 +0100)]
merge: start tidying Buffy handling

 * tidy some buffy code
 * split mutt_parse_mailboxes into mutt_parse_unmailboxes
 * drop VirtIncoming

7 years agodrop VirtIncoming 641/head
Richard Russon [Tue, 20 Jun 2017 10:09:56 +0000 (11:09 +0100)]
drop VirtIncoming

Change the notmuch code to use Incoming rather than its own VirtIncoming.
These changes have no visible effect to the user.

This removes a lot of duplicate code and simplifies the logic in the
sidebar.

7 years agosplit mutt_parse_mailboxes into mutt_parse_unmailboxes
Richard Russon [Tue, 20 Jun 2017 09:55:11 +0000 (10:55 +0100)]
split mutt_parse_mailboxes into mutt_parse_unmailboxes

Split mutt_parse_mailboxes into two functions: one to add, one to remove.
There's not much overlap in the two functions and separating them
simplifies the logic.

Where unmailboxes used to use two loops, there's now only one.

7 years agotidy some buffy code
Richard Russon [Mon, 19 Jun 2017 18:40:15 +0000 (19:40 +0100)]
tidy some buffy code

As a prelude to some notmuch changes, tidy up some buffy-handling
functions.  There are no functional changes.

- rename some variables
- reduce the scope of variables
- add some bools

7 years agoCODE_OF_CONDUCT: remove jekyll code
toogley [Thu, 15 Jun 2017 11:18:20 +0000 (13:18 +0200)]
CODE_OF_CONDUCT: remove jekyll code

[ci skip]

7 years agodocs: add code of conduct
Richard Russon [Wed, 14 Jun 2017 23:03:15 +0000 (00:03 +0100)]
docs: add code of conduct

[ci skip]

7 years agomerge: trivial code changes
Richard Russon [Tue, 13 Jun 2017 13:59:38 +0000 (14:59 +0100)]
merge: trivial code changes

 * reduce scope of for loop variables
 * replace variables with bools
 * rename static function
 * strip out once-used macro
 * while (1) -> while (true)

7 years agofix mailmap
Richard Russon [Sun, 11 Jun 2017 09:41:29 +0000 (10:41 +0100)]
fix mailmap

7 years agowhile (1) -> while (true)
Richard Russon [Mon, 12 Jun 2017 17:36:14 +0000 (18:36 +0100)]
while (1) -> while (true)

7 years agostrip out once-used macro
Richard Russon [Mon, 12 Jun 2017 17:34:15 +0000 (18:34 +0100)]
strip out once-used macro

7 years agorename static function
Richard Russon [Mon, 12 Jun 2017 17:27:21 +0000 (18:27 +0100)]
rename static function

7 years agoreplace variables with bools
Richard Russon [Thu, 8 Jun 2017 20:23:58 +0000 (21:23 +0100)]
replace variables with bools

Each variable is limited to a single function.
Each was only set to 0 or 1.

Fucntions:
address_header_decode
alternative_handler
attach_forward_bodies
check_host
ci_send_message
clean_references
copy_clearsigned
crypt_getkeybyaddr
crypt_select_key
crypt_write_signed
disable_coredumps
display_line
do_uncolor
draw_sidebar
eat_message_range
eat_range
envelope_defaults
expand_aliases_r
get_token
handle_docline
imap_auth_sasl
imap_browse
imap_conn_find
imap_fast_trash
imap_fetch_message
imap_make_msg_set
imap_pretty_mailbox
imap_read_headers
imap_read_literal
init_common
init_menu
maildir_check_mailbox
main
mbox_check_mailbox
menu_redraw_index
mh_rewrite_message
mix_check_message
mix_make_chain
mutt_account_hook
mutt_alias_menu
mutt_attach_reply
mutt_body_handler
mutt_buffy_check
mutt_builtin_editor
mutt_check_simple
mutt_compose_attachment
mutt_copy_hdr
mutt_count_body_parts
mutt_display_message
mutt_draw_statusline
mutt_edit_attachment
mutt_edit_headers
mutt_expand_fmt
mutt_FormatString
mutt_index_menu
mutt_is_application_smime
mutt_multi_choice
mutt_pager
mutt_parse_color
mutt_parse_hook
mutt_parse_mono
mutt_parse_multipart
mutt_print_attachment
mutt_progress_update
mutt_remove_duplicates
mutt_sasl_start
mutt_signed_handler
mutt_view_attachment
mutt_write_fcc
mutt_write_rfc822_header
mutt_yesorno
nm_check_mailbox
nm_nonctx_get_count
nm_sync_mailbox
nntp_capabilities
nntp_hcache_update
nntp_newsrc_gen_entries
nntp_open_connection
parse_parameters
parse_pub_line
parse_regex
pgpring_dump_keyblock
pgp_application_pgp_handler
pgp_copy_clearsigned
pgp_decrypt_mime
pgp_find_keys
pgp_getkeybyaddr
pgp_getkeybystr
pgp_gpgme_application_handler
pgp_gpgme_decrypt_mime
pgp_read_packet
pgp_select_key
pgp_sign_message
pgp_traditional_encryptsign
pop_fetch_headers
print_smime_keyinfo
qp_decode_line
query_menu
reopen_mailbox
resolve_color
resolve_types
rfc1524_expand_filename
rfc2047_decode
rfc2231_decode_parameters
select_msg
show_one_sig_status
shrink_histfile
smime_getkeys
smime_select_key
ssl_init
tls_init
utf8_to_utf7
_mutt_expand_path
_mutt_parse_color
_mutt_traverse_thread

7 years agoreduce scope of for loop variables
Richard Russon [Thu, 8 Jun 2017 14:43:16 +0000 (15:43 +0100)]
reduce scope of for loop variables

Each change is limited to a single function:
    attach_forward_bodies
    attach_forward_msgs
    attach_reply_envelope_defaults
    check_all_msg
    find_parent
    mutt_attach_bounce
    mutt_attach_reply
    mutt_attach_resend
    mutt_builtin_editor
    mutt_gen_attach_list

7 years agotranslation: update Chinese (Simplified)
Richard Russon [Tue, 13 Jun 2017 11:20:10 +0000 (12:20 +0100)]
translation: update Chinese (Simplified)

7 years agoinit.c: allow sourcing of multiple files 626/head
toogley [Thu, 8 Jun 2017 22:39:37 +0000 (00:39 +0200)]
init.c: allow sourcing of multiple files

Credits: Cedric Duval,
http://cedricduval.free.fr/mutt/patches/download/patch-1.5.4.cd.source_multiple.2

Issue #616

7 years agodocs: fix ifdef examples
Richard Russon [Sun, 11 Jun 2017 09:47:20 +0000 (10:47 +0100)]
docs: fix ifdef examples

7 years agoFix trailing whitespaces
Zero King [Sun, 11 Jun 2017 01:28:13 +0000 (01:28 +0000)]
Fix trailing whitespaces

7 years agomerge: drop obsolete options / docs
Richard Russon [Sat, 10 Jun 2017 14:42:14 +0000 (15:42 +0100)]
merge: drop obsolete options / docs

7 years agoupdate gitignore 617/head
Richard Russon [Tue, 6 Jun 2017 00:11:39 +0000 (01:11 +0100)]
update gitignore

Update .gitignore to match all the latest build changes.

7 years agoCompletely remove dotlock
Richard Russon [Mon, 5 Jun 2017 18:07:17 +0000 (19:07 +0100)]
Completely remove dotlock

The last-ditch attempt to lock a file, dating back to the times when NFS
and SMB file-locking wasn't reliable.

7 years agodrop UPDATING files
Richard Russon [Tue, 6 Jun 2017 11:45:46 +0000 (12:45 +0100)]
drop UPDATING files

Drop:
    UPDATING    (from upstream)
    UPDATING.gz

The information in here is also in our ChangeLog.

7 years agoOne ChangeLog to bind them all
Richard Russon [Mon, 5 Jun 2017 22:51:38 +0000 (23:51 +0100)]
One ChangeLog to bind them all

Drop files:
    ChangeLog      (from upstream)
    ChangeLog.nntp

Rename:
    ChangeLog.neomutt -> ChangeLog.md

7 years agodrop configure options --enable-exact-address
Richard Russon [Mon, 5 Jun 2017 17:51:02 +0000 (18:51 +0100)]
drop configure options --enable-exact-address

Unused option.

7 years agodrop configure option --with-exec-shell
Richard Russon [Mon, 5 Jun 2017 17:40:55 +0000 (18:40 +0100)]
drop configure option --with-exec-shell

Using /bin/sh is safe.

7 years agodrop configure option --enable-nfs-fix
Richard Russon [Mon, 5 Jun 2017 16:31:01 +0000 (17:31 +0100)]
drop configure option --enable-nfs-fix

No longer needed.

7 years agodrop configure option --disable-warnings
Richard Russon [Mon, 5 Jun 2017 16:25:33 +0000 (17:25 +0100)]
drop configure option --disable-warnings

Always enable the warnings.

7 years agoremove stamp-h.in
Richard Russon [Mon, 5 Jun 2017 23:49:58 +0000 (00:49 +0100)]
remove stamp-h.in

This file is generated by configure and shouldn't be committed to the
repo.

7 years agoremove references to synonyms
Richard Russon [Mon, 5 Jun 2017 23:37:33 +0000 (00:37 +0100)]
remove references to synonyms

Undocumented           | Real variable
-----------------------|-------------------------
edit_hdrs              | edit_headers
envelope_from          | use_envelope_from
forw_decode            | forward_decode
forw_decrypt           | forward_decrypt
forw_format            | forward_format
forw_quote             | forward_quote
hdr_format             | index_format
indent_str             | indent_string
mime_fwd               | mime_forward
msg_format             | message_format
pgp_autoencrypt        | crypt_autoencrypt
pgp_autosign           | crypt_autosign
pgp_auto_traditional   | pgp_replyinline
pgp_create_traditional | pgp_autoinline
pgp_replyencrypt       | crypt_replyencrypt
pgp_replysign          | crypt_replysign
pgp_replysignencrypted | crypt_replysignencrypted
pgp_verify_sig         | crypt_verify_sig
post_indent_str        | post_indent_string
print_cmd              | print_command
smime_sign_as          | smime_default_key
xterm_icon             | ts_icon_format
xterm_set_titles       | ts_enabled
xterm_title            | ts_status_format

7 years agoRemove refs to deleted configure options
Richard Russon [Mon, 5 Jun 2017 22:21:21 +0000 (23:21 +0100)]
Remove refs to deleted configure options

Obsolete configure options:
    --enable-hcache
    --enable-imap
    --enable-mailtool
    --enable-nntp
    --enable-pop
    --enable-smtp
    --with-included-gettext
    --with-regex

7 years agocleanup hdr_format_str 627/head
Stefan Assmann [Fri, 9 Jun 2017 05:44:55 +0000 (07:44 +0200)]
cleanup hdr_format_str

Sort options in alphabetical order for better overview.
Also while at it, removed a few superfluous blank lines.

Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
7 years agodoc: fix spaces in the manual
toogley [Sat, 10 Jun 2017 08:23:36 +0000 (10:23 +0200)]
doc: fix spaces in the manual

Thanks to Bo YU (@yuzibo) and Floyd Anderson (@floand)

These were introduced when `tidy` was run.

7 years agodocs: fix typos
Elimar Riesebieter [Sat, 10 Jun 2017 12:49:28 +0000 (13:49 +0100)]
docs: fix typos

7 years agobuild: remove another reference to devel-notes.txt
Richard Russon [Fri, 9 Jun 2017 14:26:40 +0000 (15:26 +0100)]
build: remove another reference to devel-notes.txt

7 years agoNeoMutt 2017-06-09 (1.8.3) neomutt-20170609
Richard Russon [Fri, 9 Jun 2017 10:52:07 +0000 (11:52 +0100)]
NeoMutt 2017-06-09 (1.8.3)

7 years agoupdate translations
Richard Russon [Fri, 9 Jun 2017 09:49:36 +0000 (10:49 +0100)]
update translations

7 years agoupdate version
Richard Russon [Thu, 8 Jun 2017 11:39:11 +0000 (12:39 +0100)]
update version

7 years agofix colours properly
Richard Russon [Fri, 9 Jun 2017 10:48:21 +0000 (11:48 +0100)]
fix colours properly

7 years agonew contributors to mailmap
Richard Russon [Mon, 5 Jun 2017 15:06:41 +0000 (16:06 +0100)]
new contributors to mailmap

7 years agoRevert "Move setting of GPG_TTY to mutt_init(). (see #3948)"
Richard Russon [Thu, 8 Jun 2017 21:29:30 +0000 (22:29 +0100)]
Revert "Move setting of GPG_TTY to mutt_init(). (see #3948)"

This reverts commit 89ddfa61c180de00769f6e1798579ec80349a4eb.

This commit was created by upstream and then reverted citing possible
security problems leaking the GPG_TTY env var.

7 years agoFix latest coverity issues (#624)
Pietro Cerutti [Thu, 8 Jun 2017 13:51:16 +0000 (14:51 +0100)]
Fix latest coverity issues (#624)

* Fix latest coverity issues

ncrypt/crypt.c
CID 170494:  Resource leaks  (RESOURCE_LEAK)
Variable "from" going out of scope leaks the storage it points to.

nntp.c
CID 170495:  Uninitialized variables  (UNINIT)
Declaring variable "buf" without initializer.

parse.c
CID 76957:  Error handling issues  (NEGATIVE_RETURNS)
"loc" is passed to a parameter that cannot be negative.

7 years agofix: don't pass colour-codes to filters 618/head
Richard Russon [Tue, 6 Jun 2017 16:19:06 +0000 (17:19 +0100)]
fix: don't pass colour-codes to filters

If the index_format string is being passed to an external filter, then
don't embed our secret colour-codes.

Fixes: #221
7 years agodocs: explain binding warnings
Richard Russon [Wed, 7 Jun 2017 15:14:24 +0000 (16:14 +0100)]
docs: explain binding warnings

7 years agoOffer suggestion on binding problems
Richard Russon [Wed, 7 Jun 2017 14:30:20 +0000 (15:30 +0100)]
Offer suggestion on binding problems

Ref: #621

7 years agofix: Don't set a colour unless it's been defined. 615/head
Richard Russon [Mon, 5 Jun 2017 12:51:22 +0000 (13:51 +0100)]
fix: Don't set a colour unless it's been defined.

Some SETCOLOR's were being used without checking if the user had set the
colour, first.

If the user set the "normal" colours, then SETCOLOR would leave blocks
of unexpected colours.

Fixes #610

7 years agoinclude mutt_regex.h in globals.h
Stefan Assmann [Tue, 30 May 2017 07:50:40 +0000 (09:50 +0200)]
include mutt_regex.h in globals.h

Error observered
In file included from main.c:40:0:
globals.h:56:20: error: storage size of 'AttachKeyword' isn't known
 WHERE struct Regex AttachKeyword;
                    ^~~~~~~~~~~~~
globals.h:288:20: error: storage size of 'PgpGoodSign' isn't known
 WHERE struct Regex PgpGoodSign;
                    ^~~~~~~~~~~
Adding header include for mutt_regex.h.

Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
7 years agocheck return value of fgets 620/head
Stefan Assmann [Tue, 30 May 2017 06:25:33 +0000 (08:25 +0200)]
check return value of fgets

Following warning was observed:
 init.c: In function 'mutt_init':
 mutt.h:53:15: warning: ignoring return value of 'fgets_unlocked', declared with attribute warn_unused_result [-Wunused-result]
  #define fgets fgets_unlocked

 init.c:4053:7: note: in expansion of macro 'fgets'
        fgets(buffer, sizeof(buffer), f);
        ^~~~~
Added code that checks return value.

Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
7 years agodevel-notes.txt replaced by docs on neomutt.org 619/head
Edward Betts [Wed, 7 Jun 2017 07:14:23 +0000 (08:14 +0100)]
devel-notes.txt replaced by docs on neomutt.org

The prepare script mentions doc/devel-notes.txt, which no longer exists.
Point to https://www.neomutt.org/dev/newbie-tutorial instead.

7 years agomerge: upstream fixes (mutt/default)
Richard Russon [Wed, 7 Jun 2017 21:56:59 +0000 (22:56 +0100)]
merge: upstream fixes (mutt/default)

 * Fix "format string is not a string literal" warnings. (closes #3949)
 * Enable TEXTDOMAINDIR override to make translation testing easier.
 * Change km_dokey() to return -2 on a timeout/sigwinch.
 * Fix tag-prefix to not abort on $timeout.
 * Restore setenv function.
 * Move setting of GPG_TTY to mutt_init(). (see #3948)
 * Add a mutt_endwin() before invoking $sendmail. (closes #3948)

7 years agoAdd a mutt_endwin() before invoking $sendmail. (closes #3948)
Kevin McCarthy [Wed, 7 Jun 2017 01:38:47 +0000 (18:38 -0700)]
Add a mutt_endwin() before invoking $sendmail. (closes #3948)

This is to support invoking a program such as msmtp that can use gpg
to decrypt a password.  The ncurses pinentry can corrupt the screen
unless we exit curses.

7 years agoMove setting of GPG_TTY to mutt_init(). (see #3948)
Kevin McCarthy [Wed, 7 Jun 2017 01:38:46 +0000 (18:38 -0700)]
Move setting of GPG_TTY to mutt_init(). (see #3948)

This allows other programs mutt runs to use the ncurses pinentry if needed.

7 years agoRestore setenv function.
Kevin McCarthy [Wed, 7 Jun 2017 01:38:41 +0000 (18:38 -0700)]
Restore setenv function.

Partially revert fa1192803257, restoring setenv.  It turns out we
still need the function.

7 years agoFix tag-prefix to not abort on $timeout.
Kevin McCarthy [Thu, 1 Jun 2017 22:17:05 +0000 (15:17 -0700)]
Fix tag-prefix to not abort on $timeout.

If $timeout is set very low, then it can cancel the tag-prefix before
the user has time to press the desired command.

Change the code to set the tag flag, and then recontinue with normal
event processing instead.  Cancel on an abort, but continue with a timeout.

Thanks to Lauri Tirkkonen for reporting the issue.

7 years agoChange km_dokey() to return -2 on a timeout/sigwinch.
Kevin McCarthy [Thu, 1 Jun 2017 22:17:01 +0000 (15:17 -0700)]
Change km_dokey() to return -2 on a timeout/sigwinch.

In some cases, such as tag-prefix or _mutt_enter_string(), it is
desirable to be able to distinguish between a timeout/sigwinch event
and an input error/abort/ctrl-g.

7 years agoEnable TEXTDOMAINDIR override to make translation testing easier.
TAKAHASHI Tamotsu [Thu, 1 Jun 2017 20:55:07 +0000 (13:55 -0700)]
Enable TEXTDOMAINDIR override to make translation testing easier.

If set, TEXTDOMAINDIR will point to a translation directory instead of
using the mutt installation directory.

7 years agoFix "format string is not a string literal" warnings. (closes #3949)
TAKAHASHI Tamotsu [Thu, 1 Jun 2017 20:33:21 +0000 (13:33 -0700)]
Fix "format string is not a string literal" warnings. (closes #3949)

Mutt calls msgfmt with '-c' to verify that translation format strings
match, but it is still safer to indirect strings with no formatting
through %s.

7 years agofix translations
Richard Russon [Wed, 7 Jun 2017 21:47:43 +0000 (22:47 +0100)]
fix translations

7 years agoupdate Japanese translation
Richard Russon [Wed, 7 Jun 2017 13:21:24 +0000 (14:21 +0100)]
update Japanese translation

7 years agofix some remaining translation problems
Richard Russon [Wed, 7 Jun 2017 10:09:49 +0000 (11:09 +0100)]
fix some remaining translation problems

7 years agobuild: fix make git_ver.h
Richard Russon [Tue, 6 Jun 2017 20:46:02 +0000 (21:46 +0100)]
build: fix make git_ver.h

By separating the lines, the version variable was getting lost.

7 years agobuild: fix make dist
Richard Russon [Mon, 5 Jun 2017 15:19:37 +0000 (16:19 +0100)]
build: fix make dist

7 years agosmall refactoring
toogley [Sun, 26 Feb 2017 20:24:14 +0000 (21:24 +0100)]
small refactoring

* replace ESC_CHAR macro with function
* added braces to if logic to improve readability

7 years agogithub: simplify PR template
toogley [Mon, 5 Jun 2017 14:18:37 +0000 (16:18 +0200)]
github: simplify PR template

In a lot of PR's, either the question "Why is this PR needed" is removed
or answered very similar to "What does this PR do?". Therefore, i think
this can be removed.

[ci skip]

7 years agomerge: Remove legacy support / notes
Richard Russon [Mon, 5 Jun 2017 14:24:52 +0000 (15:24 +0100)]
merge: Remove legacy support / notes

 * remove AIX code, as it's unsupported
 * doc: remove Ultrix note, as it's unsupported
 * remove notes about SunOS as it's discontinued
 * INSTALL: remove mutt notes for supported platforms

7 years agoINSTALL: remove mutt notes for supported platforms 604/head
toogley [Fri, 2 Jun 2017 10:50:06 +0000 (12:50 +0200)]
INSTALL: remove mutt notes for supported platforms

7 years agoremove notes about SunOS as it's discontinued
toogley [Fri, 2 Jun 2017 10:45:58 +0000 (12:45 +0200)]
remove notes about SunOS as it's discontinued

7 years agodoc: remove Ultrix note, as it's unsupported
toogley [Fri, 2 Jun 2017 10:41:50 +0000 (12:41 +0200)]
doc: remove Ultrix note, as it's unsupported

7 years agoremove AIX code, as it's unsupported
toogley [Fri, 2 Jun 2017 10:37:17 +0000 (12:37 +0200)]
remove AIX code, as it's unsupported

7 years agodocs: remove reference to non-existent file 595/head
Bo YU [Sat, 27 May 2017 08:35:03 +0000 (16:35 +0800)]
docs: remove reference to non-existent file

7 years agoFix crash if no from is set or founds 598/head
Werner Fink [Tue, 30 May 2017 12:52:12 +0000 (12:52 +0000)]
Fix crash if no from is set or founds

On multi folder mailbox setup and without a set 'From:' line in
~/.muttrc the mutt crash with SIGSEGV on a NULL pointer at
msg->env->from

Fixes: #577
7 years agoFix typos in 'color compose'
Richard Russon [Mon, 5 Jun 2017 12:50:50 +0000 (13:50 +0100)]
Fix typos in 'color compose'

7 years agocorrect spelling mistake
Edward Betts [Mon, 5 Jun 2017 07:16:51 +0000 (08:16 +0100)]
correct spelling mistake

7 years agocorrect spelling mistake
Edward Betts [Mon, 5 Jun 2017 07:14:52 +0000 (08:14 +0100)]
correct spelling mistake

7 years agofix ifdef command
Richard Russon [Sat, 3 Jun 2017 23:12:40 +0000 (00:12 +0100)]
fix ifdef command

Recent changes to the output of `mutt -v` broke the `ifdef` command.

Tidy a couple of version strings.
Update all the examples in the docs.

Closes #607

7 years agounbind mappings before overwriting in vim-keys
Pig Monkey [Sun, 4 Jun 2017 02:21:40 +0000 (19:21 -0700)]
unbind mappings before overwriting in vim-keys

As per #583, these must be unbound to prevent warnings.

7 years agobuild: allow xsltproc and w3m calls to fail
Zero King [Sat, 3 Jun 2017 14:28:31 +0000 (14:28 +0000)]
build: allow xsltproc and w3m calls to fail

7 years agoadd missing changelog entry
Richard Russon [Fri, 2 Jun 2017 16:29:02 +0000 (17:29 +0100)]
add missing changelog entry

7 years agoNeoMutt Release 2017-06-02 neomutt-20170602
Richard Russon [Fri, 2 Jun 2017 11:52:57 +0000 (12:52 +0100)]
NeoMutt Release 2017-06-02

7 years agomerge: sync to mutt/stable
Richard Russon [Fri, 2 Jun 2017 11:49:56 +0000 (12:49 +0100)]
merge: sync to mutt/stable

7 years agoupdate translations
Richard Russon [Fri, 2 Jun 2017 11:39:12 +0000 (12:39 +0100)]
update translations

7 years agoclang-format source
Richard Russon [Fri, 2 Jun 2017 11:30:48 +0000 (12:30 +0100)]
clang-format source

7 years agoUpdate en_GB.po
Richard Russon [Fri, 2 Jun 2017 11:29:01 +0000 (12:29 +0100)]
Update en_GB.po

7 years agoFixed translations of shortkeys in the PGP-menu
Elimar Riesebieter [Sat, 27 May 2017 14:20:16 +0000 (16:20 +0200)]
Fixed translations of shortkeys in the PGP-menu

7 years agoupdate mailmap
Richard Russon [Fri, 2 Jun 2017 10:34:07 +0000 (11:34 +0100)]
update mailmap

7 years agoversion: 2017-06-02
Richard Russon [Fri, 2 Jun 2017 11:12:48 +0000 (12:12 +0100)]
version: 2017-06-02

7 years agomerge: fix some trivial problems
Richard Russon [Thu, 1 Jun 2017 19:35:26 +0000 (20:35 +0100)]
merge: fix some trivial problems

 * remove unused option: SmimeSignOpaqueCommand
 * remove unused macros
 * fix safe_calloc args
 * remove unnecessary include
 * rename a param that shadow's a global symbol
 * docs: fix sidebar howto examples

7 years agodocs: fix sidebar howto examples
Richard Russon [Thu, 1 Jun 2017 19:32:33 +0000 (20:32 +0100)]
docs: fix sidebar howto examples

7 years agorename a param that shadow's a global symbol
Richard Russon [Thu, 1 Jun 2017 13:53:46 +0000 (14:53 +0100)]
rename a param that shadow's a global symbol

7 years agoremove unnecessary include
Richard Russon [Wed, 31 May 2017 21:01:10 +0000 (22:01 +0100)]
remove unnecessary include

This was accidentally added by IWYU.
Rename some macro params to avoid the problem in future.

7 years agofix safe_calloc args
Richard Russon [Tue, 30 May 2017 17:24:11 +0000 (18:24 +0100)]
fix safe_calloc args

7 years agoremove unused macros
Richard Russon [Tue, 30 May 2017 15:14:42 +0000 (16:14 +0100)]
remove unused macros

7 years agoremove unused option: SmimeSignOpaqueCommand
Richard Russon [Fri, 26 May 2017 23:37:42 +0000 (00:37 +0100)]
remove unused option: SmimeSignOpaqueCommand

It was never used.

7 years agomerge: upstream fixes (mutt/default)
Richard Russon [Thu, 1 Jun 2017 18:38:57 +0000 (19:38 +0100)]
merge: upstream fixes (mutt/default)

 * Convert classic s/mime to space delimit findKeys output.
 * Add self-encrypt options for PGP and S/MIME.
 * Change $postpone_encrypt to use self-encrypt variables first.
 * automatic post-release commit for mutt-1.8.3
 * Add note about message scoring and thread patterns. (see #3947)

7 years agoAdd note about message scoring and thread patterns. (see #3947)
Kevin McCarthy [Wed, 31 May 2017 23:18:29 +0000 (16:18 -0700)]
Add note about message scoring and thread patterns. (see #3947)

Because scoring occurs before the mailbox is sorted, thread patterns
don't work.  Document a suggested workaround of pushing the score
command in a folder hook.

Also, fix the link target for the score command synopsis.

7 years agoautomatic post-release commit for mutt-1.8.3
Kevin McCarthy [Tue, 30 May 2017 19:47:01 +0000 (12:47 -0700)]
automatic post-release commit for mutt-1.8.3

7 years agoChange $postpone_encrypt to use self-encrypt variables first.
Kevin McCarthy [Mon, 29 May 2017 18:48:43 +0000 (11:48 -0700)]
Change $postpone_encrypt to use self-encrypt variables first.

The concept of postpone encryption is similar to self-encrypting on
send.  The problem is the $postpone_encrypt_as option doesn't take
into account whether PGP or S/MIME is being used.

Since we need to add the new options for self-encryption, modify
$postpone_encrypt to use them by default instead, falling back to
$postpone_encrypt_as if they are unset.  Note $postpone_encrypt_as is
deprecated in the documentation.

7 years agoAdd self-encrypt options for PGP and S/MIME.
Kevin McCarthy [Mon, 29 May 2017 18:48:42 +0000 (11:48 -0700)]
Add self-encrypt options for PGP and S/MIME.

Add $pgp_self_encrypt, $pgp_self_encrypt_as, $smime_self_encrypt,
$smime_self_encrypt_as.

$pgp_sign_as and $smime_default_key are inappropriate to use, as they
specify signing key/certs.  In some cases, this is a different value
than the encryption key/cert.

7 years agoConvert classic s/mime to space delimit findKeys output.
Kevin McCarthy [Mon, 29 May 2017 18:48:41 +0000 (11:48 -0700)]
Convert classic s/mime to space delimit findKeys output.

Unlike gpgme and classic pgp, smime used a "cert\ncert\n" pattern.
Convert to use a space-delimited format, so the self-encrypt option
code can be uniform across pgp, s/mime, and gpgme.