Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 814-823)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 59-69)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-26

1 files changed, 3 insertions, 3 deletions

diff --git a/src/process.c b/src/process.c
index b63edbe0b6d..f6e936105f3 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1776,7 +1776,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
   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);
 
@@ -3553,7 +3553,7 @@ usage: (make-network-process &rest ARGS)  */)
   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;
@@ -5186,7 +5186,7 @@ read_process_output (proc, channel)
              carryover);
       p->decoding_carryover = carryover;
       /* 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));