Revert string-trim-right

emacs-php · Nov 3, 2022 · 9603a4f · 9603a4f
1 parent 08ef915
commit 9603a4f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
@@ -90,9 +90,16 @@
 
 (defconst php-mode-version-id
   (eval-when-compile
-    (let* ((fallback-version (format "%s-non-vcs" (with-no-warnings php-mode-version-number))))
+    (let ((fallback-version (format "%s-non-vcs" (with-no-warnings php-mode-version-number))))
       (if (locate-dominating-file default-directory ".git")
-          (string-trim-left (string-trim-right (shell-command-to-string "git describe --tags")) "v")
+          (save-match-data
+            (let ((tag (replace-regexp-in-string
+                        (rx bos "v") ""
+                        (shell-command-to-string "git describe --tags")))
+                  (pattern (rx (group (+ any)) eol)))
+              (if (string-match pattern tag)
+                  (match-string 0 tag)
+                (error "Faild to obtain git tag"))))
         fallback-version)))
   "PHP Mode build ID.