diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/window.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 80eb82a521d..31533082b77 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-12-13 Martin Rudalics <rudalics@gmx.at> + + * window.el (delete-other-windows): Use correct frame in call to + window-with-parameter. + 2011-12-12 Daniel Pfeiffer <occitan@t-online.de> * progmodes/make-mode.el: Bring it up to date with makepp V2.0. diff --git a/lisp/window.el b/lisp/window.el index 4838dfa7969..dcf7394b204 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -2455,7 +2455,7 @@ window signal an error." (throw 'done (delete-other-windows atom-root))) ((eq window-side 'none) ;; Set side-main to the major non-side window. - (setq side-main (window-with-parameter 'window-side 'none nil t))) + (setq side-main (window-with-parameter 'window-side 'none frame t))) ((memq window-side window-sides) (error "Cannot make side window the only window"))) ;; If WINDOW is the main non-side window, do nothing. |