[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 202ca74 15/28: Drop `subr-x' dependency.
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master 202ca74 15/28: Drop `subr-x' dependency. |
Date: |
Tue, 05 May 2015 11:10:21 +0000 |
branch: master
commit 202ca741433b902f8d723f5789d33c78f93fc115
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Drop `subr-x' dependency.
---
context-coloring.el | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/context-coloring.el b/context-coloring.el
index 691a475..010e0af 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -54,7 +54,6 @@
;;; Code:
(require 'js2-mode)
-(require 'subr-x)
;;; Local variables
@@ -69,6 +68,16 @@
"Join a list of STRINGS with the string DELIMITER."
(mapconcat 'identity strings delimiter))
+(defun context-coloring-trim (string)
+ "Remove leading and trailing whitespace from STRING."
+ ;; Trim right.
+ (when (string-match "[ \t\n\r]+\\'" string)
+ (setq string (replace-match "" t t string)))
+ ;; Trim left.
+ (if (string-match "\\`[ \t\n\r]+" string)
+ (replace-match "" t t string)
+ string))
+
;;; Faces
@@ -301,7 +310,7 @@ element."
(defun context-coloring-parse-array (array)
"Parse ARRAY as a flat JSON array of numbers."
- (let ((braceless (substring (string-trim array) 1 -1)))
+ (let ((braceless (substring (context-coloring-trim array) 1 -1)))
(cond
((> (length braceless) 0)
(vconcat
- [elpa] master f9a6dce 03/28: Coveralls, (continued)
- [elpa] master f9a6dce 03/28: Coveralls, Jackson Ray Hamilton, 2015/05/05
- [elpa] master 7a9bd8d 07/28: Add async mode startup test., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 2efebc8 10/28: Don't colorize if there are parse errors., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 30f9b0a 02/28: Update Cask file., Jackson Ray Hamilton, 2015/05/05
- [elpa] master fd5b9e1 05/28: Add tests for versions and disabling., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 85ff3ef 13/28: Trailing whitespace, empty arrays, empty strings., Jackson Ray Hamilton, 2015/05/05
- [elpa] master f11f97f 09/28: Make default colors more like font-lock's., Jackson Ray Hamilton, 2015/05/05
- [elpa] master a7f5970 04/28: Remove unused function., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 9873030 08/28: Use real keywords., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 0888e06 01/28: Use Cask and Coveralls., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 202ca74 15/28: Drop `subr-x' dependency.,
Jackson Ray Hamilton <=
- [elpa] master dd3fe3c 06/28: Fix badges., Jackson Ray Hamilton, 2015/05/05
- [elpa] master fb53884 17/28: Update README., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 52da59c 18/28: Bust cache., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 3f63fab 11/28: Add local coverage configuration., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 158fd83 16/28: Test the trimming function., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 0c20edf 14/28: Add coverage for missing lines., Jackson Ray Hamilton, 2015/05/05
- [elpa] master d116055 12/28: Fix original-maximum-face restoration bug., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 1b6f6fb 21/28: Cleanup README., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 5dd3035 19/28: Refactor trim functions., Jackson Ray Hamilton, 2015/05/05
- [elpa] master f8cfd37 22/28: Double-space., Jackson Ray Hamilton, 2015/05/05