<div dir="ltr">Thanks, this is in now as r3245 in SVN.<div><br></div><div>--Greg</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Jul 15, 2014 at 9:32 AM, Jaak Ristioja <span dir="ltr">&lt;<a href="mailto:jaak@ristioja.ee" target="_blank">jaak@ristioja.ee</a>&gt;</span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="">-----BEGIN PGP SIGNED MESSAGE-----<br>
Hash: SHA1<br>
<br>
</div>Sry, the original patch had some tabs vs spaces issue, I think. Here&#39;s<br>
the correct one for 1.7.3.<br>
<div><div class="h5"><br>
On 15.07.2014 10:41, Jaak Ristioja wrote:<br>
&gt; No. As I repeatedly have tried to say, I&#39;m not qualified. Bug the<br>
&gt; author of the code. My patch (which I&#39;m still not convinced is<br>
&gt; correct) only applied to 1.7.3.<br>
&gt;<br>
&gt; Blessings, Jaak<br>
&gt;<br>
&gt;<br>
&gt; On 15.07.2014 05:26, Greg Hellings wrote:<br>
&gt;&gt; I intend on maintaining 1.7 up you&#39;re ready to release and<br>
&gt;&gt; branch 1.8.<br>
&gt;<br>
&gt;&gt; As others have noted, I&#39;ve tried to apply this patch to the 1.7<br>
&gt;&gt; series branch but the patch does not apply. One hunk applies<br>
&gt;&gt; with fuzz 2, the other does not apply. Jaak - any chance of<br>
&gt;&gt; getting a patch that applies?<br>
&gt;<br>
&gt;&gt; --Greg<br>
&gt;<br>
&gt;<br>
&gt;&gt; On Sat, Jul 12, 2014 at 9:09 PM, Troy A. Griffitts<br>
&gt;&gt; &lt;<a href="mailto:scribe@crosswire.org">scribe@crosswire.org</a> &lt;mailto:<a href="mailto:scribe@crosswire.org">scribe@crosswire.org</a>&gt;&gt; wrote:<br>
&gt;<br>
&gt;&gt; Isaac,  Thanks for checking and confirming that trunk has been<br>
&gt;&gt; fixed.<br>
&gt;<br>
&gt;&gt; Greg,  It seems quite reasonable to applying Jaak&#39;s patch to the<br>
&gt;&gt; 1.7 branch if we intend on releasing a 1.7.4.  I mention this,<br>
&gt;&gt; as this is an exception to the rule that all patches are first<br>
&gt;&gt; applied to trunk and then merged to release.<br>
&gt;<br>
&gt;&gt; Thanks again Jaak and Isaac (and Greg for maintaining the 1.7<br>
&gt;&gt; branch).<br>
&gt;<br>
&gt;&gt; Troy<br>
&gt;<br>
&gt;<br>
&gt;<br>
&gt;<br>
&gt;&gt; On 07/12/2014 02:21 PM, Isaac Dunham wrote:<br>
&gt;<br>
&gt;&gt; On Sat, Jul 12, 2014 at 10:59:19AM -0700, Troy A. Griffitts<br>
&gt;&gt; wrote:<br>
&gt;<br>
&gt;&gt; Dear Jaak,<br>
&gt;<br>
&gt;&gt; Thank you so much for looking into this.  I went to review your<br>
&gt;&gt; patch and it doesn&#39;t apply cleanly to trunk.  Have you confirmed<br>
&gt;&gt; that this problem still exists in trunk?  If so, might you<br>
&gt;&gt; consider sending a patch against trunk? Thank you!<br>
&gt;<br>
&gt;&gt; Troy<br>
&gt;<br>
&gt;&gt; On 07/10/2014 01:34 AM, Jaak Ristioja wrote:<br>
&gt;<br>
&gt;&gt; This seems to be a really silly indentation error in Sword<br>
&gt;&gt; 1.7.3. At least the attached patch fixed the problem in my Alpine<br>
&gt;&gt; Linux VM for &quot;diatheke -b KJV -k Ps117&quot;. Might already be fixed<br>
&gt;&gt; in SVN.<br>
&gt;<br>
&gt;&gt; Can any Sword developers confirm this bug and fix?<br>
&gt;<br>
&gt;&gt; Blessings! Jaak<br>
&gt;<br>
&gt;&gt; Just built sword from the mirror at <a href="http://gitorious.org/sword/sword" target="_blank">gitorious.org/sword/sword</a><br>
&gt;&gt; &lt;<a href="http://gitorious.org/sword/sword" target="_blank">http://gitorious.org/sword/sword</a>&gt;; the bug is fixed there. (For<br>
&gt;&gt; reference: I see that diatheke -f plain is now needed to get<br>
&gt;&gt; plain output, since -f internal is now the default.)<br>
&gt;<br>
&gt;&gt; God bless, Isaac Dunham<br>
&gt;<br>
&gt;<br>
&gt;&gt; _________________________________________________ sword-devel<br>
&gt;&gt; mailing list: <a href="mailto:sword-devel@crosswire.org">sword-devel@crosswire.org</a><br>
&gt;&gt; &lt;mailto:<a href="mailto:sword-devel@crosswire.org">sword-devel@crosswire.org</a>&gt;<br>
&gt;&gt; <a href="http://www.crosswire.org/__mailman/listinfo/sword-devel" target="_blank">http://www.crosswire.org/__mailman/listinfo/sword-devel</a><br>
&gt;&gt; &lt;<a href="http://www.crosswire.org/mailman/listinfo/sword-devel" target="_blank">http://www.crosswire.org/mailman/listinfo/sword-devel</a>&gt;<br>
&gt;&gt; Instructions to unsubscribe/change your settings at above page<br>
&gt;<br>
&gt;<br>
&gt;<br>
&gt;&gt; _________________________________________________ sword-devel<br>
&gt;&gt; mailing list: <a href="mailto:sword-devel@crosswire.org">sword-devel@crosswire.org</a><br>
&gt;&gt; &lt;mailto:<a href="mailto:sword-devel@crosswire.org">sword-devel@crosswire.org</a>&gt;<br>
&gt;&gt; <a href="http://www.crosswire.org/__mailman/listinfo/sword-devel" target="_blank">http://www.crosswire.org/__mailman/listinfo/sword-devel</a><br>
&gt;&gt; &lt;<a href="http://www.crosswire.org/mailman/listinfo/sword-devel" target="_blank">http://www.crosswire.org/mailman/listinfo/sword-devel</a>&gt;<br>
&gt;&gt; Instructions to unsubscribe/change your settings at above page<br>
&gt;<br>
&gt;<br>
&gt;<br>
&gt;<br>
&gt;&gt; _______________________________________________ sword-devel<br>
&gt;&gt; mailing list: <a href="mailto:sword-devel@crosswire.org">sword-devel@crosswire.org</a><br>
&gt;&gt; <a href="http://www.crosswire.org/mailman/listinfo/sword-devel" target="_blank">http://www.crosswire.org/mailman/listinfo/sword-devel</a><br>
&gt;&gt; Instructions to unsubscribe/change your settings at above page<br>
&gt;<br>
&gt;<br>
&gt;<br>
&gt; _______________________________________________ sword-devel mailing<br>
&gt; list: <a href="mailto:sword-devel@crosswire.org">sword-devel@crosswire.org</a><br>
&gt; <a href="http://www.crosswire.org/mailman/listinfo/sword-devel" target="_blank">http://www.crosswire.org/mailman/listinfo/sword-devel</a> Instructions<br>
&gt; to unsubscribe/change your settings at above page<br>
&gt;<br>
<br>
-----BEGIN PGP SIGNATURE-----<br>
Version: GnuPG v2<br>
<br>
</div></div>iQgcBAEBAgAGBQJTxTuIAAoJELozJlbjIn79SrlAALsa6dAGv8g1JoX3czpwLqtH<br>
sMjiIKIE6iQzIT1fFgYQUPXHnt1tko9RbBteLZmoBriDT+w78L2zKPxwyiKE8C8C<br>
40FI6ANZ6qRdVlM2GIIdspzEC8ipLZOv0w9K4V3d/OofyVByaMgVU3MWS00VLCq4<br>
x4aPYLVaA5yNhXBFtVJQXEvNc3PSDjBAoPYzh8gc3BYXFLWwQ3cDC9RAZoVXa7pk<br>
tPkaPjuV9xO9y2VmPkNDnxqeaXhP4zPvnFmvtUcU2Q9reLEkmh8TwXMN6p4pdGmy<br>
g3z+g84nnW4VSiQGYsTO5FX7+IQFY52LxXtE+y0ohd1xI57NdHEvXxs0+25m1pwZ<br>
S2RC2hpTA9OdYXUQEFiuAMScGXkIZCIXOl95af4vZRKPKAZwiknJ5OkyPPtioQnS<br>
eoGVbSficdI1ESB8NUhgo1Ku6O6RwOuI4ZtDLqV+mym6QFEwkN+8wvIzCOZRPn8M<br>
zIQvzd/OU4tOjuVe1sanlbkPIM9nSf5rwKyzFjSSahCQ4Xx4VlSU+nKxIjxaJyeO<br>
YDrYHTL0UWe8ZM0UGg8nwCK3jn9D296lsC2uQAEgTTa517VQ74hFRhd4N3Dbyt3x<br>
FakpOkh/ggqEXVxTDTF6bbGhcSwLaGFyPiGlC+OuZ9eJFLBujBqH4EODvPQHuQhP<br>
5TXjs/Vn/17e2rnYWNSJNzhFnzCKMCz+NHW61o2vuPnMnFfY3garxLDG6yRCE1DA<br>
uYh1v1yFJ98ekYWEH36Hh6yF4jIwCpqMngljBf3nEuOpZ4M0I4b7WvFzmjXwn+Xb<br>
2F2Ch617nXCfS6oq1zDZUPTxZykPr9UnAIgNcBFKOHk1vsBpgcRQDv6u9sFFQrle<br>
EMmGI4zMHX+X6c9b4G1R8OlX6AtVgNRWGk2DTVgrNKIbkFezeoH48Obv11dvz8ZH<br>
gUIqOVTHb9iv6U7wjIh8kDAPEDpYwg6d971YOCFqORiiHo447za1G9rlRW+bAxX1<br>
xAJgLme6qGlzaqqyoRUSor7RHoIxuk40uVbj02n802L5JDVplIscaDoXTxNWxVgH<br>
U12WjXjnp1nrQeiTLZPtW4M9jAb205Lq8mwAEtjYQS1zA/b83MyvZVlQQJ+inqS9<br>
LmTqqD0zCJ//ShtucXZx2KjVV9i6Vs8G/Et6osnPAsFCUqzn79XwB4VGcYrHR+79<br>
rp27FOFAusGnezGM9044PHd7OIQP8+wX6UXAFrFLcAZEkzPlwfh4YrFiJd2ODOGn<br>
SVvr0t1BDPAcJeSmZK6Llw0oYnQkx+b60HMoue6OBlOGEKdTcznd3cRJQ8GnPyYw<br>
5sB15oshCpEwSnVdvLj5a+DIIFcnjIchROKCY+ToTLToKiTyCsgkW7gJqgl9qqu+<br>
5U1db5QXElmpbJ/FS4rwylBUadPMFNgl/OP3YjyT3xBzc85LBLvXh6dHghkcWPmQ<br>
PLzkWS1gVrZUrw9SNtkM0/NWEyEA5DO9LsSrw33jBtTaHBmmSbwPWGs1rXTYgrKb<br>
2K+G7YJHq1aekm5B6tY/Sp4W/s4HEg/+LFDAcfj76tW4T4rogU9zEBnxl1XJrXQY<br>
it3DJMwsMuONynRIm5YbRgYPkku9bTFqe90GbPfrfSkpNN+gExLnRyZGe3rhlUWx<br>
2FnWuAn1Khjy/8GC6oIZ+kcbtPbpQawVSNlFMJv4FFfbHVY57gt9piEsxVHqO+0Z<br>
NexpPTk27x9lMhYl+P7FCVsX0Ji5l5l54RGEEfeFSH2T31ftLBOFPYioBrT8TI99<br>
shv998VJ8YHmC0/3B2z8v6dKHTVQejdMbLGCXEQ8X/Ti2NTyAsMNQ9+Tm+Sww0Kf<br>
ukmee31n+6d5Xj9VyIdEDczjdWdVhBQa/3W9tfrxgx/LRzSrwxay8GU+TQkHQFKk<br>
DWnGXUjgHP/eJYi5THvFDHqUnVw5Hw2WHG7LqufMHxZvR6hfPzV5SVG6r14qD4hz<br>
6y22jKkQZ9/IKkh5tJlmGCEV/z1b3ClwPcKDF3d+YmBYLm9ShxB40qMfJqBWQQG6<br>
By9UlDUSIRF62J4A09VLbGHv2POxsjPeih/3RCJan4NWiM3AyAx8Tj7BtkWAnnoQ<br>
DPv8Jj/vsJMruCu5Fot2qjrCNZ6rdmvmXAx90kueqHLvlny6ly8NxJHln5D9tGMM<br>
O0N9WTMFy2Bjs40QI+LoFJWRoPXZC/TnZbpJyik24HmGgLYR7KaWtLSREaqLsUtm<br>
QNIdJqg50gS3kZWct3brwptRN5Onz8s1R2q55A8DYK7HBy6nFy93Uc7k4wrE5G5C<br>
J00wHGS6jfaO5NQxBeT2YMUcOgx4J6gNCaw/CnpThNUt9fbiwzE8t0K+/uTJ8dxn<br>
BXTyO1mhmCvF7vfRj8y99CPDodyFXQGmzYF032TG6sWDXpZnSFYpxS0IIau2UTGR<br>
W03j2UKgwPdN2cjqgiaLIxktV1Jd40gNFJzYeauqYhn8YwnivGtZz5HErLrt9hX8<br>
XoQ7vzM72/AmlwJoIpC/12Ou5w4DAZsgJxKL7CP+O0rZH3S1C9lxZ7PIwG+OfIA7<br>
qesb87aW/yaVw9e/kl4XbDnST0LOX8s0aDpuUkFIUxHfC1Y1qo83XWiuqfU9quw8<br>
SV7q5oqOBgPpqxJi47R8jYM3ilToWIOFOj+FGjlW6o97d3VajkqmAKwiCLOgLr3X<br>
Uot0r4cKcoMiYSH/kq2DYKZ5g2HHLCOeyfUXkJexopJ1QZHxMb790LiGTh7U0WvR<br>
6ElslAXcS7gWcB/1VO8k<br>
=tpiQ<br>
-----END PGP SIGNATURE-----<br>
<br>_______________________________________________<br>
sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org">sword-devel@crosswire.org</a><br>
<a href="http://www.crosswire.org/mailman/listinfo/sword-devel" target="_blank">http://www.crosswire.org/mailman/listinfo/sword-devel</a><br>
Instructions to unsubscribe/change your settings at above page<br></blockquote></div><br></div>