Mercurial > hg > xemacs-beta
changeset 4839:5f1c6ca4d05e
fix bad change to default_query_method, rewrite conditional for more correctness
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 12 Jan 2010 23:16:33 -0600 |
| parents | d08fc2e159c9 |
| children | 17b3dc5500b0 |
| files | src/ChangeLog src/file-coding.c |
| diffstat | 2 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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@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@xemacs.org> * database.c: @@ -164,11 +170,6 @@ 2010-01-11 Ben Wing <ben@xemacs.org> - * file-coding.c (default_query_method): - OOOOOPS! Had = instead of ==. - -2010-01-11 Ben Wing <ben@xemacs.org> - * config.h.in: * config.h.in (ERROR_CHECK_GLYPHS): Trying to avoid link errors referring to the ERROR_CHECK_TYPES
--- 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);