Mercurial > emacs
comparison src/window.c @ 112098:40af77a50adc
Merge changes from emacs-23 branch
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 02 Jan 2011 15:28:40 -0500 |
| parents | 18b73506d813 e829321a29ff |
| children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
| 112045:52100bac91db | 112098:40af77a50adc |
|---|---|
| 5760 Lisp_Object window; | 5760 Lisp_Object window; |
| 5761 #if 0 | 5761 #if 0 |
| 5762 int this_scroll_margin; | 5762 int this_scroll_margin; |
| 5763 #endif | 5763 #endif |
| 5764 | 5764 |
| 5765 if (!(BUFFERP (w->buffer) | |
| 5766 && XBUFFER (w->buffer) == current_buffer)) | |
| 5767 /* This test is needed to make sure PT/PT_BYTE make sense in w->buffer | |
| 5768 when passed below to set_marker_both. */ | |
| 5769 error ("move-to-window-line called from unrelated buffer"); | |
| 5770 | |
| 5765 window = selected_window; | 5771 window = selected_window; |
| 5766 start = marker_position (w->start); | 5772 start = marker_position (w->start); |
| 5767 if (start < BEGV || start > ZV) | 5773 if (start < BEGV || start > ZV) |
| 5768 { | 5774 { |
| 5769 int height = window_internal_height (w); | 5775 int height = window_internal_height (w); |