Mercurial > emacs
comparison src/window.c @ 108904:2bc8bdaafa9a
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 07 Jun 2010 22:49:32 +0000 |
| parents | 4a42850741ad |
| children | 580a6ea34172 |
comparison
equal
deleted
inserted
replaced
| 108902:1f795f817d05 | 108904:2bc8bdaafa9a |
|---|---|
| 3609 | 3609 |
| 3610 if (NILP (norecord)) | 3610 if (NILP (norecord)) |
| 3611 { | 3611 { |
| 3612 ++window_select_count; | 3612 ++window_select_count; |
| 3613 XSETFASTINT (w->use_time, window_select_count); | 3613 XSETFASTINT (w->use_time, window_select_count); |
| 3614 record_buffer (w->buffer); | |
| 3614 } | 3615 } |
| 3615 | 3616 |
| 3616 if (EQ (window, selected_window)) | 3617 if (EQ (window, selected_window)) |
| 3617 return window; | 3618 return window; |
| 3618 | 3619 |
| 3644 BUF_PT_BYTE (XBUFFER (ow->buffer))); | 3645 BUF_PT_BYTE (XBUFFER (ow->buffer))); |
| 3645 } | 3646 } |
| 3646 | 3647 |
| 3647 selected_window = window; | 3648 selected_window = window; |
| 3648 | 3649 |
| 3649 if (NILP (norecord)) | |
| 3650 record_buffer (w->buffer); | |
| 3651 Fset_buffer (w->buffer); | 3650 Fset_buffer (w->buffer); |
| 3652 | 3651 |
| 3653 XBUFFER (w->buffer)->last_selected_window = window; | 3652 XBUFFER (w->buffer)->last_selected_window = window; |
| 3654 | 3653 |
| 3655 /* Go to the point recorded in the window. | 3654 /* Go to the point recorded in the window. |