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

select-window-by-number: the negative prefix deletes window 0

Browse source
This commit is contained in:
deb0ch 2016-12-04 09:34:57 +01:00
parent 92b46f7f2a
commit 87aaccbc70
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
winum.el
View file

@ -134,19 +134,21 @@ return a number to have it assigned to the current-window, nil otherwise."
;; TODO figure out a way of deleting window 0 ;; TODO figure out a way of deleting window 0
;; -> maybe the negative argument alone could delete window 0 instead of ;; -> maybe the negative argument alone could delete window 0 instead of
;; the current window ? ;; the current window ?
;; TODO test negative argument should delete window 0
(defun select-window-by-number (&optional arg) (defun select-window-by-number (&optional arg)
"Select or delete window iwhich number is specified by ARG. "Select or delete window iwhich number is specified by ARG.
If the number is negative, delete the window instead of selecting it. If the number is negative, delete the window instead of selecting it.
There are several ways to provide the number: There are several ways to provide the number:
- if called from elisp with an argument, use it. - if called from elisp with an argument, use it.
- if called interactively with a numeric prefix argument, use it. - if called interactively with a numeric prefix argument, use it.
- if prefix argument is the negative argument, delete the window. - if prefix argument is the negative argument, delete window 0.
- if called interactively and no valid argument is provided, read from - if called interactively and no valid argument is provided, read from
minibuffer." minibuffer."
(interactive "P") (interactive "P")
(let* ((n (cond (let* ((n (cond
((integerp arg) arg) ((integerp arg) arg)
((eq arg '-) (- (winum-get-number))) ; negative-argument ((eq arg '-) 0) ; negative-argument
(arg (winum-get-number)) (arg (winum-get-number))
((called-interactively-p 'any) ((called-interactively-p 'any)
(let ((user-input-str (read-from-minibuffer "Window: "))) (let ((user-input-str (read-from-minibuffer "Window: ")))
@ -155,7 +157,7 @@ There are several ways to provide the number:
(string-to-number user-input-str)))) (string-to-number user-input-str))))
(t (winum-get-number)))) (t (winum-get-number))))
(w (winum-get-window-by-number (abs n))) (w (winum-get-window-by-number (abs n)))
(delete (> 0 n))) (delete (or (eq arg '-) (> 0 n))))
(if delete (if delete
(delete-window w) (delete-window w)
(winum--switch-to-window w)))) (winum--switch-to-window w))))