Updated

3 files changed, 45 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 721a477a1..db9f51a5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2004-06-09  Sergey Poznyakoff
+
+	* NEWS: Updated
+	* doc/texinfo/programs.texi: Updated
+	* include/mailutils/mutil.h (mu_decode_filter): New function
+	(mu_default_fallback_mode): New variable.
+	(mu_set_default_fallback): New function.
+	* mailbox/mutil.c: Likewise
+	* libmu_scm/Makefile.am: Do not use $< in explicit rules
+	* mail/util.c (util_setenv): Special handling for decode-fallback
+	variable
+	* mail.remote/mail.remote.c: Fixed doc string
+	* mailbox/mu_auth.c: Add missing gettext markers
+	* mailbox/rfc2047.c: Use mu_decode_filter.	
+	* mh/mh_global.c (mh_read_profile): Handle new profile
+	variable "Decode-Fallback".
+	* pop3d/pop3d.c (options): Fixed typo in doc string
+	* include/mailutils/stream.h: Forward declaration of struct
+	timeval is needed for stream_wait().
+
 2004-06-06  Sergey Poznyakoff 
 
 	* include/mailutils/filter.h (filter_iconv_create): New prototype.
diff --git a/NEWS b/NEWS
index 005b65c40..743306d4f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU mailutils NEWS -- history of user-visible changes.  2004-06-05
+GNU mailutils NEWS -- history of user-visible changes.  2004-06-09
 Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 See the end of file for copying conditions.
 
@@ -45,6 +45,8 @@ of header fields used to determine the sender of the message.
 be added to outgoing messages.
 *** New variables 'datefield' and 'emptystart' for compatibility with
 nail
+*** New variable 'decode-fallback' controls how to represent the characters
+that cannot be rendered using current character set.
 
 ** mail.remote
 *** Support for -t option (read recipients from the message). This fixes
diff --git a/doc/texinfo/programs.texi b/doc/texinfo/programs.texi
index a745d9c38..309f47caa 100644
--- a/doc/texinfo/programs.texi
+++ b/doc/texinfo/programs.texi
@@ -1812,6 +1812,28 @@ if @code{crt} is set without a value, then the height of the terminal
 screen is used to compute the threshold.  The number of lines on
 screen is controlled by @code{screen} variable.
 
+@item decode-fallback
+@*Type: String.
+@*Default: @samp{none}.
+@vrindex decode-fallback, mail variable
+
+This variable controls the way to represent characters that cannot
+be rendered using current character set. It can have three values:
+
+@table @samp
+@item none
+Such characters are not printed at all. The conversion process stops
+at the first character that cannot be rendered.
+
+@item copy-pass
+The characters are displayed @samp{as is}. Notice, that depending on
+your setup, this may screw-up your terminal settings.
+
+@item copy-octal
+Unprintable characters are represented by their octal codes. Printable
+ones are printed @samp{as is}.
+@end table
+
 @item dot
 @*Type: Boolean.
 @*Default: False.