emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/colorful-mode 706472ea7f 2/2: Merge pull request #12 fr


From: ELPA Syncer
Subject: [elpa] externals/colorful-mode 706472ea7f 2/2: Merge pull request #12 from jaybarra/main
Date: Wed, 25 Sep 2024 00:57:36 -0400 (EDT)

branch: externals/colorful-mode
commit 706472ea7f0ee2fe5719cd91df7315fe9ca86114
Merge: e79dac7ee6 92ba131d26
Author: Jen-Chieh Shen <jcs090218@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #12 from jaybarra/main
---
 CONTRIBUITING.org => CONTRIBUTING.ORG |  0
 README.org                            | 16 ++++++++--------
 colorful-mode.el                      | 18 +++++++++---------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/CONTRIBUITING.org b/CONTRIBUTING.ORG
similarity index 100%
rename from CONTRIBUITING.org
rename to CONTRIBUTING.ORG
diff --git a/README.org b/README.org
index 9ec0a1a2af..93b530f160 100644
--- a/README.org
+++ b/README.org
@@ -33,7 +33,7 @@ in real time and in a user friendly way based/inspired on 
🌈[[https://elpa.gnu
 
 * Screenshots and animated GIFs 📷
 
[[https://raw.githubusercontent.com/DevelopmentCool2449/colorful-mode/main/assets/gif1.gif]]
-/With prefix instead highliht/.
+/With prefix instead highlight/.
 
 
[[https://raw.githubusercontent.com/DevelopmentCool2449/colorful-mode/main/assets/gif2.gif]]
 
[[https://raw.githubusercontent.com/DevelopmentCool2449/colorful-mode/main/assets/gif3.gif]]
@@ -64,7 +64,7 @@ in real time and in a user friendly way based/inspired on 
🌈[[https://elpa.gnu
     colorful-add-hex-colors)
   List of functions to add extra color keywords to colorful-color-keywords.
 
-  It can be a cons cell specifing the mode (or a list of modes)
+  It can be a cons cell specifying the mode (or a list of modes)
   e.g:
 
   (((css-mode css-ts-mode) . colorful-add-rgb-colors)
@@ -86,7 +86,7 @@ in real time and in a user friendly way based/inspired on 
🌈[[https://elpa.gnu
    + colorful-add-latex-colors
 
 - =colorful-exclude-colors (default: '("#def"))= List of keyword to don't 
highlight.
-- =colorful-short-hex-convertions (default: 2)= If set to 2, hex values 
converted by colorful should be as short as possible.
+- =colorful-short-hex-conversions (default: 2)= If set to 2, hex values 
converted by colorful should be as short as possible.
   Setting this to 2 will make hex values follow a 24-bit specification
   and can make them inaccurate.
 - =colorful-only-strings (default: nil)= If non-nil colorful will only 
highlight colors inside strings.
@@ -163,10 +163,10 @@ and fixing some /(and old)/ bugs:
 
|-------------------------------------------------------+------------------+-----------------|
 | Compatible with hl-line and other overlays?           | ✓                | ❌ 
             |
 | Convert color to other formats?                       | ✓                | ❌ 
             |
-| Opcionally use string prefix/suffix instead highlight | ✓                | ❌ 
             |
+| Optionally use string prefix/suffix instead highlight | ✓                | ❌ 
             |
 | Exclude keywords/colors?                              | ✓                | 
❌^{1}          |
 | Allow highlight specifics colors in specific modes    | ✓                | 
✓^{2}           |
-| Opcionally highlight only in strings                  | ✓                | ❌ 
             |
+| Optionally highlight only in strings                  | ✓                | ❌ 
             |
 | No performance issues?^{3}                            | ❌               | ✓  
             |
 #+begin_src text
 [1] rainbow-mode (like colorful) uses regex for highlight some
@@ -180,15 +180,15 @@ and fixing some /(and old)/ bugs:
 The intention is to provide a featured alternative to
 =rainbow-mode.el= with a user-friendly approach.
 
-If you prefer only highlights without color convertion, prefix/suffix
+If you prefer only highlights without color conversion, prefix/suffix
 string indicator and/or anything else you can use =rainbow-mode.el=.
 
 On the other hand, if you want convert colors, overlays, optional
 prefix strings and more features you can use =colorful-mode.el=.
 * 
[[https://raw.githubusercontent.com/DevelopmentCool2449/colorful-mode/main/CONTRIBUITING.org][How
 to Contribute]]
 colorful-mode is part of GNU ELPA, if you want send patches you will
-need assign copyright to the Free Software Fundation.
-Please see the 
[[https://raw.githubusercontent.com/DevelopmentCool2449/colorful-mode/main/CONTRIBUITING.org][CONTRIBUITING.org]]
 file for getting more information.
+need assign copyright to the Free Software Foundation.
+Please see the 
[[https://raw.githubusercontent.com/DevelopmentCool2449/colorful-mode/main/CONTRIBUITING.org][CONTRIBUTING.org]]
 file for getting more information.
 
 #+html: <img 
src="https://raw.githubusercontent.com/DevelopmentCool2449/emacs-svg-badges/main/powered_by_emacs.svg";
 align="left" width="10%" alt="Powered by GNU Emacs">
 #+html: <img 
src="https://raw.githubusercontent.com/DevelopmentCool2449/emacs-svg-badges/main/powered_by_org_mode.svg";
 align="right" width="10%" alt="Powered by Org Mode">
diff --git a/colorful-mode.el b/colorful-mode.el
index 663daf5099..86ec3aa6ea 100644
--- a/colorful-mode.el
+++ b/colorful-mode.el
@@ -217,7 +217,7 @@ Each entry should have the form (COLOR-NAME . 
HEXADECIMAL-COLOR)."
     (latex-mode . colorful-add-latex-colors)
     colorful-add-hex-colors)
   "List of functions to add extra color keywords to `colorful-color-keywords'.
-It can be a cons cell specifing the mode (or a list of modes)
+It can be a cons cell specifying the mode (or a list of modes)
 e.g:
 \(((`css-mode' `css-ts-mode') . `colorful-add-rgb-colors')
   (`emacs-lisp-mode' . (`colorful-add-color-names'
@@ -265,7 +265,7 @@ Only relevant if `colorful-use-prefix' is non-nil."
   "List of keyword to don't highlight."
   :type '(repeat string))
 
-(defcustom colorful-short-hex-convertions 2
+(defcustom colorful-short-hex-conversions 2
   "If set to 2, hex values converted by colorful should be as short as 
possible.
 Setting this to 2 will make hex values follow a 24-bit specification
 and can make them inaccurate."
@@ -287,7 +287,7 @@ mode is derived from `prog-mode'."
 
 ;;;; Internal Functions
 
-;;;;; Base Convertion functions
+;;;;; Base Conversion functions
 
 (defun colorful--percentage-to-absolute (percentage)
   "Convert PERCENTAGE to a absolute number.
@@ -440,17 +440,17 @@ PROMPT must be a string with 1 format control (generally 
a string argument)."
             ((or (member color (defined-colors))
                  (assoc-string color colorful-html-colors-alist))
              (list (colorful--name-to-hex
-                    color colorful-short-hex-convertions)
+                    color colorful-short-hex-conversions)
                    beg end))
             ;; Is CSS rgb?
             ((string-match-p (rx (one-or-more "rgb" (opt "a") "(")) color)
              (list (colorful--rgb-to-hex
-                    color colorful-short-hex-convertions)
+                    color colorful-short-hex-conversions)
                    beg end))
             ;; Is HSL?
             ((string-match-p (rx (one-or-more "hsl" (opt "a") "(")) color)
              (list (colorful--hsl-to-hex
-                    color colorful-short-hex-convertions)
+                    color colorful-short-hex-conversions)
                    beg end)))
 
          (colorful--change-color ov "%s is already a Hex color. Try again: "
@@ -467,13 +467,13 @@ PROMPT must be a string with 1 format control (generally 
a string argument)."
             ;; Is CSS rgb?
             ((string-match-p (rx (one-or-more "rgb" (opt "a") "(")) color)
              (if-let ((rep (colorful--hex-to-name (colorful--rgb-to-hex
-                                                   color 
colorful-short-hex-convertions))))
+                                                   color 
colorful-short-hex-conversions))))
                  (list rep beg end)
                (user-error "No color name available")))
             ;; Is HSL?
             ((string-match-p (rx (one-or-more "hsl" (opt "a") "(")) color)
              (if-let ((rep (colorful--hex-to-name (colorful--hsl-to-hex
-                                                   color 
colorful-short-hex-convertions))))
+                                                   color 
colorful-short-hex-conversions))))
                  (list rep beg end)
                (user-error "No color name available"))))
 
@@ -718,7 +718,7 @@ This is intended to be used with 
`colorful-extra-color-keyword-functions'."
     (cl-pushnew colors colorful-color-keywords)))
 
 
-;;;; Minor mode defintinions
+;;;; Minor mode definitions
 
 (defun colorful--turn-on ()
   "Helper function for turn on `colorful-mode'."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]