[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 8367e19 18/26: Rename `level-face' functions.
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master 8367e19 18/26: Rename `level-face' functions. |
Date: |
Sat, 14 Feb 2015 08:19:38 +0000 |
branch: master
commit 8367e1907fb1a01a177869541bea36daf0058e57
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Rename `level-face' functions.
---
context-coloring.el | 20 ++++++++++----------
test/context-coloring-test.el | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/context-coloring.el b/context-coloring.el
index 8b056a5..6c71180 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -110,16 +110,16 @@ backgrounds."
;;; Face functions
-(defsubst context-coloring-face-symbol (level)
- "Returns a symbol for a face with LEVEL."
+(defsubst context-coloring-level-face (level)
+ "Return the symbol for a face with LEVEL."
;; `concat' is faster than `format' here.
- (intern-soft (concat "context-coloring-level-"
- (number-to-string level)
- "-face")))
+ (intern-soft
+ (concat "context-coloring-level-" (number-to-string level) "-face")))
-(defsubst context-coloring-level-face (level)
- "Returns the face name for LEVEL."
- (context-coloring-face-symbol (min level context-coloring-maximum-face)))
+(defsubst context-coloring-bounded-level-face (level)
+ "Return the symbol for a face with LEVEL, bounded by
+`context-coloring-maximum-face'."
+ (context-coloring-level-face (min level context-coloring-maximum-face)))
;;; Colorization utilities
@@ -130,7 +130,7 @@ END (exclusive) with the face corresponding to LEVEL."
(add-text-properties
start
end
- `(face ,(context-coloring-level-face level))))
+ `(face ,(context-coloring-bounded-level-face level))))
(defcustom context-coloring-comments-and-strings t
"If non-nil, also color comments and strings using `font-lock'."
@@ -550,7 +550,7 @@ which must already exist and which *should* already be
enabled."
(mapcar
(lambda (color)
(setq level (+ level 1))
- `(,(context-coloring-face-symbol level) ((t (:foreground ,color)))))
+ `(,(context-coloring-level-face level) ((t (:foreground ,color)))))
colors))))
(defun context-coloring-define-theme (theme &rest properties)
diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index 61e24b1..0e6e03f 100644
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -251,7 +251,7 @@ EXPECTED-FACE."
(defun context-coloring-test-assert-face (level foreground &optional negate)
"Assert that a face for LEVEL exists and that its `:foreground'
is FOREGROUND."
- (let* ((face (context-coloring-face-symbol level))
+ (let* ((face (context-coloring-level-face level))
actual-foreground)
(when (not (or negate
face))
- [elpa] master a1b7f3e 08/26: Define extra faces in `context-coloring-set-colors-default'., (continued)
- [elpa] master a1b7f3e 08/26: Define extra faces in `context-coloring-set-colors-default'., Jackson Ray Hamilton, 2015/02/14
- [elpa] master ca15a60 09/26: Whitespace., Jackson Ray Hamilton, 2015/02/14
- [elpa] master 351142e 07/26: More disciplined use of `if'., Jackson Ray Hamilton, 2015/02/14
- [elpa] master e68d00b 11/26: Whitespace., Jackson Ray Hamilton, 2015/02/14
- [elpa] master c125d9f 12/26: Reorganize defvars and defcustoms., Jackson Ray Hamilton, 2015/02/14
- [elpa] master a49b024 15/26: Whitespace., Jackson Ray Hamilton, 2015/02/14
- [elpa] master 0681e94 13/26: Remove `set-colors' and `set-colors-default'., Jackson Ray Hamilton, 2015/02/14
- [elpa] master e5d512f 10/26: "Misfeature.", Jackson Ray Hamilton, 2015/02/14
- [elpa] master 25a8d13 16/26: Documentation., Jackson Ray Hamilton, 2015/02/14
- [elpa] master 4c3d1da 17/26: Rename `defface-default' to `defface-neutral'., Jackson Ray Hamilton, 2015/02/14
- [elpa] master 8367e19 18/26: Rename `level-face' functions.,
Jackson Ray Hamilton <=
- [elpa] master 3d91840 22/26: Remove `context-coloring-benchmark-colorization'., Jackson Ray Hamilton, 2015/02/14
- [elpa] master 3805110 14/26: Reorganize faces. Remove eval macroexpand., Jackson Ray Hamilton, 2015/02/14
- [elpa] master a7db850 20/26: Cleanup documentation., Jackson Ray Hamilton, 2015/02/14
- [elpa] master bae456d 19/26: Use imperative for documentation., Jackson Ray Hamilton, 2015/02/14
- [elpa] master 45c0d1a 23/26: Add `:setup' and `:teardown' properties to dispatches., Jackson Ray Hamilton, 2015/02/14
- [elpa] master f4e1cbc 25/26: Version 6.0.0., Jackson Ray Hamilton, 2015/02/14
- [elpa] master 8e5674f 21/26: Cleanup documentation., Jackson Ray Hamilton, 2015/02/14
- [elpa] master f52a5e5 26/26: Merge commit 'f4e1cbc5386fbf197ff8bcb6a9275f17c9cbe8e4' from context-coloring, Jackson Ray Hamilton, 2015/02/14
- [elpa] master e2d3320 24/26: Add `uncompile' Makefile task., Jackson Ray Hamilton, 2015/02/14