talons

commit 237bf4ff2f52b1cef5b79ca07536fc2cf8e8cff1
parent 8faa1f2826bfb01b2c25832999fd255631eda934
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 15 Dec 2008 16:44:19 +0000

2008-12-15 [colin]	3.6.1cvs77

	* src/common/utils.c
		Fix bug 1746, 'Makes a mailto link from several
		paragraphs'

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/utils.c
 | 
2
+-

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-15 [colin]	3.6.1cvs77
+
+	* src/common/utils.c
+		Fix bug 1746, 'Makes a mailto link from several 
+		paragraphs'
+
 2008-12-15 [paul]	3.6.1cvs76
 
 	* m4/spamassassin.m4
diff --git a/PATCHSETS b/PATCHSETS
@@ -3658,3 +3658,4 @@
 ( cvs diff -u -r 1.25.2.29 -r 1.25.2.30 tools/Makefile.am;  ) > 3.6.1cvs74.patchset
 ( cvs diff -u -r 1.24.2.24 -r 1.24.2.25 Makefile.am;  cvs diff -u -r 1.155.2.94 -r 1.155.2.95 src/Makefile.am;  cvs diff -u -r 1.9.2.38 -r 1.9.2.39 src/common/ssl.c;  cvs diff -u -r 1.36.2.156 -r 1.36.2.157 src/common/utils.c;  cvs diff -u -r 1.20.2.64 -r 1.20.2.65 src/common/utils.h;  cvs diff -u -r 1.25.2.30 -r 1.25.2.31 tools/Makefile.am;  ) > 3.6.1cvs75.patchset
 ( cvs diff -u -r 1.1.4.3 -r 1.1.4.4 m4/spamassassin.m4;  ) > 3.6.1cvs76.patchset
+( cvs diff -u -r 1.36.2.157 -r 1.36.2.158 src/common/utils.c;  ) > 3.6.1cvs77.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=76
+EXTRA_VERSION=77
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -4476,7 +4476,7 @@ search_again:
 			POP_STACK();
 			continue;
 		}
-		if (*bp_ == '\'' || *bp_ == '"') {
+		if (!IN_STACK() && (*bp_ == '\'' || *bp_ == '"')) {
 			PUSH_STACK(*bp_);
 			continue;
 		}