refactor select-window-by-number to enable interactive use

This commit is contained in:
deb0ch 2016-12-03 11:33:30 +01:00
parent 25f8c31c75
commit 541239b74b

View file

@ -135,15 +135,32 @@ return a number to have it assigned to the current-window, nil otherwise."
,(format "Jump to window %d.\nIf prefix ARG is given, delete the\ ,(format "Jump to window %d.\nIf prefix ARG is given, delete the\
window instead of selecting it." i) window instead of selecting it." i)
(interactive "P") (interactive "P")
(select-window-by-number ,i arg)))) (let ((n (if arg (- ,i) ,i)))
(select-window-by-number n)))))
;;;###autoload (defun select-window-by-number (&optional arg)
(defun select-window-by-number (i &optional arg) "Select or delete window iwhich number is specified by ARG.
"Select window given number I by `winum-mode'. If the number is negative, delete the window instead of selecting it.
If prefix ARG is given, delete the window instead of selecting it." There are several ways to provide the number:
- if called from elisp with an argument, use it.
- if called interactively with a numeric prefix argument, use it.
- if prefix argument is the negative argument, delete the window.
- if called interactively and no valid argument is provided, read from
minibuffer."
(interactive "P") (interactive "P")
(let ((w (winum-get-window-by-number i))) (let* ((n (cond
(if arg ((integerp arg) arg)
((eq arg '-) (- (winum-get-number))) ; negative-argument
(arg (winum-get-number))
((called-interactively-p 'any)
(let ((user-input-str (read-from-minibuffer "Window: ")))
(if (not (string-match-p "[+-]?[0-9]+\.*" user-input-str))
(winum-get-number)
(string-to-number user-input-str))))
(t (winum-get-number))))
(w (winum-get-window-by-number (abs n)))
(delete (> 0 n)))
(if delete
(delete-window w) (delete-window w)
(winum--switch-to-window w)))) (winum--switch-to-window w))))