update packages and add valign

lisp/treemacs/Changelog.org

@@ -6,6 +6,7 @@
 *** Added ~treemacs-buffer-name-function~
 *** Added ~treemacs-file-follow-ignore-functions~
 *** Added ~treemacs-buffer-name-prefix~
+*** Added ~treemacs-hide-dot-jj-directory~
 ** v3.1
 - Deprecated ~treemacs-window-background-color~ in favour of ~treemacs-window-background-face~ and
   ~treemacs-hl-line-face~

lisp/treemacs/treemacs-compatibility.el

@@ -108,7 +108,7 @@ to split it."
        (select-window (next-window))))))
 
 (with-eval-after-load 'persp-mode
-  (defun treemacs--remove-treemacs-window-in-new-frames (persp-activated-for)
+  (defun treemacs--remove-treemacs-window-in-new-frames (persp-activated-for &rest _)
     (when (eq persp-activated-for 'frame)
       (-when-let (w (--first (treemacs-is-treemacs-window? it)
                              (window-list)))

lisp/treemacs/treemacs-core-utils.el

@@ -1034,7 +1034,8 @@ Will return t when FILE
 3) ends with \"~\" (backup files)
 4) is surrounded with \"#\" (auto save files)
 5) is \".git\" (see also `treemacs-hide-dot-git-directory')
-6) is \".\" or \"..\" (default dirs)"
+6) is \".jj\" (see also `treemacs-hide-dot-jj-directory')
+7) is \".\" or \"..\" (default dirs)"
   (declare (side-effect-free t) (pure t))
   (inline-letevals (file)
     (inline-quote
@@ -1046,6 +1047,8 @@ Will return t when FILE
            (string-equal ,file "..")
            (and treemacs-hide-dot-git-directory
                 (string-equal ,file ".git"))
+           (and treemacs-hide-dot-jj-directory
+                (string-equal ,file ".jj"))
            (string-prefix-p "flycheck_" ,file))))))
 
 (define-inline treemacs--mac-ignore-file-predicate (file _)

lisp/treemacs/treemacs-count-mail.py

@@ -1,5 +1,6 @@
 from subprocess import Popen, PIPE
 import sys
+from os import environ
 
 # Command line arguments are a list of maildirs.
 # The output is a list of items in the form '((P1 A1) (P2 A2))' where P is the node path for a maildir
@@ -28,12 +29,12 @@ def main():
             if mu_dir == "/":
                 continue
 
+        environ["LC_ALL"] = "C"
         unread = Popen(UNREAD_CMD.format(mu_dir.replace(" ", "\ ")),
                        shell=True,
                        stdout=PIPE,
                        bufsize=100,
-                       encoding='utf-8',
-                       env={"LC_ALL": "C"}
+                       encoding='utf-8'
                     ).communicate()[0][:-1]
 
         if unread == "0":

lisp/treemacs/treemacs-customization.el

@@ -328,6 +328,13 @@ of `treemacs-toggle-show-dotfiles'."
   :type 'boolean
   :group 'treemacs)
 
+(defcustom treemacs-hide-dot-jj-directory t
+  "Indicates whether the .jj directory should be hidden.
+When this is non-nil the .jj dir will be hidden regardless of current setting
+of `treemacs-toggle-show-dotfiles'."
+  :type 'boolean
+  :group 'treemacs)
+
 (defcustom treemacs-sorting 'alphabetic-asc
   "Indicates how treemacs will sort its files and directories.
 Files will still always be shown after directories.

lisp/treemacs/treemacs-find-ignored-files.py

@@ -1,5 +1,6 @@
 from subprocess import Popen, PIPE
 from os.path import exists
+from os import environ
 import sys
 
 GIT_BIN = sys.argv[1]
@@ -37,7 +38,8 @@ def main():
 
     for root in roots:
         if exists(root + "/.git"):
-            proc = Popen(GIT_CMD, shell=True, stdout=PIPE, bufsize=100, cwd=root, env={"LC_ALL": "C"})
+            environ["LC_ALL"] = "C"
+            proc = Popen(GIT_CMD, shell=True, stdout=PIPE, bufsize=100, cwd=root)
             procs.append((root, proc))
 
     STDOUT.write(b"(")

lisp/treemacs/treemacs-git-commit-diff.py

@@ -1,11 +1,13 @@
 from subprocess import Popen, PIPE
 import sys
+from os import environ
 
 GIT_BIN = sys.argv[1]
 STATUS_CMD = "{} status -sb".format(GIT_BIN)
 
 def main():
-    proc = Popen(STATUS_CMD, shell=True, stdout=PIPE, bufsize=100, env={"LC_ALL": "C"})
+    environ["LC_ALL"] = "C"
+    proc = Popen(STATUS_CMD, shell=True, stdout=PIPE, bufsize=100)
 
     if (proc.wait() != 0):
         sys.exit(2)

lisp/treemacs/treemacs-git-status.py

@@ -1,5 +1,5 @@
 from subprocess import Popen, PIPE
-from os import listdir
+from os import listdir, environ
 from os.path import isdir, islink
 from posixpath import join
 import sys
@@ -44,7 +44,7 @@ def find_recursive_entries(path, state):
     global output, ht_size
     for item in listdir(path):
         full_path = join(path, item)
-        output.append(QUOTE + full_path + QUOTE + face_for_status(state))
+        output.append(QUOTE + full_path.replace(b'"', b'\\"') + QUOTE + face_for_status(state))
         ht_size += 1
         if ht_size > LIMIT:
             break
@@ -54,7 +54,9 @@ def find_recursive_entries(path, state):
 def main():
     global output, ht_size
     # Don't lock Git when updating status.
-    proc = Popen(GIT_CMD, shell=True, stdout=PIPE, bufsize=100, env={"LC_ALL": "C", "GIT_OPTIONAL_LOCKS": "0"})
+    environ["LC_ALL"] = "C"
+    environ["GIT_OPTIONAL_LOCKS"] = "0"
+    proc = Popen(GIT_CMD, shell=True, stdout=PIPE, bufsize=100)
     dirs_added = {}
 
     for item in proc.stdout:
@@ -100,7 +102,7 @@ def main():
                 # directories should not be printed more than once, which would happen if
                 # e.g. both /A/B/C/x and /A/B/C/y have changes
                 if full_dirname not in dirs_added:
-                    output.append(QUOTE + full_dirname + QUOTE + b"treemacs-git-modified-face")
+                    output.append(QUOTE + full_dirname.replace(b'"', b'\\"') + QUOTE + b"treemacs-git-modified-face")
                     ht_size += 1
                     dirs_added[full_dirname] = True
         # for untracked and ignored directories we need to find an entry for every single file

lisp/treemacs/treemacs-pkg.el

@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "treemacs" "20250907.1320"
+(define-package "treemacs" "20251226.1307"
   "A tree style file explorer package."
   '((emacs      "26.1")
     (cl-lib     "0.5")
@@ -11,7 +11,7 @@
     (ht         "2.2")
     (cfrs       "1.3.2"))
   :url "https://github.com/Alexander-Miller/treemacs"
-  :commit "05333cc23ca4349cd839cf1c18e1eaef1f6b70ec"
-  :revdesc "05333cc23ca4"
+  :commit "2ab5a3c89fa01bbbd99de9b8986908b2bc5a7b49"
+  :revdesc "2ab5a3c89fa0"
   :authors '(("Alexander Miller" . "alexanderm@web.de"))
   :maintainers '(("Alexander Miller" . "alexanderm@web.de")))

lisp/treemacs/treemacs-single-file-git-status.py

@@ -1,6 +1,7 @@
 from subprocess import run, Popen, PIPE, DEVNULL, check_output
 import sys
 import os
+from os import environ
 
 # There are 3+ command line arguments:
 # 1) the file to update
@@ -90,14 +91,16 @@ def main():
     print(elisp_alist)
 
 def add_git_processes(status_listings, path):
-    ignored_proc = Popen(IS_IGNORED_CMD + path, shell=True, stdout=DEVNULL, stderr=DEVNULL, env={"LC_ALL": "C"})
-    tracked_proc = Popen(IS_TRACKED_CMD + path, shell=True, stdout=DEVNULL, stderr=DEVNULL, env={"LC_ALL": "C"})
-    changed_proc = Popen(IS_CHANGED_CMD + path, shell=True, stdout=PIPE,    stderr=DEVNULL, env={"LC_ALL": "C"})
+    environ["LC_ALL"] = "C"
+    ignored_proc = Popen(IS_IGNORED_CMD + path, shell=True, stdout=DEVNULL, stderr=DEVNULL)
+    tracked_proc = Popen(IS_TRACKED_CMD + path, shell=True, stdout=DEVNULL, stderr=DEVNULL)
+    changed_proc = Popen(IS_CHANGED_CMD + path, shell=True, stdout=PIPE,    stderr=DEVNULL)
 
     status_listings.append((path, ignored_proc, tracked_proc, changed_proc))
 
 def determine_file_git_state():
-    proc = Popen(FILE_STATE_CMD + FILE, shell=True, stdout=PIPE, stderr=DEVNULL, env={"LC_ALL": "C"})
+    environ["LC_ALL"] = "C"
+    proc = Popen(FILE_STATE_CMD + FILE, shell=True, stdout=PIPE, stderr=DEVNULL)
     line = proc.stdout.readline()
     if line:
         state = line.lstrip().split(b" ")[0]

lisp/treemacs/treemacs.el

@@ -5,8 +5,8 @@
 ;; Author: Alexander Miller <alexanderm@web.de>
 ;; Package-Requires: ((emacs "26.1") (cl-lib "0.5") (dash "2.11.0") (s "1.12.0") (ace-window "0.9.0") (pfuture "1.7") (hydra "0.13.2") (ht "2.2") (cfrs "1.3.2"))
 ;; Homepage: https://github.com/Alexander-Miller/treemacs
-;; Package-Version: 20250907.1320
-;; Package-Revision: 05333cc23ca4
+;; Package-Version: 20251226.1307
+;; Package-Revision: 2ab5a3c89fa0
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by