Mercurial > emacs
diff src/process.c @ 90984:a1be62cbd32a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 814-815)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-232
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 18 Jul 2007 22:15:15 +0000 |
| parents | a66921565bcb 50da0700fc26 |
| children | f55f9811f5d7 |
line wrap: on
line diff
--- a/src/process.c Mon Jul 16 19:26:14 2007 +0000 +++ b/src/process.c Wed Jul 18 22:15:15 2007 +0000 @@ -1775,7 +1775,7 @@ XPROCESS (proc)->encoding_buf = make_uninit_string (0); XPROCESS (proc)->inherit_coding_system_flag - = (NILP (buffer) || !inherit_process_coding_system); + = !(NILP (buffer) || !inherit_process_coding_system); create_process (proc, (char **) new_argv, current_dir); @@ -3547,7 +3547,7 @@ p->encoding_buf = make_uninit_string (0); p->inherit_coding_system_flag - = (!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); + = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); UNGCPRO; return proc; @@ -5176,7 +5176,7 @@ p->decoding_carryover = coding->carryover_bytes; } /* Adjust the multibyteness of TEXT to that of the filter. */ - if (p->filter_multibyte != STRING_MULTIBYTE (text)) + if (!p->filter_multibyte != !STRING_MULTIBYTE (text)) text = (STRING_MULTIBYTE (text) ? Fstring_as_unibyte (text) : Fstring_to_multibyte (text));