diff options
| author | Chong Yidong | 2011-02-12 18:40:43 -0500 |
|---|---|---|
| committer | Chong Yidong | 2011-02-12 18:40:43 -0500 |
| commit | 84eb0351d8be4811897c8cf62a69757ff5d14001 (patch) | |
| tree | 80162dabf78b97982b32679e2cb7e377d5b12d01 /src/window.c | |
| parent | cdfa139da44fd9b1a5425400635e474e85d866f4 (diff) | |
| parent | 165bc5a066990bace024c04ba431f140a25d0bfd (diff) | |
| download | emacs-84eb0351d8be4811897c8cf62a69757ff5d14001.tar.gz emacs-84eb0351d8be4811897c8cf62a69757ff5d14001.zip | |
Merge changes from emacs-23 branch
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index abf01758c3f..b158073a3db 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3517,7 +3517,7 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap) | |||
| 3517 | record_buffer (w->buffer); | 3517 | record_buffer (w->buffer); |
| 3518 | } | 3518 | } |
| 3519 | 3519 | ||
| 3520 | if (EQ (window, selected_window)) | 3520 | if (EQ (window, selected_window) && !inhibit_point_swap) |
| 3521 | return window; | 3521 | return window; |
| 3522 | 3522 | ||
| 3523 | sf = SELECTED_FRAME (); | 3523 | sf = SELECTED_FRAME (); |