diff options
Diffstat (limited to 'lisp/cedet/semantic/symref/global.el')
| -rw-r--r-- | lisp/cedet/semantic/symref/global.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/cedet/semantic/symref/global.el b/lisp/cedet/semantic/symref/global.el index e91ecf07bcc..f3a5b57c551 100644 --- a/lisp/cedet/semantic/symref/global.el +++ b/lisp/cedet/semantic/symref/global.el | |||
| @@ -40,10 +40,10 @@ See the function `cedet-gnu-global-search' for more details.") | |||
| 40 | 40 | ||
| 41 | (cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-global)) | 41 | (cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-global)) |
| 42 | "Perform a search with GNU Global." | 42 | "Perform a search with GNU Global." |
| 43 | (let ((b (cedet-gnu-global-search (oref tool :searchfor) | 43 | (let ((b (cedet-gnu-global-search (slot-value tool 'searchfor) |
| 44 | (oref tool :searchtype) | 44 | (slot-value tool 'searchtype) |
| 45 | (oref tool :resulttype) | 45 | (slot-value tool 'resulttype) |
| 46 | (oref tool :searchscope) | 46 | (slot-value tool 'searchscope) |
| 47 | )) | 47 | )) |
| 48 | ) | 48 | ) |
| 49 | (semantic-symref-parse-tool-output tool b) | 49 | (semantic-symref-parse-tool-output tool b) |
| @@ -55,12 +55,12 @@ See the function `cedet-gnu-global-search' for more details.") | |||
| 55 | (cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-global)) | 55 | (cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-global)) |
| 56 | "Parse one line of grep output, and return it as a match list. | 56 | "Parse one line of grep output, and return it as a match list. |
| 57 | Moves cursor to end of the match." | 57 | Moves cursor to end of the match." |
| 58 | (cond ((or (eq (oref tool :resulttype) 'file) | 58 | (cond ((or (eq (slot-value tool 'resulttype) 'file) |
| 59 | (eq (oref tool :searchtype) 'tagcompletions)) | 59 | (eq (slot-value tool 'searchtype) 'tagcompletions)) |
| 60 | ;; Search for files | 60 | ;; Search for files |
| 61 | (when (re-search-forward "^\\([^\n]+\\)$" nil t) | 61 | (when (re-search-forward "^\\([^\n]+\\)$" nil t) |
| 62 | (match-string 1))) | 62 | (match-string 1))) |
| 63 | ((eq (oref tool :resulttype) 'line-and-text) | 63 | ((eq (slot-value tool 'resulttype) 'line-and-text) |
| 64 | (when (re-search-forward semantic-symref-global--line-re nil t) | 64 | (when (re-search-forward semantic-symref-global--line-re nil t) |
| 65 | (list (string-to-number (match-string 2)) | 65 | (list (string-to-number (match-string 2)) |
| 66 | (match-string 3) | 66 | (match-string 3) |