diff options
| author | Miles Bader <miles@gnu.org> | 2007-12-29 02:44:34 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-12-29 02:44:34 +0000 |
| commit | fd41ad9836f4b975f388f2fe84abd8a1de11a820 (patch) | |
| tree | 4e707bdfb21e7323e532ffa59bc1f5ff02852b85 /src | |
| parent | 4e320733812f81974a8122fccdf3690df6d623c9 (diff) | |
| download | emacs-fd41ad9836f4b975f388f2fe84abd8a1de11a820.tar.gz emacs-fd41ad9836f4b975f388f2fe84abd8a1de11a820.tar.bz2 emacs-fd41ad9836f4b975f388f2fe84abd8a1de11a820.zip | |
Revert incorrect merge
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-969
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/process.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index be2c5824f51..aca22996d14 100644 --- 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 e285ed4bde0..0204388e672 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 (); |