update version

diff --git a/ChangeLog.neomutt b/ChangeLog.neomutt
index 512547567f2eb46391e30a2d16b9777b678da739..9f0647b36b5524d0b2d95a55016b462e55b69ee9 100644 (file)
--- a/ChangeLog.neomutt
+++ b/ChangeLog.neomutt
@@ -1,3 +1,30 @@
+2017-06-09  Richard Russon  <rich@flatcap.org>
+* Contrib
+  - unbind mappings before overwriting in vim-keys
+* Bug Fixes
+  - latest coverity issues (#624)
+  - don't pass colour-codes to filters
+  - Don't set a colour unless it's been defined.
+  - crash if no from is set or founds
+  - ifdef command
+* Translations
+  - fix translations
+  - fix some remaining translation problems
+* Docs
+  - explain binding warnings
+  - don't document unsupported arches
+* Build
+  - fix make git_ver.h
+  - allow xsltproc and w3m calls to fail
+  - fix make dist
+* Upstream
+  - Add a mutt_endwin() before invoking $sendmail
+  - Restore setenv function
+  - Fix tag-prefix to not abort on $timeout
+  - Change km_dokey() to return -2 on a timeout/sigwinch
+  - Enable TEXTDOMAINDIR override to make translation testing easier
+  - Fix "format string is not a string literal" warnings
+
 2017-06-02  Richard Russon  <rich@flatcap.org>
 * Features
   - Warn on bindkey aliasing

diff --git a/README.md b/README.md
index 3172c3fc07f19cd99f21dfa500d5520894aed8e4..dc6b3f7f16660a3ab1480590cf13217850a17375 100644 (file)
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ sorted through them, fixed them up and documented them.
 ## What Features does NeoMutt have?
 
 | Name                 | Description
-|----------------------|-------------------------------------------------------
+| -------------------- | ------------------------------------------------------
 | Attach Headers Color | Color attachment headers using regexp, just like mail bodies
 | Compose to Sender    | Send new mail to the sender of the current mail
 | Compressed Folders   | Read from/write to compressed mailboxes
@@ -54,8 +54,13 @@ sorted through them, fixed them up and documented them.
 
 ## Contributed Scripts and Config
 
-- Keybase Integration (Joshua Jordi)
-- vim-keys - Mutt config for vim users (Ivan Tham)
+| Name                   | Description
+| ---------------------- | ---------------------------------------------
+| Header Cache Benchmark | Script to test the speed of the header cache
+| Keybase                | Keybase Integration
+| Useful programs        | List of useful programs interacting with mutt
+| Vi Keys                | Easy and clean Vi-keys for Mutt
+| Vim Syntax             | Vim Syntax File
 
 ## Where is NeoMutt?
 
@@ -64,9 +69,9 @@ sorted through them, fixed them up and documented them.
 - Questions/Bugs:  https://github.com/neomutt/neomutt/issues
 - Website:         http://www.neomutt.org/
 - IRC:             irc://irc.freenode.net/neomutt - please be patient. 
-We're a small group, so our answer might take some time.
+  We're a small group, so our answer might take some time.
 - Mailinglists:    [neomutt-users](mailto:neomutt-users-request@neomutt.org?subject=subscribe)
-and [neomutt-devel](mailto:neomutt-devel-request@neomutt.org?subject=subscribe)
+  and [neomutt-devel](mailto:neomutt-devel-request@neomutt.org?subject=subscribe)
 - Development:     http://www.neomutt.org/dev.html
 
 ## NeoMutt Developers
@@ -74,19 +79,19 @@ and [neomutt-devel](mailto:neomutt-devel-request@neomutt.org?subject=subscribe)
 Here's a list of everyone who's helped NeoMutt:
 
 Adam Borowski, Alex Pearce, Alok Singh, Ander Punnar, André Berger,
-Antonio Radici, Baptiste Daroussin, Bernard Pratz, Bryan Bennett,
-Chris Czettel, Chris Salzberg, Christian Dröge, Christoph Berg, Clemens Lang,
+Antonio Radici, Baptiste Daroussin, Bernard Pratz, Bo Yu, Bryan Bennett,
+Christian Dröge, Christoph Berg, Chris Czettel, Chris Salzberg, Clemens Lang,
 Damien Riegel, Darshit Shah, David Sterba, Doug Stone-Weaver, Edward Betts,
 Elimar Riesebieter, Evgeni Golov, Fabian Groffen, Fabio Alessandro Locati,
-Faidon Liambotis, František Hájik, Guillaume Brogi, Ian Zimmerman,
-Ismaël Bouya, Ivan Tham, Jack Stratton, Johannes Frankenau, Johannes Weißl,
-Joshua Jordi, Karel Zak, Kevin Velghe, Kurt Jaeger, Marcin Rajner, Marco Hinz,
-Matteo Vescovi, Mehdi Abaakouk, Olaf Lessenich, Philipp Marek,
-Pierre-Elliott Bécue, Pietro Cerutti, Riad Wahby, Richard Hartmann,
-Richard Russon, Rubén Llorente, Santiago Torres, Serge Gebhardt, Somini,
-Stephen Gilles, Steven Ragnarök, Sven Guckes, Thomas Adam, Thomas Klausner,
-Tobias Angele, Udo Schweigert, Vsevolod Volkov, Werner Fink, Wieland Hoffmann,
-William Pettersson, Yoshiki Vázquez Baeza.
+Faidon Liambotis, František Hájik, Guillaume Brogi, Ian Zimmerman, Ismaël Bouya,
+Ivan Tham, Jack Stratton, Johannes Frankenau, Johannes Weißl, Joshua Jordi,
+Karel Zak, Kevin Velghe, Kurt Jaeger, Marcin Rajner, Marco Hinz, Matteo Vescovi,
+Mehdi Abaakouk, Olaf Lessenich, Peter Hogg, Philipp Marek, Pierre-Elliott Bécue,
+Pietro Cerutti, Riad Wahby, Richard Hartmann, Richard Russon, Rubén Llorente,
+Santiago Torres, Serge Gebhardt, Somini, Stefan Assmann, Stephen Gilles,
+Steven Ragnarök, Sven Guckes, Thomas Adam, Thomas Klausner, Tobias Angele,
+Udo Schweigert, Vsevolod Volkov, Werner Fink, Wieland Hoffmann,
+William Pettersson, Yoshiki Vázquez Baeza, Zero King.
 
 ## Original Patch Authors
 

diff --git a/configure.ac b/configure.ac
index 3b83a8c8b7f412effc3cf2a677ebbd4540edb635..9565b39276c4e8fa86c70b74fdfae2d5cd899ad8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl     autoreconf -i
 CFLAGS=$CFLAGS
 LDFLAGS=$LDFLAGS
 
-AC_INIT([NeoMutt], [20170602], [neomutt-devel@neomutt.org], [mutt], [https://www.neomutt.org])
+AC_INIT([NeoMutt], [20170609], [neomutt-devel@neomutt.org], [mutt], [https://www.neomutt.org])
 AC_CONFIG_SRCDIR(mutt.h)
 AC_CONFIG_AUX_DIR([.build-aux])
 AM_INIT_AUTOMAKE

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 6f2d7413cb311725357245f8fb1aae56724e5c77..bf93fc8188d4187530b41b6ca95acd9ff3f535a0 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -2898,7 +2898,7 @@ color sidebar_divider   color8  default
         <tgroup cols="1">
           <tbody>
             <row>
-              <entry>neomuttrc-20170602</entry>
+              <entry>neomuttrc-20170609</entry>
             </row>
             <row>
               <entry>neomuttrc</entry>
@@ -2942,7 +2942,7 @@ color sidebar_divider   color8  default
             </thead>
             <tbody>
               <row>
-                <entry>/etc/xdg/mutt/neomuttrc-20170602</entry>
+                <entry>/etc/xdg/mutt/neomuttrc-20170609</entry>
                 <entry>NeoMutt release version</entry>
               </row>
               <row>
@@ -2958,7 +2958,7 @@ color sidebar_divider   color8  default
                 <entry>Note the case of the filename</entry>
               </row>
               <row>
-                <entry>/etc/mutt/neomuttrc-20170602</entry>
+                <entry>/etc/mutt/neomuttrc-20170609</entry>
                 <entry>NeoMutt release version</entry>
               </row>
               <row>
@@ -2974,7 +2974,7 @@ color sidebar_divider   color8  default
                 <entry>Note the case of the filename</entry>
               </row>
               <row>
-                <entry>/usr/share/mutt/neomuttrc-20170602</entry>
+                <entry>/usr/share/mutt/neomuttrc-20170609</entry>
                 <entry>NeoMutt release version</entry>
               </row>
               <row>
@@ -3021,7 +3021,7 @@ color sidebar_divider   color8  default
             </thead>
             <tbody>
               <row>
-                <entry>~/.config/mutt/neomuttrc-20170602</entry>
+                <entry>~/.config/mutt/neomuttrc-20170609</entry>
                 <entry>NeoMutt release version</entry>
               </row>
               <row>
@@ -3035,7 +3035,7 @@ color sidebar_divider   color8  default
                 <entry>~/.config/mutt/muttrc</entry>
               </row>
               <row>
-                <entry>~/.neomuttrc-20170602</entry>
+                <entry>~/.neomuttrc-20170609</entry>
                 <entry>NeoMutt release version</entry>
               </row>
               <row>
@@ -3049,7 +3049,7 @@ color sidebar_divider   color8  default
                 <entry>~/.muttrc</entry>
               </row>
               <row>
-                <entry>~/.mutt/neomuttrc-20170602</entry>
+                <entry>~/.mutt/neomuttrc-20170609</entry>
                 <entry>NeoMutt release version</entry>
               </row>
               <row>

diff --git a/po/mutt.pot b/po/mutt.pot
index d1bbeb9f77673fb99b7c9e71d58dbd54a0a9fcd1..84896874393e3ae8f3dbb07cad651a8bb87a4fa9 100644 (file)
--- a/po/mutt.pot
+++ b/po/mutt.pot
@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mutt 20170602\n"
+"Project-Id-Version: mutt 20170609\n"
 "Report-Msgid-Bugs-To: neomutt-devel@neomutt.org\n"
 "POT-Creation-Date: 2017-06-02 12:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"