diff options
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/process.c b/src/process.c index af82f560860..eac1f839f99 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2554,7 +2554,7 @@ read_process_output (proc, channel) | |||
| 2554 | odeactivate = Vdeactivate_mark; | 2554 | odeactivate = Vdeactivate_mark; |
| 2555 | 2555 | ||
| 2556 | Fset_buffer (p->buffer); | 2556 | Fset_buffer (p->buffer); |
| 2557 | opoint = point; | 2557 | opoint = PT; |
| 2558 | old_read_only = current_buffer->read_only; | 2558 | old_read_only = current_buffer->read_only; |
| 2559 | XSETFASTINT (old_begv, BEGV); | 2559 | XSETFASTINT (old_begv, BEGV); |
| 2560 | XSETFASTINT (old_zv, ZV); | 2560 | XSETFASTINT (old_zv, ZV); |
| @@ -2571,24 +2571,24 @@ read_process_output (proc, channel) | |||
| 2571 | 2571 | ||
| 2572 | /* If the output marker is outside of the visible region, save | 2572 | /* If the output marker is outside of the visible region, save |
| 2573 | the restriction and widen. */ | 2573 | the restriction and widen. */ |
| 2574 | if (! (BEGV <= point && point <= ZV)) | 2574 | if (! (BEGV <= PT && PT <= ZV)) |
| 2575 | Fwiden (); | 2575 | Fwiden (); |
| 2576 | 2576 | ||
| 2577 | /* Make sure opoint floats ahead of any new text, just as point | 2577 | /* Make sure opoint floats ahead of any new text, just as point |
| 2578 | would. */ | 2578 | would. */ |
| 2579 | if (point <= opoint) | 2579 | if (PT <= opoint) |
| 2580 | opoint += nchars; | 2580 | opoint += nchars; |
| 2581 | 2581 | ||
| 2582 | /* Insert after old_begv, but before old_zv. */ | 2582 | /* Insert after old_begv, but before old_zv. */ |
| 2583 | if (point < XFASTINT (old_begv)) | 2583 | if (PT < XFASTINT (old_begv)) |
| 2584 | XSETFASTINT (old_begv, XFASTINT (old_begv) + nchars); | 2584 | XSETFASTINT (old_begv, XFASTINT (old_begv) + nchars); |
| 2585 | if (point <= XFASTINT (old_zv)) | 2585 | if (PT <= XFASTINT (old_zv)) |
| 2586 | XSETFASTINT (old_zv, XFASTINT (old_zv) + nchars); | 2586 | XSETFASTINT (old_zv, XFASTINT (old_zv) + nchars); |
| 2587 | 2587 | ||
| 2588 | /* Insert before markers in case we are inserting where | 2588 | /* Insert before markers in case we are inserting where |
| 2589 | the buffer's mark is, and the user's next command is Meta-y. */ | 2589 | the buffer's mark is, and the user's next command is Meta-y. */ |
| 2590 | insert_before_markers (chars, nchars); | 2590 | insert_before_markers (chars, nchars); |
| 2591 | Fset_marker (p->mark, make_number (point), p->buffer); | 2591 | Fset_marker (p->mark, make_number (PT), p->buffer); |
| 2592 | 2592 | ||
| 2593 | update_mode_lines++; | 2593 | update_mode_lines++; |
| 2594 | 2594 | ||
| @@ -3620,7 +3620,7 @@ status_notify () | |||
| 3620 | if (NILP (XBUFFER (buffer)->name)) | 3620 | if (NILP (XBUFFER (buffer)->name)) |
| 3621 | continue; | 3621 | continue; |
| 3622 | Fset_buffer (buffer); | 3622 | Fset_buffer (buffer); |
| 3623 | opoint = point; | 3623 | opoint = PT; |
| 3624 | /* Insert new output into buffer | 3624 | /* Insert new output into buffer |
| 3625 | at the current end-of-output marker, | 3625 | at the current end-of-output marker, |
| 3626 | thus preserving logical ordering of input and output. */ | 3626 | thus preserving logical ordering of input and output. */ |
| @@ -3628,7 +3628,7 @@ status_notify () | |||
| 3628 | SET_PT (marker_position (p->mark)); | 3628 | SET_PT (marker_position (p->mark)); |
| 3629 | else | 3629 | else |
| 3630 | SET_PT (ZV); | 3630 | SET_PT (ZV); |
| 3631 | if (point <= opoint) | 3631 | if (PT <= opoint) |
| 3632 | opoint += XSTRING (msg)->size + XSTRING (p->name)->size + 10; | 3632 | opoint += XSTRING (msg)->size + XSTRING (p->name)->size + 10; |
| 3633 | 3633 | ||
| 3634 | tem = current_buffer->read_only; | 3634 | tem = current_buffer->read_only; |
| @@ -3638,7 +3638,7 @@ status_notify () | |||
| 3638 | insert_string (" "); | 3638 | insert_string (" "); |
| 3639 | Finsert (1, &msg); | 3639 | Finsert (1, &msg); |
| 3640 | current_buffer->read_only = tem; | 3640 | current_buffer->read_only = tem; |
| 3641 | Fset_marker (p->mark, make_number (point), p->buffer); | 3641 | Fset_marker (p->mark, make_number (PT), p->buffer); |
| 3642 | 3642 | ||
| 3643 | SET_PT (opoint); | 3643 | SET_PT (opoint); |
| 3644 | set_buffer_internal (old); | 3644 | set_buffer_internal (old); |