carbon2-commit: fix bad change to default_query_method, rewrite conditional for more correctness

[Ben Wing]

changeset:   4887:5f1c6ca4d05e
user:        Ben Wing <ben at xemacs.org>
date:        Tue Jan 12 23:16:33 2010 -0600
files:       src/ChangeLog src/file-coding.c
description:
fix bad change to default_query_method, rewrite conditional for more correctness


diff -r d08fc2e159c9 -r 5f1c6ca4d05e src/ChangeLog
--- a/src/ChangeLog	Tue Jan 12 01:53:35 2010 -0600
+++ b/src/ChangeLog	Tue Jan 12 23:16:33 2010 -0600
@@ -1,3 +1,9 @@
+2010-01-12  Ben Wing  <ben at xemacs.org>
+
+	* file-coding.c (default_query_method): Single = is intended.
+	Rewrite using comma operator to make this clearer and avoid
+	dependency on the value of an enum.
+
 2010-01-11  Ben Wing  <ben at xemacs.org>
 
 	* database.c:
@@ -161,11 +167,6 @@
 	in regex.c where it was getting ranges with an end one greater
 	than expected, since it creates closed-closed range tables and
 	was getting passed the internal-format ranges.
-
-2010-01-11  Ben Wing  <ben at xemacs.org>
-
-	* file-coding.c (default_query_method):
-	OOOOOPS!  Had = instead of ==.
 
 2010-01-11  Ben Wing  <ben at xemacs.org>
 
diff -r d08fc2e159c9 -r 5f1c6ca4d05e src/file-coding.c
--- a/src/file-coding.c	Tue Jan 12 01:53:35 2010 -0600
+++ b/src/file-coding.c	Tue Jan 12 23:16:33 2010 -0600
@@ -500,9 +500,9 @@
           fail_range_start = pos;
           while ((pos < end) &&  
                  (EQ (Qnil, get_char_table (ch, safe_chars))
-                  && (failed_reason == query_coding_unencodable))
-                 && (previous_failed_reason == query_coding_succeeded
-                     || previous_failed_reason == failed_reason))
+                  && (failed_reason = query_coding_unencodable,
+		      (previous_failed_reason == query_coding_succeeded
+		       || previous_failed_reason == failed_reason))))
             {
               pos++;
               INC_BYTEBPOS (buf, pos_byte);