diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2013-08-09 01:59:14 +0200 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2013-08-09 01:59:14 +0200 |
commit | 9d3aa82cf961afda732fc369a42321f4bfbc0021 (patch) | |
tree | 16714237da50010a060859e286a40e57f09680ef /lisp/window.el | |
parent | 919a9575445cf99683217f28f48ffd327e25130b (diff) | |
download | emacs-9d3aa82cf961afda732fc369a42321f4bfbc0021.tar.gz |
lisp/*.el: Silence lexical-binding warnings.
Diffstat (limited to 'lisp/window.el')
-rw-r--r-- | lisp/window.el | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lisp/window.el b/lisp/window.el index c36244f8f4e..b14d91cb924 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -685,10 +685,8 @@ symbols and values as passed to `display-buffer-in-side-window'. This function may be called only if no window on SIDE exists yet. The new window automatically becomes the \"major\" side window on SIDE. Return the new window, nil if its creation window failed." - (let* ((root (frame-root-window)) - (left-or-right (memq side '(left right))) + (let* ((left-or-right (memq side '(left right))) (major (window--major-side-window side)) - (selected-window (selected-window)) (on-side (cond ((eq side 'top) 'above) ((eq side 'bottom) 'below) @@ -698,8 +696,7 @@ SIDE. Return the new window, nil if its creation window failed." ;; parent window unless needed. (window-combination-resize 'side) (window-combination-limit nil) - (new (split-window major nil on-side)) - fun) + (new (split-window major nil on-side))) (when new ;; Initialize `window-side' parameter of new window to SIDE. (set-window-parameter new 'window-side side) @@ -749,8 +746,7 @@ following symbols can be used: A positive value means use a slot following (that is, below or on the right of) the middle slot. The default is zero." (let ((side (or (cdr (assq 'side alist)) 'bottom)) - (slot (or (cdr (assq 'slot alist)) 0)) - new) + (slot (or (cdr (assq 'slot alist)) 0))) (cond ((not (memq side '(top bottom left right))) (error "Invalid side %s specified" side)) @@ -776,9 +772,8 @@ following symbols can be used: ((eq side 'right) 2) ((eq side 'bottom) 3)) window-sides-slots)) - (selected-window (selected-window)) window this-window this-slot prev-window next-window - best-window best-slot abs-slot new-window) + best-window best-slot abs-slot) (cond ((and (numberp max-slots) (<= max-slots 0)) @@ -5730,7 +5725,7 @@ above, even if that window never showed BUFFER before." 0) (display-buffer-reuse-frames 0) (t (last-nonminibuffer-frame)))) - entry best-window second-best-window window) + best-window second-best-window window) ;; Scan windows whether they have shown the buffer recently. (catch 'best (dolist (window (window-list-1 (frame-first-window) 'nomini frames)) |