[elpa] master b83709f 07/11: Deprecate `comments-and-strings'.

[Jackson Ray Hamilton]

branch: master
commit b83709f4ad9253631eee27d678c724d770a6b316
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>

    Deprecate `comments-and-strings'.
---
 context-coloring.el           |   12 +++++++++---
 test/context-coloring-test.el |   17 +++++++++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/context-coloring.el b/context-coloring.el
index 5382339..b4082fa 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -132,15 +132,21 @@ the END point (exclusive) with the face corresponding to 
LEVEL."
    end
    `(face ,(context-coloring-bounded-level-face level))))
 
-(defcustom context-coloring-comments-and-strings t
+(defcustom context-coloring-comments-and-strings nil
   "If non-nil, also color comments and strings using `font-lock'."
   :group 'context-coloring)
 
-(defcustom context-coloring-syntactic-comments nil
+(make-obsolete-variable
+ 'context-coloring-comments-and-strings
+ "use `context-coloring-syntactic-comments' and
+ `context-coloring-syntactic-strings' instead."
+ "6.1.0")
+
+(defcustom context-coloring-syntactic-comments t
   "If non-nil, also color comments using `font-lock'."
   :group 'context-coloring)
 
-(defcustom context-coloring-syntactic-strings nil
+(defcustom context-coloring-syntactic-strings t
   "If non-nil, also color comments using `font-lock'."
   :group 'context-coloring)
 
diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index 5801dd8..903da68 100644
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -701,7 +701,7 @@ see that function."
 (context-coloring-test-deftest-js-mode key-values)
 (context-coloring-test-deftest-js2-mode key-values)
 
-(defun context-coloring-test-js-comments-and-strings ()
+(defun context-coloring-test-js-syntactic-comments-and-strings ()
   "Test comments and strings."
   (context-coloring-test-assert-region-level 1 8 0)
   (context-coloring-test-assert-region-comment-delimiter 9 12)
@@ -711,8 +711,21 @@ see that function."
   (context-coloring-test-assert-region-string 28 40)
   (context-coloring-test-assert-region-level 40 41 0))
 
+(defun context-coloring-test-js-syntactic-comments-and-strings-setup ()
+  (setq context-coloring-syntactic-comments t)
+  (setq context-coloring-syntactic-strings t))
+
+(context-coloring-test-deftest-js-mode syntactic-comments-and-strings
+  :fixture-name comments-and-strings)
+(context-coloring-test-deftest-js2-mode syntactic-comments-and-strings
+  :fixture-name comments-and-strings)
+
+(defalias 'context-coloring-test-js-comments-and-strings
+  'context-coloring-test-js-syntactic-comments-and-strings
+  "Test comments and strings.  Deprecated.")
+
 (defun context-coloring-test-js-comments-and-strings-setup ()
-  "Setup comments and strings."
+  "Setup comments and strings.  Deprecated."
   (setq context-coloring-comments-and-strings t))
 
 (context-coloring-test-deftest-js-mode comments-and-strings)