diff options
| author | Karl Heuer | 1994-05-06 01:00:15 +0000 |
|---|---|---|
| committer | Karl Heuer | 1994-05-06 01:00:15 +0000 |
| commit | 5ce7b543437b8d528e62f4837c7966af5b4e186c (patch) | |
| tree | bf0cd47c64de851799fd32297a654610e14570a0 | |
| parent | ac7ad037f7da2f3d63c94d66c45891acf5e43f90 (diff) | |
| download | emacs-5ce7b543437b8d528e62f4837c7966af5b4e186c.tar.gz emacs-5ce7b543437b8d528e62f4837c7966af5b4e186c.zip | |
Use PT, not point.
| -rw-r--r-- | src/window.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/window.c b/src/window.c index b33f3139a1c..c8e0988c387 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -197,7 +197,7 @@ POS defaults to point; WINDOW, to the selected window.") | |||
| 197 | int hscroll; | 197 | int hscroll; |
| 198 | 198 | ||
| 199 | if (NILP (pos)) | 199 | if (NILP (pos)) |
| 200 | posint = point; | 200 | posint = PT; |
| 201 | else | 201 | else |
| 202 | { | 202 | { |
| 203 | CHECK_NUMBER_COERCE_MARKER (pos, 0); | 203 | CHECK_NUMBER_COERCE_MARKER (pos, 0); |
| @@ -1361,7 +1361,7 @@ value is reasonable when this function is called.") | |||
| 1361 | window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w)); | 1361 | window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w)); |
| 1362 | 1362 | ||
| 1363 | Fset_buffer (w->buffer); | 1363 | Fset_buffer (w->buffer); |
| 1364 | opoint = point; | 1364 | opoint = PT; |
| 1365 | SET_PT (marker_position (w->start)); | 1365 | SET_PT (marker_position (w->start)); |
| 1366 | /* Like Frecenter but avoid setting w->force_start. */ | 1366 | /* Like Frecenter but avoid setting w->force_start. */ |
| 1367 | Fvertical_motion (make_number (- (top - FRAME_MENU_BAR_LINES (XFRAME (WINDOW_FRAME (w))))), | 1367 | Fvertical_motion (make_number (- (top - FRAME_MENU_BAR_LINES (XFRAME (WINDOW_FRAME (w))))), |
| @@ -2196,28 +2196,28 @@ window_scroll (window, n, noerror) | |||
| 2196 | int noerror; | 2196 | int noerror; |
| 2197 | { | 2197 | { |
| 2198 | register struct window *w = XWINDOW (window); | 2198 | register struct window *w = XWINDOW (window); |
| 2199 | register int opoint = point; | 2199 | register int opoint = PT; |
| 2200 | register int pos; | 2200 | register int pos; |
| 2201 | register int ht = window_internal_height (w); | 2201 | register int ht = window_internal_height (w); |
| 2202 | register Lisp_Object tem; | 2202 | register Lisp_Object tem; |
| 2203 | int lose; | 2203 | int lose; |
| 2204 | Lisp_Object bolp, nmoved; | 2204 | Lisp_Object bolp, nmoved; |
| 2205 | 2205 | ||
| 2206 | XFASTINT (tem) = point; | 2206 | XFASTINT (tem) = PT; |
| 2207 | tem = Fpos_visible_in_window_p (tem, window); | 2207 | tem = Fpos_visible_in_window_p (tem, window); |
| 2208 | 2208 | ||
| 2209 | if (NILP (tem)) | 2209 | if (NILP (tem)) |
| 2210 | { | 2210 | { |
| 2211 | Fvertical_motion (make_number (- (ht / 2)), window); | 2211 | Fvertical_motion (make_number (- (ht / 2)), window); |
| 2212 | XFASTINT (tem) = point; | 2212 | XFASTINT (tem) = PT; |
| 2213 | Fset_marker (w->start, tem, w->buffer); | 2213 | Fset_marker (w->start, tem, w->buffer); |
| 2214 | w->force_start = Qt; | 2214 | w->force_start = Qt; |
| 2215 | } | 2215 | } |
| 2216 | 2216 | ||
| 2217 | SET_PT (marker_position (w->start)); | 2217 | SET_PT (marker_position (w->start)); |
| 2218 | lose = n < 0 && point == BEGV; | 2218 | lose = n < 0 && PT == BEGV; |
| 2219 | Fvertical_motion (make_number (n), window); | 2219 | Fvertical_motion (make_number (n), window); |
| 2220 | pos = point; | 2220 | pos = PT; |
| 2221 | bolp = Fbolp (); | 2221 | bolp = Fbolp (); |
| 2222 | SET_PT (opoint); | 2222 | SET_PT (opoint); |
| 2223 | 2223 | ||
| @@ -2241,7 +2241,7 @@ window_scroll (window, n, noerror) | |||
| 2241 | { | 2241 | { |
| 2242 | SET_PT (pos); | 2242 | SET_PT (pos); |
| 2243 | tem = Fvertical_motion (make_number (ht), window); | 2243 | tem = Fvertical_motion (make_number (ht), window); |
| 2244 | if (point > opoint || XFASTINT (tem) < ht) | 2244 | if (PT > opoint || XFASTINT (tem) < ht) |
| 2245 | SET_PT (opoint); | 2245 | SET_PT (opoint); |
| 2246 | else | 2246 | else |
| 2247 | Fvertical_motion (make_number (-1), window); | 2247 | Fvertical_motion (make_number (-1), window); |
| @@ -2384,7 +2384,7 @@ showing that buffer, popping the buffer up if necessary.") | |||
| 2384 | window_scroll (window, XINT (n), 1); | 2384 | window_scroll (window, XINT (n), 1); |
| 2385 | } | 2385 | } |
| 2386 | 2386 | ||
| 2387 | Fset_marker (w->pointm, make_number (point), Qnil); | 2387 | Fset_marker (w->pointm, make_number (PT), Qnil); |
| 2388 | unbind_to (count, Qnil); | 2388 | unbind_to (count, Qnil); |
| 2389 | 2389 | ||
| 2390 | return Qnil; | 2390 | return Qnil; |
| @@ -2436,7 +2436,7 @@ redraws with point in the center of the current window.") | |||
| 2436 | { | 2436 | { |
| 2437 | register struct window *w = XWINDOW (selected_window); | 2437 | register struct window *w = XWINDOW (selected_window); |
| 2438 | register int ht = window_internal_height (w); | 2438 | register int ht = window_internal_height (w); |
| 2439 | register int opoint = point; | 2439 | register int opoint = PT; |
| 2440 | Lisp_Object window; | 2440 | Lisp_Object window; |
| 2441 | 2441 | ||
| 2442 | if (NILP (n)) | 2442 | if (NILP (n)) |
| @@ -2463,7 +2463,7 @@ redraws with point in the center of the current window.") | |||
| 2463 | 2463 | ||
| 2464 | XSET (window, Lisp_Window, w); | 2464 | XSET (window, Lisp_Window, w); |
| 2465 | Fvertical_motion (n, window); | 2465 | Fvertical_motion (n, window); |
| 2466 | Fset_marker (w->start, make_number (point), w->buffer); | 2466 | Fset_marker (w->start, make_number (PT), w->buffer); |
| 2467 | w->start_at_line_beg = Fbolp (); | 2467 | w->start_at_line_beg = Fbolp (); |
| 2468 | 2468 | ||
| 2469 | SET_PT (opoint); | 2469 | SET_PT (opoint); |
| @@ -2500,7 +2500,7 @@ negative means relative to bottom of window.") | |||
| 2500 | if (start < BEGV || start > ZV) | 2500 | if (start < BEGV || start > ZV) |
| 2501 | { | 2501 | { |
| 2502 | Fvertical_motion (make_number (- (height / 2)), window); | 2502 | Fvertical_motion (make_number (- (height / 2)), window); |
| 2503 | Fset_marker (w->start, make_number (point), w->buffer); | 2503 | Fset_marker (w->start, make_number (PT), w->buffer); |
| 2504 | w->start_at_line_beg = Fbolp (); | 2504 | w->start_at_line_beg = Fbolp (); |
| 2505 | w->force_start = Qt; | 2505 | w->force_start = Qt; |
| 2506 | } | 2506 | } |