toki/emacs-winum
1
0
Fork 0
Code Issues Pull requests Activity

use a named predicate instead of a lambda for ignored windows

Browse source 
Using a named function makes the code more readable than using a lambda.
This commit is contained in:
deb0ch 2017-04-15 15:50:39 +02:00
parent 3c28c0dd68
commit 2efef60d1f
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
winum.el
View file

@ -438,12 +438,7 @@ Returns the assigned number, or nil on error."
(defun winum--window-list () (defun winum--window-list ()
"Return a list of interesting windows." "Return a list of interesting windows."
(cl-remove-if (cl-remove-if
(lambda (w) #'winum--ignore-window-p
(let ((f (window-frame w)))
(or (not (and (frame-live-p f)
(frame-visible-p f)))
(string= "initial_terminal" (terminal-name f))
(member (buffer-name (window-buffer w)) winum-ignored-buffers))))
(cl-case winum-scope (cl-case winum-scope
(global (global
(cl-mapcan 'winum--list-windows-in-frame (cl-mapcan 'winum--list-windows-in-frame
@ -460,14 +455,21 @@ Returns the assigned number, or nil on error."
(t (t
(error "Invalid `winum-scope': %S" winum-scope))))) (error "Invalid `winum-scope': %S" winum-scope)))))
(defun winum--ignore-window-p (window)
"Non-nil if WINDOW should be ignored for numbering."
(let ((f (window-frame window)))
(or (not (and (frame-live-p f)
(frame-visible-p f)))
(string= "initial_terminal" (terminal-name f))
(member (buffer-name (window-buffer window)) winum-ignored-buffers))))
(defun winum--list-windows-in-frame (&optional f) (defun winum--list-windows-in-frame (&optional f)
"List windows in frame F using natural Emacs ordering." "List windows in frame F using natural Emacs ordering."
(window-list f 0 (frame-first-window f))) (window-list f 0 (frame-first-window f)))
(defun winum--get-window-vector () (defun winum--get-window-vector ()
"Return the window vector used to get a window given a number. "Return the window vector used to get a window given a number.
This vector is not stored the same way depending on the value of This vector is not stored the same way depending on the value of `winum-scope'."
`winum-scope'."
(if (eq winum-scope 'frame-local) (if (eq winum-scope 'frame-local)
(car (gethash (selected-frame) winum--frames-table)) (car (gethash (selected-frame) winum--frames-table))
winum--window-vector)) winum--window-vector))