Skip to content

Commit

Permalink
Merge pull request #3367 from atlas-engineer/fix-color-source
Browse files Browse the repository at this point in the history
  • Loading branch information
aadcg committed Mar 26, 2024
2 parents 5dedfa8 + 6c5c88e commit 9fb9036
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 13 deletions.
14 changes: 6 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,6 @@
path = _build/cl-ansi-text
url = https://github.com/pnathan/cl-ansi-text
shallow = true
[submodule "_build/cl-colors"]
path = _build/cl-colors
url = https://github.com/tpapp/cl-colors
shallow = true
[submodule "_build/let-plus"]
path = _build/let-plus
url = https://github.com/sharplispers/let-plus
Expand Down Expand Up @@ -561,6 +557,7 @@
[submodule "_build/LASS"]
path = _build/LASS
url = https://github.com/Shinmera/LASS
shallow = true
[submodule "_build/njson"]
path = _build/njson
url = https://github.com/atlas-engineer/njson
Expand All @@ -577,13 +574,10 @@
path = _build/prompter
url = https://github.com/atlas-engineer/prompter
shallow = true
[submodule "_build/cl-colors2_fixed"]
path = _build/cl-colors2
url = https://codeberg.org/cage/cl-colors2
shallow = false # Notabug does not advertize commits.
[submodule "_build/chipz"]
path = _build/chipz
url = https://github.com/sharplispers/chipz
shallow = true
[submodule "_build/cl-cffi-gtk"]
path = _build/cl-cffi-gtk
url = https://github.com/sharplispers/cl-cffi-gtk
Expand All @@ -604,3 +598,7 @@
path = _build/cl-electron
url = https://github.com/atlas-engineer/cl-electron/
shallow = true
[submodule "_build/cl-colors2"]
path = _build/cl-colors2
url = https://codeberg.org/cage/cl-colors2.git
shallow = true
1 change: 0 additions & 1 deletion _build/cl-colors
Submodule cl-colors deleted from 827410
2 changes: 1 addition & 1 deletion _build/cl-colors2
Submodule cl-colors2 updated from cc03ba to f77913
5 changes: 5 additions & 0 deletions source/changelog.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ elements are scaled accordingly.")
(:li "When on pre-release, push " (:code "X-pre-release")
" feature in addition to " (:code "X-pre-release-N") "one."))

(define-version "3.11.6"
(:nsection :title "Bug fixes"
(:ul
(:li "Fix warnings raised by " (:nxref :command 'pick-color) "."))))

(define-version "3.11.5"
(:nsection :title "Bug fixes"
(:ul
Expand Down
8 changes: 5 additions & 3 deletions source/color.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@
(prompter:filter-preprocessor #'prompter:filter-exact-matches)
(prompter:filter-postprocessor
(lambda (suggestions source input-color)
(cons (make-instance 'prompter:suggestion
:value input-color
:attributes (prompter:object-attributes input-color source))
(unless (str:empty? input-color) (sleep 0.2))
(append (when (ignore-errors (cl-colors2:as-rgb input-color))
(list (make-instance 'prompter:suggestion
:value input-color
:attributes (prompter:object-attributes input-color source))))
suggestions)))
(prompter:actions-on-current-suggestion-enabled-p t)
(prompter:actions-on-return
Expand Down

0 comments on commit 9fb9036

Please sign in to comment.