[Core-Utils] Add string-trim-right implementation.

Alexander-Miller · Aug 30, 2023 · 3cd2a0d · 3cd2a0d
1 parent 7a36a3c
commit 3cd2a0d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/elisp/treemacs-core-utils.el b/src/elisp/treemacs-core-utils.el
@@ -154,6 +154,16 @@ Used in `treemacs-is-node-expanded?'")
          (substring ,path 0 -1)
        ,path))))
 
+(define-inline treemacs-string-trim-right (string)
+  "Trim STRING of trailing string matching REGEXP.
+
+Same as the builtin `string-trim-right', but re-implemented here for Emacs 27."
+  (declare (side-effect-free t))
+  (inline-letevals (string)
+    (inline-quote
+     (let ((i (string-match-p "\\(?:[ \t\n\r]+\\)\\'" ,string)))
+       (if i (substring ,string 0 i) ,string)))))
+
 (define-inline treemacs--prefix-arg-to-recurse-depth (arg)
   "Translates prefix ARG into a number.
 Used for depth-based expansion of nodes - a numeric prefix will translate to

diff --git a/src/elisp/treemacs-git-commit-diff-mode.el b/src/elisp/treemacs-git-commit-diff-mode.el
@@ -56,7 +56,7 @@ Look for the PROJECT either in BUFFER or the local treemacs buffer."
         :on-success
         (when (buffer-live-p buffer)
           (-let [out (-> (pfuture-callback-output)
-                         (string-trim-right)
+                         (treemacs-string-trim-right)
                          (read))]
             (with-current-buffer buffer
               (if out

diff --git a/src/extra/treemacs-magit.el b/src/extra/treemacs-magit.el
@@ -181,7 +181,7 @@ Relevant for integrating with `treemacs-git-commit-diff-mode'.")
             :directory path
             :on-success
             (-let [out (-> (pfuture-callback-output)
-                           (string-trim-right)
+                           (treemacs-string-trim-right)
                            (read))]
               (treemacs-run-in-every-buffer
                (-when-let* ((project (treemacs--find-project-for-path path))