summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/subr.el4
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 @@
+2012-08-14 Daiki Ueno <ueno@unixuser.org>
+
+ * subr.el (internal--after-with-selected-window): Fix typo
+ (Bug#12193).
+
2012-08-14 Fabián Ezequiel Gallina <fgallina@cuca>
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'."
(not (eq (tty-top-frame) (nth 3 state)))
(select-frame (nth 3 state) 'norecord)))
;; Then reset the actual selected-window.
- (when (window-live-p (nth 2 state))
- (select-window (nth 2 state) 'norecord)))
+ (when (window-live-p (nth 1 state))
+ (select-window (nth 1 state) 'norecord)))
(defmacro with-selected-window (window &rest body)
"Execute the forms in BODY with WINDOW as the selected window.