Merge 3b4c63aea4 into 3308262dfb

Merge commit '242ccfaef86ab3ab6a5f3c19f3396cdbc1049968'
Squashed 'gitstatus/' changes from 075baf6e..39d34dff
2026-08-20 18:23:58 -04:00 · 2026-08-15 11:22:58 +02:00 · 2026-08-15 11:22:58 +02:00 · 2026-08-15 10:21:46 +02:00 · 2025-02-02 17:13:57 +05:30
9 changed files with 20 additions and 7 deletions
--- a/config/p10k-classic.zsh
+++ b/config/p10k-classic.zsh
@ -1126,7 +1126,7 @@
  # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
  # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
  #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'
  # Custom icon.
  # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'

--- a/config/p10k-lean-8colors.zsh
+++ b/config/p10k-lean-8colors.zsh
@ -1101,7 +1101,7 @@
  # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
  # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
  #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'
  # Custom icon.
  # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'

--- a/config/p10k-lean.zsh
+++ b/config/p10k-lean.zsh
@ -1101,7 +1101,7 @@
  # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
  # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
  #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'
  # Custom icon.
  # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'

--- a/config/p10k-rainbow.zsh
+++ b/config/p10k-rainbow.zsh
@ -1203,7 +1203,7 @@
  # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
  # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
  #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'

  # Custom icon.
  # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'
--- a/gitstatus/mbuild
+++ b/gitstatus/mbuild
@ -94,7 +94,9 @@
 setopt no_unset extended_glob pipe_fail prompt_percent typeset_silent \
  no_prompt_subst no_prompt_bang pushd_silent warn_create_global

-if [[ $ZSH_VERSION != (5.<1->*|<6->.*) || $ZSH_VERSION == 5.4(|.*) ]]; then
+autoload -Uz is-at-least
+
+if ! is-at-least 5.1 || [[ $ZSH_VERSION == 5.4.* ]]; then
  print -ru2 -- "[error] unsupported zsh version: $ZSH_VERSION"
  return 1
 fi
--- a/gitstatus/src/arena.h
+++ b/gitstatus/src/arena.h
@ -27,6 +27,7 @@
 #include <type_traits>
 #include <vector>

+#include "check.h"
 #include "string_view.h"

 namespace gitstatus {
@ -94,6 +95,7 @@ class Arena {
  template <class T>
  inline T* Allocate(size_t n) {
    static_assert(!std::is_reference<T>(), "");
+    CHECK(n <= SIZE_MAX / sizeof(T)) << n;
    return static_cast<T*>(Allocate(n * sizeof(T), alignof(T)));
  }

--- a/internal/icons.zsh
+++ b/internal/icons.zsh
@ -75,6 +75,7 @@ function _p9k_init_icons() {
        LINUX_ENDEAVOUROS_ICON         '\uE271'$s             # 
        LINUX_ROCKY_ICON               '\uE271'$s             # 
        LINUX_ALMALINUX_ICON           '\uE271'$s             # 
+        LINUX_ZORIN_ICON               '\uE271'$s             # 
        LINUX_GUIX_ICON                '\uE271'$s             # 
        LINUX_NEON_ICON                '\uE271'$s             # 
        SUNOS_ICON                     '\U1F31E'$q            # 🌞
@ -234,6 +235,7 @@ function _p9k_init_icons() {
        LINUX_ENDEAVOUROS_ICON         '\uF17C'$s             # 
        LINUX_ROCKY_ICON               '\uF17C'$s             # 
        LINUX_ALMALINUX_ICON           '\uF17C'$s             # 
+        LINUX_ZORIN_ICON               '\uF17C'$s             # 
        LINUX_GUIX_ICON                '\uF17C'$s             # 
        LINUX_NEON_ICON                '\uF17C'$s             # 
        SUNOS_ICON                     '\uF185 '              # 
@ -394,6 +396,7 @@ function _p9k_init_icons() {
        LINUX_ENDEAVOUROS_ICON         "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
        LINUX_ROCKY_ICON               "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
        LINUX_ALMALINUX_ICON           "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
+        LINUX_ZORIN_ICON               "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
        LINUX_GUIX_ICON                "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
        LINUX_NEON_ICON                "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
        SUNOS_ICON                     "${CODEPOINT_OF_AWESOME_SUN_O:+\\u$CODEPOINT_OF_AWESOME_SUN_O }"
@ -547,6 +550,7 @@ function _p9k_init_icons() {
        LINUX_ENDEAVOUROS_ICON         '\UF322'$s             # 
        LINUX_ROCKY_ICON               '\UF32B'$s             # 
        LINUX_ALMALINUX_ICON           '\UF31D'$s             # 
+        LINUX_ZORIN_OS                 '\uF32F'$s             # 
        LINUX_GUIX_ICON                '\UF325'$s             # 
        LINUX_NEON_ICON                '\uF17C'               # 
        LINUX_ICON                     '\uF17C'               # 
@ -708,6 +712,7 @@ function _p9k_init_icons() {
        LINUX_ENDEAVOUROS_ICON         '\uF17C'               # 
        LINUX_ROCKY_ICON               '\uF17C'               # 
        LINUX_ALMALINUX_ICON           '\uF17C'               # 
+        LINUX_ZORIN_ICON               '\uF17C'               # 
        LINUX_GUIX_ICON                '\uF325'$s             # 
        LINUX_NEON_ICON                '\uF17C'               # 
        LINUX_ICON                     '\uF17C'               # 
@ -862,6 +867,7 @@ function _p9k_init_icons() {
        LINUX_ENDEAVOUROS_ICON         'edvos'
        LINUX_ROCKY_ICON               'rocky'
        LINUX_ALMALINUX_ICON           'alma'
+        LINUX_ZORIN_ICON               'zorin'
        LINUX_GUIX_ICON                'guix'
        LINUX_NEON_ICON                'neon'
        SUNOS_ICON                     'sunos'
@ -1017,6 +1023,7 @@ function _p9k_init_icons() {
        LINUX_ENDEAVOUROS_ICON         'Edv'
        LINUX_ROCKY_ICON               'Roc'
        LINUX_ALMALINUX_ICON           'Alma'
+        LINUX_ZORIN_ICON               'Zorin'
        LINUX_GUIX_ICON                'Guix'
        LINUX_NEON_ICON                'Neon'
        SUNOS_ICON                     'Sun'
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@ -2265,7 +2265,7 @@ prompt_package() {

  P9K_PACKAGE_NAME=$_p9k__cache_val[2]
  P9K_PACKAGE_VERSION=$_p9k__cache_val[3]
-  _p9k_prompt_segment "$0" "cyan" "$_p9k_color1" PACKAGE_ICON 0 '' ${P9K_PACKAGE_VERSION//\%/%%}
+  _p9k_prompt_segment "$0" "cyan" "$_p9k_color1" PACKAGE_ICON 0 '' ${(V)P9K_PACKAGE_VERSION//\%/%%}
 }

 ################################################################
@ -8689,6 +8689,7 @@ function _p9k_init_cacheable() {
          endeavouros)             _p9k_set_os Linux LINUX_ENDEAVOUROS_ICON;;
          rocky)                   _p9k_set_os Linux LINUX_ROCKY_ICON;;
          almalinux)               _p9k_set_os Linux LINUX_ALMALINUX_ICON;;
+          zorin)                   _p9k_set_os Linux LINUX_ZORIN_ICON;;
          guix)                    _p9k_set_os Linux LINUX_GUIX_ICON;;
          neon)                    _p9k_set_os Linux LINUX_NEON_ICON;;
          *)                       _p9k_set_os Linux LINUX_ICON;;
@ -9527,7 +9528,7 @@ if [[ $__p9k_dump_file != $__p9k_instant_prompt_dump_file && -n $__p9k_instant_p
  zf_rm -f -- $__p9k_instant_prompt_dump_file{,.zwc} 2>/dev/null
 fi

-typeset -g P9K_VERSION=1.20.17
+typeset -g P9K_VERSION=1.20.18

 if [[ ${VSCODE_SHELL_INTEGRATION-} == <1-> && ${+__p9k_force_term_shell_integration} == 0 ]]; then
  typeset -gri __p9k_force_term_shell_integration=1
--- a/internal/wizard.zsh
+++ b/internal/wizard.zsh
@ -1165,6 +1165,7 @@ function os_icon_name() {
          endeavouros)             echo LINUX_ENDEAVOUROS_ICON;;
          rocky)                   echo LINUX_ROCKY_ICON;;
          almalinux)               echo LINUX_ALMALINUX_ICON;;
+          ZORIN)                   echo LINUX_ZORIN_ICON;;
          guix)                    echo LINUX_GUIX_ICON;;
          neon)                    echo LINUX_NEON_ICON;;
          *)                       echo LINUX_ICON;;
Author	SHA1	Message	Date
Tari	2cf978d780	Merge `3b4c63aea4` into `3308262dfb`	2026-08-20 18:23:58 -04:00
Roman Perepelitsa	3308262dfb	Merge commit '242ccfaef86ab3ab6a5f3c19f3396cdbc1049968'	2026-08-15 11:22:58 +02:00
Roman Perepelitsa	242ccfaef8	Squashed 'gitstatus/' changes from 075baf6e..39d34dff 39d34dff add a CHECK to Arena.Allocate<T>(n) git-subtree-dir: gitstatus git-subtree-split: 39d34dff4456067a0df17bdf1ea74b07c1983b39	2026-08-15 11:22:58 +02:00
Roman Perepelitsa	58e13d16a5	bug fix: slap (V) on the content of `package` (#2961 ) The same should be done with a bunch of other prompt segments.	2026-08-15 10:21:46 +02:00
Tari-dev	3b4c63aea4	Add Zorin icon	2025-02-02 17:13:57 +05:30