diff options
| author | Stefan Monnier | 2006-02-22 21:01:34 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2006-02-22 21:01:34 +0000 |
| commit | acc6289a44db81134e9680dd51597abe2dbbbd92 (patch) | |
| tree | d4360bf6e709ab2a5c9aae1c09c47ba9872557b2 /src/window.c | |
| parent | 78744fc3702626b26d56ab56704d27afdd6ea585 (diff) | |
| download | emacs-acc6289a44db81134e9680dd51597abe2dbbbd92.tar.gz emacs-acc6289a44db81134e9680dd51597abe2dbbbd92.zip | |
(Fwindow_list): Check `window' before doing XWINDOW.
The default `window' should not be "on a different frame".
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index e7040e3c496..41eaf78bea0 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1861,7 +1861,8 @@ MINIBUF neither nil nor t means never include the minibuffer window. */) | |||
| 1861 | Lisp_Object frame, minibuf, window; | 1861 | Lisp_Object frame, minibuf, window; |
| 1862 | { | 1862 | { |
| 1863 | if (NILP (window)) | 1863 | if (NILP (window)) |
| 1864 | window = selected_window; | 1864 | window = FRAMEP (frame) ? XFRAME (frame)->selected_window : selected_window; |
| 1865 | CHECK_WINDOW (window); | ||
| 1865 | if (NILP (frame)) | 1866 | if (NILP (frame)) |
| 1866 | frame = selected_frame; | 1867 | frame = selected_frame; |
| 1867 | 1868 | ||