summaryrefslogtreecommitdiff
path: root/app-editors/kakoune/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-09-03 20:56:28 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-09-03 20:56:28 +0100
commitfbda87924e6faa7a1919f1a2b4182490bde5ec5c (patch)
treef3114a4ed212a754756adce027aeef3a4a1a2e2a /app-editors/kakoune/files
parent3b08f674e3f771b49370edb144dab0958c8cf721 (diff)
gentoo resync : 03.09.2021
Diffstat (limited to 'app-editors/kakoune/files')
-rw-r--r--app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch10
-rw-r--r--app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch11
-rw-r--r--app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch13
3 files changed, 13 insertions, 21 deletions
diff --git a/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
deleted file mode 100644
index d7b9083a4281..000000000000
--- a/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/rc/filetype/gentoo-linux.kak b/rc/filetype/gentoo-linux.kak
-new file mode 100644
-index 00000000..251dad16
---- /dev/null
-+++ b/rc/filetype/gentoo-linux.kak
-@@ -0,0 +1,4 @@
-+# portage ebuild file
-+hook global BufCreate .*\.ebuild %{
-+ set-option buffer filetype sh
-+}
diff --git a/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
deleted file mode 100644
index d558c49347c1..000000000000
--- a/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/787029
---- a/src/regex_impl.cc
-+++ b/src/regex_impl.cc
-@@ -12,6 +12,7 @@
-
- #include <cstdio>
- #include <cstring>
-+#include <limits>
-
- namespace Kakoune
- {
diff --git a/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch b/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch
new file mode 100644
index 000000000000..b4a7cc439f36
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/rc/filetype/php.kak b/rc/filetype/php.kak
+index be03de9e..97bdbfe3 100644
+--- a/rc/filetype/php.kak
++++ b/rc/filetype/php.kak
+@@ -85,7 +85,7 @@ define-command -hidden php-indent-on-char %<
+ define-command -hidden php-insert-on-new-line %<
+ evaluate-commands -draft -itersel %<
+ # copy // comments or docblock * prefix and following white spaces
+- try %{ execute-keys -draft s [^/] <ret> k <a-x> s ^\h*\K(?://|[*][^/])\h* <ret> y gh j P
++ try %{ execute-keys -draft s [^/] <ret> k <a-x> s ^\h*\K(?://|[*][^/])\h* <ret> y gh j P }
+ # append " * " on lines starting a multiline /** or /* comment
+ try %{ execute-keys -draft k <a-x> s ^\h*/[*][* ]? <ret> j gi i <space>*<space> }
+ >