Merge pull request #2961 from tylerware/fix/tmux-targets-not-shell-quoted

tmux: Quoting shell arg in listing windows / panes
This commit is contained in:
Henrik Lissner 2020-04-23 23:59:06 -04:00 committed by GitHub
commit f78cc7ed38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -104,7 +104,7 @@ but do not execute them."
(if-let* ((lines (if-let* ((lines
(+tmux (format "list-windows %s -F '#{window_id};#{session_id};#{window_active};#{window_name};#{window_activity_flag}'" (+tmux (format "list-windows %s -F '#{window_id};#{session_id};#{window_active};#{window_name};#{window_activity_flag}'"
(if session (if session
(concat "-t " (car session)) (concat "-t " (shell-quote-argument (car session)))
"-a"))))) "-a")))))
(cl-loop for line in (split-string lines "\n" t) (cl-loop for line in (split-string lines "\n" t)
collect (let ((window (split-string line ";"))) collect (let ((window (split-string line ";")))
@ -122,7 +122,7 @@ but do not execute them."
(if sess-or-win (if sess-or-win
(concat (if (string-prefix-p "$" (car sess-or-win)) "-s ") (concat (if (string-prefix-p "$" (car sess-or-win)) "-s ")
"-t " "-t "
(car sess-or-win)) (shell-quote-argument (car sess-or-win)))
"-a"))))) "-a")))))
(cl-loop for line in (split-string lines "\n" t) (cl-loop for line in (split-string lines "\n" t)
collect (let ((pane (split-string line ";"))) collect (let ((pane (split-string line ";")))