* src/symtab.c: Ported r1584 from branches/gmach.

* NEWS: Update.
* doc/mailfromd.texi: Updated.
* configure.ac: Version 4.3 (preparing for the release).


git-svn-id: file:///svnroot/mailfromd/trunk@1585 7a8a7f39-df28-0410-adc6-e0d955640f24

6 files changed, 24 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index c8a53f27..e547c40e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,8 @@
+2008-01-21  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* src/symtab.c: Ported r1584 from branches/gmach.
+	* NEWS: Update.
+	* doc/mailfromd.texi: Updated.
+	* configure.ac: Version 4.3 (preparing for the release).
+	
 2008-01-15  Sergey Poznyakoff  <gray@gnu.org.ua>
diff --git a/NEWS b/NEWS
index 5408a5ce..f5dbfdec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
-Mailfromd NEWS -- history of user-visible changes. 2008-01-15
+Mailfromd NEWS -- history of user-visible changes. 2008-01-21
 Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
@@ -7,3 +7,3 @@ Please send mailfromd bug reports to <bug-mailfromd@gnu.org.ua>
 
-Version 4.2.90 (SVN)
+Version 4.3 (SVN)
 
@@ -32,5 +32,8 @@ implementation will not be compiled.
 
-* Fix compilation on Sun.
+* Bugfixes:
 
-* Fix header deletion (delete action).
+** Fix compilation on Sun.
+** Fix header deletion (delete action).
+** Variable shadowing was broken if a rehash happened between vardcl and
+   forget_autos.
 
diff --git a/configure.ac b/configure.ac
index e817d177..056f46d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,3 @@
 # This file is part of mailfromd.
-# Copyright (C) 2005, 2006, 2007 Sergey Poznyakoff
+# Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
 #
@@ -18,4 +18,4 @@ AC_PREREQ(2.59)
 m4_define([MF_VERSION_MAJOR], 4)
-m4_define([MF_VERSION_MINOR], 2)
-m4_define([MF_VERSION_PATCH], 90)
+m4_define([MF_VERSION_MINOR], 3)
+dnl m4_define([MF_VERSION_PATCH], 0)
 AC_INIT([mailfromd],
diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index 6db9fd78..78ef7877 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -5173,4 +5173,4 @@ statements, declared in @samp{begin} blocks (see example below).
 @cindex @samp{end} and @code{delete}
-@item Header manipulation actions (@pxref{header manipulation}) can be
-used only in @samp{begin} header.
+@item Header manipulation actions (@pxref{header manipulation}) cannot
+be used in @samp{end} headers.
 @end enumerate
@@ -6511,3 +6511,3 @@ the return status of the command otherwise.
 @acronym{RFC} 3028.  @command{Mailfromd} supports an extended form
-of this language.  For description of the language and available
+of this language.  For a description of the language and available
 extensions, @xref{Sieve Language, Sieve Language, Sieve Language,
@@ -6591,3 +6591,3 @@ do
     set flags %flags | MF_SIEVE_DEBUG_PROT
-  fi	      
+  fi          
 
diff --git a/src/main.c b/src/main.c
index 4741dba4..6efb0e8e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1623,3 +1623,3 @@ struct mu_cfg_param mf_cfg_param[] = {
 	     "following form:\n"
-	     "  <module: string>[=<level: number>\n"
+	     "  <module: string>[=<level: number>]\n"
 	     "where <module> is the name of a Mailfromd module, and <level> "
diff --git a/src/symtab.c b/src/symtab.c
index 841d6cd7..c9c31194 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -153,2 +153,4 @@ rehash()
 				sp->vp = old_symtab[i].vp;
+				if (sp->state == SYM_VARIABLE)
+					sp->vp->variable.owner = sp;
 			}