[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 75f6705 251/271: Fix on Windows.
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master 75f6705 251/271: Fix on Windows. |
Date: |
Thu, 05 Feb 2015 18:31:42 +0000 |
branch: master
commit 75f6705f39299cd71834eddaedfd94fd261e6ece
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
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)));
});
- [elpa] master 4fee39d 174/271: Remove .jslintrc files., (continued)
- [elpa] master 4fee39d 174/271: Remove .jslintrc files., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 903d938 176/271: Update readme., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d48e8cc 057/271: Add benchmark., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d157167 258/271: Strip headers. Use make dependencies., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 63e2590 207/271: Merge branch 'develop', Jackson Ray Hamilton, 2015/02/05
- [elpa] master d4ddaa6 160/271: Use edge js2-mode., Jackson Ray Hamilton, 2015/02/05
- [elpa] master ef461da 230/271: Stop maintaining benchmarks in readme., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 5e46686 173/271: Remove JS tests and benchmarks. Remove color schemer., Jackson Ray Hamilton, 2015/02/05
- [elpa] master f9c3de8 252/271: Version 3.1.1., Jackson Ray Hamilton, 2015/02/05
- [elpa] master f2b5d79 264/271: Remove unnecessary .elpaignore., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 75f6705 251/271: Fix on Windows.,
Jackson Ray Hamilton <=
- [elpa] master 8665ff3 233/271: Simplify `context-coloring-set-colors'., Jackson Ray Hamilton, 2015/02/05
- [elpa] master eaece82 263/271: Version 4.0.0., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d885920 231/271: Merge branch 'feature/comments-and-strings' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master 96da8de 219/271: Merge branch 'master' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master c947690 238/271: Documentation. Cleanup. Copyright notices., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 68824f6 193/271: Add failing test for key names., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 784910c 266/271: externals-list: Add context-coloring, Jackson Ray Hamilton, 2015/02/05
- [elpa] master 079a5a8 237/271: Document tests., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 5c8855f 212/271: Merge branch 'feature/key-values' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master 3944181 223/271: Renames. Cleanup., Jackson Ray Hamilton, 2015/02/05