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

fix bug when using select-window-by-number on nonexistent window

Browse source
This commit is contained in:
deb0ch 2016-12-05 15:00:31 +01:00
parent e947f05c93
commit f45c6ea007
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
winum.el
View file

@ -195,9 +195,8 @@ If prefix ARG is given, delete the window instead of selecting it."
(interactive "P") (interactive "P")
(select-window-by-number (if arg -9 9))) (select-window-by-number (if arg -9 9)))
;; 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 which 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.
@ -218,13 +217,15 @@ There are several ways to provide the number:
(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 (or (eq arg '-) (> 0 n)))) (delete (or (eq arg '-) (> 0 n))))
(if delete (if w
(delete-window w) (if delete
(winum--switch-to-window w)))) (delete-window w)
(winum--switch-to-window w))
(error "No window numbered %d" n))))
;;;###autoload ;;;###autoload
(defun winum-get-window-by-number (n) (defun winum-get-window-by-number (n)
"Return window numbered N if exists." "Return window numbered N if exists, nil otherwise."
(let ((windows (if (eq winum-scope 'frame-local) (let ((windows (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))
@ -449,6 +450,7 @@ using the `winum-assign-func', or using `winum-auto-assign-0-to-minibuffer'."
(select-window window) (select-window window)
(error "Got a dead window %S" window)))) (error "Got a dead window %S" window))))
(push "^No window numbered .$" debug-ignored-errors)
(push "^Got a dead window .$" debug-ignored-errors) (push "^Got a dead window .$" debug-ignored-errors)
(push "^Invalid `winum-scope': .$" debug-ignored-errors) (push "^Invalid `winum-scope': .$" debug-ignored-errors)