[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 6c8175e 153/271: Update compilation.
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master 6c8175e 153/271: Update compilation. |
Date: |
Thu, 05 Feb 2015 18:30:43 +0000 |
branch: master
commit 6c8175e6b73a20b517dd9e7ecb1ebf30b310030e
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Update compilation.
---
Makefile | 4 +++-
benchmark/context-coloring-benchmark.el | 2 +-
context-coloring.el | 13 ++++++++-----
{test/fixtures => lib}/js2-mode/.dir-locals.el | 0
{test/fixtures => lib}/js2-mode/js2-mode.el | 0
test/context-coloring-test.el | 2 +-
6 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index aa9f9f6..1e5e6d5 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,9 @@ benchjs:
node_modules/.bin/matcha
compile:
- emacs -Q -batch -f batch-byte-compile *.el
+ emacs -Q \
+ -L lib/js2-mode \
+ -batch -f batch-byte-compile *.el
clean:
rm -f *.log benchmark/*.log *.elc
diff --git a/benchmark/context-coloring-benchmark.el
b/benchmark/context-coloring-benchmark.el
index 4403fe8..1da2b8c 100644
--- a/benchmark/context-coloring-benchmark.el
+++ b/benchmark/context-coloring-benchmark.el
@@ -42,7 +42,7 @@
(defun context-coloring-benchmark-js2-mode-setup ()
(add-to-list 'load-path (context-coloring-benchmark-resolve-path
- "../test/fixtures/js2-mode"))
+ "../lib/js2-mode"))
(require 'js2-mode)
(setq js2-mode-show-parse-errors nil)
(setq js2-mode-show-strict-warnings nil)
diff --git a/context-coloring.el b/context-coloring.el
index e3ea326..09bee0c 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -5,7 +5,7 @@
;; Author: Jackson Ray Hamilton <address@hidden>
;; Keywords: context coloring syntax highlighting
;; Version: 1.0.0
-;; Package-Requires: ((emacs "24"))
+;; Package-Requires: ((emacs "24") (js2-mode "20141118"))
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -38,6 +38,8 @@
;;; Code:
+(require 'js2-mode)
+
;;; Constants
@@ -171,7 +173,8 @@ imply that it should be colorized again.")
(defcustom context-coloring-face-count 7
"Number of faces defined for highlighting delimiter levels.
-Determines level at which to cycle through faces again.")
+Determines level at which to cycle through faces again."
+ :group 'context-coloring)
;;; Face functions
@@ -326,14 +329,14 @@ parsed list of tokens to `context-coloring-apply-tokens'."
;; accumulates the chunks into a message.
(set-process-filter
context-coloring-scopifier-process
- (lambda (process chunk)
+ (lambda (_process chunk)
(setq output (concat output chunk))))
;; When the process's message is complete, this sentinel parses it as JSON
;; and applies the tokens to the buffer.
(set-process-sentinel
context-coloring-scopifier-process
- (lambda (process event)
+ (lambda (_process event)
(when (equal "finished\n" event)
(let ((tokens (context-coloring-parse-array output)))
(with-current-buffer buffer
@@ -401,7 +404,7 @@ of the current buffer, then does it."
(interactive)
(context-coloring-dispatch))
-(defun context-coloring-change-function (start end length)
+(defun context-coloring-change-function (_start _end _length)
"Registers a change so that a context-colored buffer can be
colorized soon."
;; Tokenization is obsolete if there was a change.
diff --git a/test/fixtures/js2-mode/.dir-locals.el b/lib/js2-mode/.dir-locals.el
similarity index 100%
rename from test/fixtures/js2-mode/.dir-locals.el
rename to lib/js2-mode/.dir-locals.el
diff --git a/test/fixtures/js2-mode/js2-mode.el b/lib/js2-mode/js2-mode.el
similarity index 100%
rename from test/fixtures/js2-mode/js2-mode.el
rename to lib/js2-mode/js2-mode.el
diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index 9b17a36..633aec4 100644
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -24,7 +24,7 @@ FIXTURE."
FIXTURE."
`(context-coloring-test-with-fixture
,fixture
- (add-to-list 'load-path (context-coloring-test-resolve-path
"./fixtures/js2-mode"))
+ (add-to-list 'load-path (context-coloring-test-resolve-path
"../lib/js2-mode"))
(require 'js2-mode)
(setq js2-mode-show-parse-errors nil)
(setq js2-mode-show-strict-warnings nil)
- [elpa] master 4be9ec8 147/271: Documentation., (continued)
- [elpa] master 4be9ec8 147/271: Documentation., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 16cee40 150/271: Pass test for block scopes., Jackson Ray Hamilton, 2015/02/05
- [elpa] master f7b5d33 143/271: Add skeletal support for js2-mode scopification., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 549e523 149/271: Add failing test for block scopes., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 9f87a03 148/271: Actually colorize complex files., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 76122df 144/271: Write js2 scopifier., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 5fcd757 146/271: Refactor to use more resilient dispatch strategy., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 8982c75 127/271: Merge branch 'feature/tests' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master e06fbe9 158/271: Add comment support for js2-mode., Jackson Ray Hamilton, 2015/02/05
- [elpa] master a2b6a5a 112/271: Use defvar-local., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 6c8175e 153/271: Update compilation.,
Jackson Ray Hamilton <=
- [elpa] master 4f57f0c 163/271: Improve global test., Jackson Ray Hamilton, 2015/02/05
- [elpa] master dc8e99c 130/271: Function name., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 2bb4d12 124/271: More cleanup., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d301048 154/271: Update compilation again., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 1d9cf42 164/271: Refactor tests., Jackson Ray Hamilton, 2015/02/05
- [elpa] master a0ccc5c 162/271: Improve and pass catch test., Jackson Ray Hamilton, 2015/02/05
- [elpa] master c8fa33f 170/271: Improve async benchmarking., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 7954efc 110/271: Rename instances of depth to level., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 338716d 161/271: Refactor., Jackson Ray Hamilton, 2015/02/05
- [elpa] master fc81cf9 157/271: Don't use timers for js2-mode., Jackson Ray Hamilton, 2015/02/05