On Mon, Jul 14, 2014 at 09:26:48PM -0500, Greg Hellings wrote:
> I intend on maintaining 1.7 up you're ready to release and branch 1.8.
>
> As others have noted, I've tried to apply this patch to the 1.7 series
> branch but the patch does not apply. One hunk applies with fuzz 2, the
> other does not apply. Jaak - any chance of getting a patch that applies?
>
> --Greg
Try this patch, which is Jaak's patch munged to apply to 1.7.3.
It applies to sword-1-7-x as well.
Thank you and God bless,
Isaac Dunham
diff --git a/utilities/diatheke/corediatheke.cpp
b/utilities/diatheke/corediatheke.cpp
index 6e05e7c..c2b6efb 100644
--- a/utilities/diatheke/corediatheke.cpp
+++ b/utilities/diatheke/corediatheke.cpp
@@ -454,7 +454,6 @@ void doquery(unsigned long maxverses = -1, unsigned char
outputformat = FMT_PLAI
if (font) { *output <<
"style=\"font:\"" << font << ";\" " ;}
if (strcmp(modlocale,locale)
!=0 ) { *output << "lang=\"" << modlocale << "\"";}
*output << ">";
- }
}
if (font && (outputformat == FMT_HTML ||
outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat ==
FMT_THML || outputformat == FMT_CGI)) {
@@ -498,4 +497,4 @@ void doquery(unsigned long maxverses = -1, unsigned char
outputformat = FMT_PLAI
}
}
-
+}
_______________________________________________
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page
