Revert incorrect merge

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

diff --git a/src/ChangeLog b/src/ChangeLog
index be2c5824f51470ede9927380762a5ecc22ce5c6b..aca22996d14f117b3aa268d67ceafc2ffd0f1719 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/process.c b/src/process.c
index e285ed4bde0581e06599cf491f84ad50c375075f..0204388e6722e307dc251221de6e0e926e17354d 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -631,7 +631,7 @@ make_process (name)
   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 ();