From fd41ad9836f4b975f388f2fe84abd8a1de11a820 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sat, 29 Dec 2007 02:44:34 +0000 Subject: [PATCH] Revert incorrect merge Revision: emacs@sv.gnu.org/emacs--devo--0--patch-969 --- src/ChangeLog | 3 --- src/process.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index be2c5824f5..aca22996d1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,5 @@ 2007-12-24 YAMAMOTO Mitsuharu - * 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 diff --git a/src/process.c b/src/process.c index e285ed4bde..0204388e67 100644 --- 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 (); -- 2.20.1