Merge da3dce98bb into 427268c64f

history-substring-search: Update history-substring-search module to current master
completion: Update completion module to current master
2025-01-23 04:42:16 +08:00 · 2025-01-01 16:01:26 +02:00 · 2024-12-26 22:32:57 -06:00 · 2024-12-26 22:30:38 -06:00 · 2024-12-26 22:27:46 -06:00 · 2024-12-12 07:47:13 +05:30
5 changed files with 15 additions and 4 deletions
--- a/modules/autosuggestions/external
+++ b/modules/autosuggestions/external
@ -1 +1 @@
-Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
+Subproject commit e52ee8ca55bcc56a17c828767a3f98f22a68d4eb
--- a/modules/completion/external
+++ b/modules/completion/external
@ -1 +1 @@
-Subproject commit 978e79e12c44b5b1d3e1e2920c537002087b82c2
+Subproject commit c160d09fddd28ceb3af5cf80e9253af80e450d96
--- a/modules/git/functions/git-info
+++ b/modules/git/functions/git-info
@ -149,6 +149,9 @@ function git-info {
  local dirty=0
  local dirty_format
  local dirty_formatted
+  local tracked=0
+  local tracked_format
+  local tracked_formatted
  local ignore_submodules
  local indexed=0
  local indexed_format
@ -413,6 +416,13 @@ function git-info {
    fi
  fi

+  # Format tracked.
+  (( tracked = dirty - untracked ))
+  if (( tracked > 0 )); then
+    zstyle -s ':prezto:module:git:info:tracked' format 'tracked_format'
+    zformat -f tracked_formatted "$tracked_format" "t:$tracked"
+  fi
+
  # Format dirty and clean.
  if (( dirty > 0 )); then
    zstyle -s ':prezto:module:git:info:dirty' format 'dirty_format'
@ -447,6 +457,7 @@ function git-info {
      "s:$action_formatted" \
      "S:$stashed_formatted" \
      "U:$unmerged_formatted" \
+      "t:$tracked_formatted" \
      "u:$untracked_formatted"
    git_info[$info_format]="$REPLY"
  done
--- a/modules/history-substring-search/external
+++ b/modules/history-substring-search/external
@ -1 +1 @@
-Subproject commit 8dd05bfcc12b0cd1ee9ea64be725b3d9f713cf64
+Subproject commit 87ce96b1862928d84b1afe7c173316614b30e301
--- a/modules/tmux/init.zsh
+++ b/modules/tmux/init.zsh
@ -23,7 +23,7 @@ if ([[ "$TERM_PROGRAM" = 'iTerm.app' ]] && \
  _tmux_iterm_integration='-CC'
 fi

-if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && "$TERM_PROGRAM" != "vscode" && "$TERMINAL_EMULATOR" != "JetBrains-JediTerm" ]] && ( \
+if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && -z "$VSCODE_RESOLVING_ENVIRONMENT" && "$TERM_PROGRAM" != "vscode" && "$TERMINAL_EMULATOR" != "JetBrains-JediTerm" ]] && ( \
  ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
  ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
 ); then
Author	SHA1	Message	Date
Zoey Hewll	5161f3dc62	Merge `da3dce98bb` into `427268c64f`	2025-01-01 16:01:26 +02:00
Indrajit Raychaudhuri	427268c64f	history-substring-search: Update history-substring-search module to current master	2024-12-26 22:32:57 -06:00
Indrajit Raychaudhuri	61d7dc9a72	completion: Update completion module to current master	2024-12-26 22:30:38 -06:00
Indrajit Raychaudhuri	2388b8f873	autosuggestions: Update autosuggestions module to 0.7.1	2024-12-26 22:27:46 -06:00
msdx321	9626ce2beb	Add exception for VSCode env helper Signed-off-by: msdx321 <msdx321@gmail.com>	2024-12-12 07:47:13 +05:30
Zoey Llewellyn Hewll	da3dce98bb	Add 'tracked' context to git-info * add :prezto:moduleinfo:tracked (%t) to format dirty tracked file count	2018-12-26 17:17:26 +08:00