fcc62991 — Olaf Hering a day ago master
refresh de.po

align with result of make update-po

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Relocate po OPS files to bottom of POTFILES.in.

This matches the pre-0.21 migration order, and will reduce the size of
updates for the next release.
1267c1ca — Olaf Hering 2 days ago
refresh de.po

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Merge branch 'stable'
automatic post-release commit for mutt-2.0.6
Update UPDATING file for 2.0.6 release.
Add -nonumbers to lynx options.

This will remove the useless link and field numbers from output in the
Don't install an empty manual.txt file.

Closes #334.

If all the html to txt programs we use (lynx, elinks, w3m) are missing
from the system, the shell redirection willl create an empty file.

Change the install step to use -s "FILE exists and has a size greater
than zero".

Thanks to Mitchell Blank Jr for the ticket and suggested fix.
9e338a19 — Vincent Lefevre 5 days ago
Updated French translation.
fb5f052f — Vincent Lefevre 5 days ago
Updated French translation.
Don't leak fp when aborting mutt_make_message_attach().

I forgot to close up the fp before returning.
Prompt for retry on decrypt failure for mime message attachments.

Closes #331.

Change $forward_decyrpt to a quadoption, defaulting 'yes' for backward
compatibility.  This will allow users to choose on a per-message
attachment basis if desired.

If decoding from $mime_forward_decode fails or decrypting from
$forward_decrypt, notify the user and prompt to retry attaching
without the decode/decrypt.

$forward_decrypt directly invokes decryption and returns -1 on error,
while $mime_forward_decode uses the handler rendering, which returns a
non-fatal 1 (to allow message display of failing encrypted message).
So prompt on either case.

If they decline to retry, or the retry fails, return NULL only on a
hard-fail (-1) return code.  They've been warned and can peek at the
final result.

The send generate_body() code was not checking for a NULL result.
This seems like a bad idea, so add a check and error message in that
Merge branch 'stable'
Fix (un)setenv to not return an error with unset env vars.

The code was returning -1 in those cases.  This can cause hook
processors, such as send2-hook, to sleep 1 second without an error
message being set and displayed.  It also causes the hook processor to
abort executing subsequent matching commands.

-1 should be reserved for syntax errors.  For setenv querying, change
the return value to 0.  For unsetenv, generate a message and also
change the return value to 0.

<enter-command> checks if err->data is set to determine whether to
print anything, and the behavior is used in the 'set' commands, so
this is established correct behavior.
Add a note about the '^' mailbox shortcut.

Emphasize that it's not always set, for example in command-line mode,
or when evaluating the muttrc at startup.
Merge branch 'stable'
Save CurrentFolder in background edit scope.

The CurrentFolder can actually be used to resolve an fcc-hook at fcc
time.  We would want to use the folder they started composing in, to
be consistent with expectations.
Scan OPS files directly for gettext translation strings.

Previously, gettext's po/Makefile.in.in was modified to separately
scan and merge a generated file: keymap_alldefs.h.  Gettext doesn't
recommend nor provide support for scanning generated files.

However, there is no reason we have to scan the generated file.
Instead move the N_() markers and L10N comments into the OPS files.
Then simply add the OPS files to po/POTFILES.in.

Add a '--language=C' option to xgettext to avoid a warning about the
OPS files not have any known language suffix.

Modify gen_defs and doc/gen-map-doc to deal with the new format of the
OPS files.
Fix gettext update problems.

The keymap_alldefs.h file was previously generated and scanned inside
po/Makefile.in.in as an additional POTFILES files build dependency and

The file can't be scanned by just adding it to po/POTFILES.in because
it's a generated file that will be in the build directory.  The next
commit will instead add the OPS* files directly to POTFILES.in to be

For this commit, remove the generation of keymap_alldefs.h.

Remove the redundant ALL_LINGUAS setting from configure.ac.  Reformat
the LINGUAS file to be on one line, as the documentation shows.  I
think it was okay before, but just to be safe.

Fix L10N scanning by adding '--add-comments=L10N' to XGETTEXT_OPTIONS
in po/Makevars.

Set MSGID_BUGS_ADDRESS to silence a warning.

Add gettext.h to the Makefile.am EXTRA_DIST list.

Remove -Iintl flags from all Makefile.am files, since the intl
directory is no longer bundled in Mutt.
8d94928e — Vincent Lefevre 18 days ago
Remove the AM_GNU_GETTEXT_VERSION line as it makes autoreconf fail with
gettext < 0.21 because autopoint complains that gettext is too old.

Using this line with a version smaller than 0.21 makes autopoint itself
fail, thus does not solve the problem.
33fe78af — Vincent Lefevre 18 days ago
Add AM_GNU_GETTEXT_VERSION line to avoid a warning from autoreconf.