diff options
| author | Daiki Ueno | 2012-08-14 12:37:00 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-08-14 12:37:00 +0800 |
| commit | 7d806b1e6762e57ec5f2ff76b2a9451d6a92ba28 (patch) | |
| tree | c0f7eed9f51ba8b96206968d5b3d1156ed4d94de | |
| parent | 5beed58664d830277199c61ef385f7d4383f1f38 (diff) | |
| download | emacs-7d806b1e6762e57ec5f2ff76b2a9451d6a92ba28.tar.gz emacs-7d806b1e6762e57ec5f2ff76b2a9451d6a92ba28.zip | |
* subr.el (internal--after-with-selected-window): Fix typo.
Fixes: debbugs:12193
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/subr.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8dc342ce9b9..7ee7ee9d27f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-08-14 Daiki Ueno <ueno@unixuser.org> | ||
| 2 | |||
| 3 | * subr.el (internal--after-with-selected-window): Fix typo | ||
| 4 | (Bug#12193). | ||
| 5 | |||
| 1 | 2012-08-14 Fabián Ezequiel Gallina <fgallina@cuca> | 6 | 2012-08-14 Fabián Ezequiel Gallina <fgallina@cuca> |
| 2 | 7 | ||
| 3 | Use `completion-table-dynamic' for completion functions. | 8 | Use `completion-table-dynamic' for completion functions. |
diff --git a/lisp/subr.el b/lisp/subr.el index 212632ff779..4f566a3e1d3 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -3048,8 +3048,8 @@ also `with-temp-buffer'." | |||
| 3048 | (not (eq (tty-top-frame) (nth 3 state))) | 3048 | (not (eq (tty-top-frame) (nth 3 state))) |
| 3049 | (select-frame (nth 3 state) 'norecord))) | 3049 | (select-frame (nth 3 state) 'norecord))) |
| 3050 | ;; Then reset the actual selected-window. | 3050 | ;; Then reset the actual selected-window. |
| 3051 | (when (window-live-p (nth 2 state)) | 3051 | (when (window-live-p (nth 1 state)) |
| 3052 | (select-window (nth 2 state) 'norecord))) | 3052 | (select-window (nth 1 state) 'norecord))) |
| 3053 | 3053 | ||
| 3054 | (defmacro with-selected-window (window &rest body) | 3054 | (defmacro with-selected-window (window &rest body) |
| 3055 | "Execute the forms in BODY with WINDOW as the selected window. | 3055 | "Execute the forms in BODY with WINDOW as the selected window. |