From 49423eae5c31d46e29109e31260846c25dc12ca6 Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Tue, 26 Mar 2024 10:03:49 +0200 Subject: [PATCH 1/5] gitmodules: Minor fix. --- .gitmodules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmodules b/.gitmodules index 0ca0fdefe49..a5b8ade7827 100644 --- a/.gitmodules +++ b/.gitmodules @@ -561,6 +561,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 @@ -584,6 +585,7 @@ [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 From 2e18f56119df80879a69f192efe817ae5c32bed1 Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Tue, 26 Mar 2024 10:04:26 +0200 Subject: [PATCH 2/5] gitmodules: Delete cl-colors. --- .gitmodules | 4 ---- _build/cl-colors | 1 - 2 files changed, 5 deletions(-) delete mode 160000 _build/cl-colors diff --git a/.gitmodules b/.gitmodules index a5b8ade7827..0b1b690e758 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/_build/cl-colors b/_build/cl-colors deleted file mode 160000 index 82741058455..00000000000 --- a/_build/cl-colors +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 827410584553f5c717eec6182343b7605f707f75 From 216acb30497df057a6b79c4d55c3ffbb5fba89cd Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Tue, 26 Mar 2024 10:09:16 +0200 Subject: [PATCH 3/5] gitmodules: Bump cl-colors2. --- .gitmodules | 8 ++++---- _build/cl-colors2 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0b1b690e758..3ff370859fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -574,10 +574,6 @@ 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 @@ -602,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 diff --git a/_build/cl-colors2 b/_build/cl-colors2 index cc03badf5f6..f77913acab0 160000 --- a/_build/cl-colors2 +++ b/_build/cl-colors2 @@ -1 +1 @@ -Subproject commit cc03badf5f69be65ae7e13c2f9a7c16838ab8241 +Subproject commit f77913acab0c745e0662c374bd52e952d4e4b474 From 667191f925b7d32cfb46ca57c9f1c45a64d244aa Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Wed, 20 Mar 2024 12:39:19 +0200 Subject: [PATCH 4/5] color(color-source): Refactor. Muffle errors. Computations start after a 0.2 delay as to account for user input. --- source/color.lisp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/color.lisp b/source/color.lisp index afc50f26d99..606f73d47dc 100644 --- a/source/color.lisp +++ b/source/color.lisp @@ -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 From 6c5c88e2542e7f4e833dc045ec1535d84a95ad3b Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Tue, 26 Mar 2024 10:26:35 +0200 Subject: [PATCH 5/5] changelog: Mention fix. --- source/changelog.lisp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/changelog.lisp b/source/changelog.lisp index 5f48430b149..8d8f90a9858 100644 --- a/source/changelog.lisp +++ b/source/changelog.lisp @@ -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