# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1198896274 0
# Node ID b914acf51c53004e1c1c186a5276bdfb6048d3e2
# Parent  89cfe5d80ddf91575028faaabf2611d09ceb0a8d
Revert incorrect merge

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-969

diff -r 89cfe5d80ddf -r b914acf51c53 src/ChangeLog
--- a/src/ChangeLog	Sat Dec 29 01:16:30 2007 +0000
+++ b/src/ChangeLog	Sat Dec 29 02:44:34 2007 +0000
@@ -1,8 +1,5 @@
 2007-12-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-	* process.c (make_process): Initialize pty_flag to Qnil instead of 0
-	as it is not a bit field on Emacs 22 yet.
-
 	* xdisp.c (phys_cursor_in_rect_p): Check if cursor is in fringe area.
 
 2007-12-22  Eli Zaretskii  <eliz@gnu.org>
diff -r 89cfe5d80ddf -r b914acf51c53 src/process.c
--- a/src/process.c	Sat Dec 29 01:16:30 2007 +0000
+++ b/src/process.c	Sat Dec 29 02:44:34 2007 +0000
@@ -631,7 +631,7 @@
   p->tick = 0;
   p->update_tick = 0;
   p->pid = 0;
-  p->pty_flag = Qnil;
+  p->pty_flag = 0;
   p->raw_status_new = 0;
   p->status = Qrun;
   p->mark = Fmake_marker ();