alx/eyebrowse
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Create new slot on non-matching input

Browse Source 
Closes #58
This commit is contained in:
Vasilij Schneidermann
2017-03-18 22:17:06 +01:00
parent e7c3de9c8b
commit 9fb955e716
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
eyebrowse.el
View File

@ -283,15 +283,26 @@ with the scratch buffer."
(window-config (eyebrowse--fixup-window-config (cadr match)))) (window-config (eyebrowse--fixup-window-config (cadr match))))
(window-state-put window-config (frame-root-window) 'safe)))) (window-state-put window-config (frame-root-window) 'safe))))
(defun eyebrowse--string-to-number (x)
"Version of `string-to-number' that returns nil if not a number."
(let ((result (string-to-number x)))
(if (and (zerop result)
(not (string-match-p (rx bos (* white) "0") x)))
nil
result)))
(defun eyebrowse--read-slot () (defun eyebrowse--read-slot ()
"Read in a window config SLOT to switch to. "Read in a window config SLOT to switch to.
A formatted list of window configs is presented as candidates." A formatted list of window configs is presented as candidates.
If no match was found, the user input is interpreted as a new
slot to switch to."
(let* ((candidates (--map (cons (eyebrowse-format-slot it) (let* ((candidates (--map (cons (eyebrowse-format-slot it)
(car it)) (car it))
(eyebrowse--get 'window-configs))) (eyebrowse--get 'window-configs)))
(candidate (completing-read (candidate (completing-read "Enter slot: " candidates))
"Enter slot: " candidates nil t))) (choice (cdr (assoc candidate candidates))))
(cdr (assoc candidate candidates)))) (or choice (eyebrowse--string-to-number candidate)
(user-error "Invalid slot number"))))
(defun eyebrowse-switch-to-window-config (slot) (defun eyebrowse-switch-to-window-config (slot)
"Switch to the window config SLOT. "Switch to the window config SLOT.