diff options
| author | Dmitry Antipov | 2013-08-29 20:36:54 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-08-29 20:36:54 +0400 |
| commit | 032f74518a71a7fe0afd2e7d0eee11bfb7ae90d9 (patch) | |
| tree | cec342cb647d9242855b8f0d4b5a9783d8851176 /src/window.c | |
| parent | 3f940c5aa6fc1d03e6658cda5c440fb6bd75e4c5 (diff) | |
| download | emacs-032f74518a71a7fe0afd2e7d0eee11bfb7ae90d9.tar.gz emacs-032f74518a71a7fe0afd2e7d0eee11bfb7ae90d9.zip | |
* intervals.c (set_point_from_marker): New function.
* editfns.c (Fgoto_char):
* process.c (Finternal_default_process_filter):
* window.c (select_window_1): Use it.
* buffer.h (set_point_from_marker): Add prototype.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/window.c b/src/window.c index e40572bf13d..d60ee06077f 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -549,15 +549,7 @@ select_window_1 (Lisp_Object window, bool inhibit_point_swap) | |||
| 549 | than one window. It also matters when | 549 | than one window. It also matters when |
| 550 | redisplay_window has altered point after scrolling, | 550 | redisplay_window has altered point after scrolling, |
| 551 | because it makes the change only in the window. */ | 551 | because it makes the change only in the window. */ |
| 552 | { | 552 | set_point_from_marker (XWINDOW (window)->pointm); |
| 553 | register ptrdiff_t new_point = marker_position (XWINDOW (window)->pointm); | ||
| 554 | if (new_point < BEGV) | ||
| 555 | SET_PT (BEGV); | ||
| 556 | else if (new_point > ZV) | ||
| 557 | SET_PT (ZV); | ||
| 558 | else | ||
| 559 | SET_PT (new_point); | ||
| 560 | } | ||
| 561 | } | 553 | } |
| 562 | 554 | ||
| 563 | DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0, | 555 | DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0, |