branch: master commit 75f6705f39299cd71834eddaedfd94fd261e6ece Author: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com> Commit: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com>
Fix on Windows. --- context-coloring.el | 5 ++++- languages/javascript/binaries/scopifier | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/context-coloring.el b/context-coloring.el index 6a4235e..fbf09b2 100644 --- a/context-coloring.el +++ b/context-coloring.el @@ -430,9 +430,12 @@ elisp tracks, and asynchronously for shell command tracks." (if callback (funcall callback))) ((setq command (plist-get dispatch :command)) (setq executable (plist-get dispatch :executable)) - (if (and (not (null executable)) + (if (and executable (null (executable-find executable))) (message "Executable \"%s\" not found" executable) + (if (and executable + (eq system-type 'windows-nt)) + (setq command (concat executable " " command))) (context-coloring-scopify-shell-command command callback))))))) diff --git a/languages/javascript/binaries/scopifier b/languages/javascript/binaries/scopifier index 82ea34e..0c0a149 100755 --- a/languages/javascript/binaries/scopifier +++ b/languages/javascript/binaries/scopifier @@ -32,5 +32,6 @@ process.stdin.on('readable', function () { }); process.stdin.on('end', function () { + whole = whole.replace(/\r\n/g, '\n'); // Windows console.log(JSON.stringify(scopifier(whole))); });