Index: emacs/lib-src/emacsclient.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.96
diff -c -r1.96 emacsclient.c
*** emacs/lib-src/emacsclient.c	25 Nov 2006 00:32:40 -0000	1.96
--- emacs/lib-src/emacsclient.c	30 Nov 2006 04:38:06 -0000
***************
*** 193,199 ****
      }
    else
  #endif
!     fprintf (is_error ? stderr : stdout, msg);
  }
  
  /* Decode the options from argv and argc.
--- 193,204 ----
      }
    else
  #endif
!     {
!       FILE *f = is_error ? stderr : stdout;
! 
!       fprintf (f, "%s", msg);
!       fflush (f);
!     }
  }
  
  /* Decode the options from argv and argc.
***************
*** 589,595 ****
      return INVALID_SOCKET;
  
    if (server.sin_addr.s_addr != inet_addr ("127.0.0.1"))
!     message (TRUE, "%s: connected to remote socket at %s\n",
               progname, inet_ntoa (server.sin_addr));
  
    /*
--- 594,600 ----
      return INVALID_SOCKET;
  
    if (server.sin_addr.s_addr != inet_addr ("127.0.0.1"))
!     message (FALSE, "%s: connected to remote socket at %s\n",
               progname, inet_ntoa (server.sin_addr));
  
    /*