branch: externals/gtags-mode
commit a3d29799acc6ebdbf81684bfac45fff2c8a9f975
Merge: d9893f4932 0d2bfb63dc
Author: Jimmy Aguilar Mena <kratsbinov...@gmail.com>
Commit: Jimmy Aguilar Mena <kratsbinov...@gmail.com>
Merge branch 'repair-gtagslibpath' very thanks @aagon
Closes: #8
---
gtags-mode.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gtags-mode.el b/gtags-mode.el
index 0c253f173f..4123d460da 100644
--- a/gtags-mode.el
+++ b/gtags-mode.el
@@ -5,7 +5,7 @@
;; Author: Jimmy Aguilar Mena
;; URL: https://github.com/Ergus/gtags-mode
;; Keywords: xref, project, imenu, gtags, global
-;; Version: 1.8.3
+;; Version: 1.8.4
;; Package-Requires: ((emacs "28"))
;; This program is free software: you can redistribute it and/or modify
@@ -104,7 +104,7 @@ The address is absolute for remote hosts.")
"Regex to filter the output with `gtags-mode--output-format-options'.")
(defconst gtags-mode--output-format-options
- '("--result=cscope" "--path-style=through" "--color=never")
+ '("--result=cscope" "--path-style=relative" "--color=never")
"Command line options to use with `gtags-mode--output-format-regex'.")
(defsubst gtags-mode--message (level format-string &rest args)
@@ -278,11 +278,11 @@ name, code, file, line."
(funcall creator
(match-string-no-properties 2 line) ;; name
(match-string-no-properties 4 line) ;; code
- (concat root (substring-no-properties
- line (1+ (match-beginning 1))
(match-end 1))) ;; file
+ (concat root (match-string-no-properties 1
line)) ;; file
(string-to-number (match-string-no-properties 3
line))))) ;; line
(apply #'gtags-mode--exec-sync
- (append gtags-mode--output-format-options args `(,symbol))
)))
+ (append gtags-mode--output-format-options args
+ `("--directory" ,(file-local-name root)
,symbol)))))
(error "Calling gtags-mode--filter-find-symbol without GTAGSROOT")
nil))
