diff options
Diffstat (limited to 'lisp/cedet/semantic/symref/global.el')
-rw-r--r-- | lisp/cedet/semantic/symref/global.el | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lisp/cedet/semantic/symref/global.el b/lisp/cedet/semantic/symref/global.el index 9bc24fbbd4e..d1ea921302f 100644 --- a/lisp/cedet/semantic/symref/global.el +++ b/lisp/cedet/semantic/symref/global.el @@ -2,7 +2,7 @@ ;; Copyright (C) 2008-2019 Free Software Foundation, Inc. -;; Author: Eric M. Ludlam <eric@siege-engine.com> +;; Author: Eric M. Ludlam <zappo@gnu.org> ;; This file is part of GNU Emacs. @@ -40,14 +40,11 @@ See the function `cedet-gnu-global-search' for more details.") (cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-global)) "Perform a search with GNU Global." - (let ((b (cedet-gnu-global-search (oref tool :searchfor) - (oref tool :searchtype) - (oref tool :resulttype) - (oref tool :searchscope) - )) - ) - (semantic-symref-parse-tool-output tool b) - )) + (let ((b (cedet-gnu-global-search (oref tool searchfor) + (oref tool searchtype) + (oref tool resulttype) + (oref tool searchscope)))) + (semantic-symref-parse-tool-output tool b))) (defconst semantic-symref-global--line-re "^\\([^ ]+\\) +\\([0-9]+\\) \\([^ ]+\\) ") @@ -55,12 +52,12 @@ See the function `cedet-gnu-global-search' for more details.") (cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-global)) "Parse one line of grep output, and return it as a match list. Moves cursor to end of the match." - (cond ((or (eq (oref tool :resulttype) 'file) - (eq (oref tool :searchtype) 'tagcompletions)) + (cond ((or (eq (oref tool resulttype) 'file) + (eq (oref tool searchtype) 'tagcompletions)) ;; Search for files (when (re-search-forward "^\\([^\n]+\\)$" nil t) (match-string 1))) - ((eq (oref tool :resulttype) 'line-and-text) + ((eq (oref tool resulttype) 'line-and-text) (when (re-search-forward semantic-symref-global--line-re nil t) (list (string-to-number (match-string 2)) (match-string 3) |