diff options
| author | Gerd Moellmann | 2001-10-15 10:44:09 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-10-15 10:44:09 +0000 |
| commit | 50e88778afc902fdbf1a8f2b5eda34bb9335680c (patch) | |
| tree | 69dd85940fb3bafd2d5fe5da22d3816df36dcf44 /src | |
| parent | 6d194a45969e620736f761e31a6fc03209c51570 (diff) | |
| download | emacs-50e88778afc902fdbf1a8f2b5eda34bb9335680c.tar.gz emacs-50e88778afc902fdbf1a8f2b5eda34bb9335680c.zip | |
(select_window_1): Unfreeze window start. Remove a
doubled test for WINDOW being live.
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c index 86e8434fc73..8f7dd74cf88 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1660,7 +1660,7 @@ argument ALL_FRAMES is non-nil, cycle through all frames.") | |||
| 1660 | window = Fnext_window (window, Qnil, all_frames); | 1660 | window = Fnext_window (window, Qnil, all_frames); |
| 1661 | for (; i < 0; ++i) | 1661 | for (; i < 0; ++i) |
| 1662 | window = Fprevious_window (window, Qnil, all_frames); | 1662 | window = Fprevious_window (window, Qnil, all_frames); |
| 1663 | 1663 | ||
| 1664 | Fselect_window (window); | 1664 | Fselect_window (window); |
| 1665 | return Qnil; | 1665 | return Qnil; |
| 1666 | } | 1666 | } |
| @@ -2733,9 +2733,7 @@ select_window_1 (window, recordflag) | |||
| 2733 | CHECK_LIVE_WINDOW (window, 0); | 2733 | CHECK_LIVE_WINDOW (window, 0); |
| 2734 | 2734 | ||
| 2735 | w = XWINDOW (window); | 2735 | w = XWINDOW (window); |
| 2736 | 2736 | w->frozen_window_start_p = 0; | |
| 2737 | if (NILP (w->buffer)) | ||
| 2738 | error ("Trying to select deleted window or non-leaf window"); | ||
| 2739 | 2737 | ||
| 2740 | XSETFASTINT (w->use_time, ++window_select_count); | 2738 | XSETFASTINT (w->use_time, ++window_select_count); |
| 2741 | if (EQ (window, selected_window)) | 2739 | if (EQ (window, selected_window)) |