Skip to content

Commit 1e6e438

Browse files
committed
Merge pull request #43 from syohex/refactoring
Refactoring
2 parents ef18dd3 + 3840038 commit 1e6e438

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ before_install:
1414
- evm install $EVM_EMACS --use --skip
1515
- cask
1616
script:
17-
make test
17+
- go version
18+
- make test

go-eldoc.el

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
(forward-list)
267267
(cond ((looking-at (concat "\\s-*" go-eldoc--argument-type-regexp))
268268
(goto-char (match-end 0)))
269-
((looking-at "\\s-*(")
269+
((looking-at-p "\\s-*(")
270270
(skip-chars-forward " \t")
271271
(forward-list)))
272272
(setq name-type (concat name-type
@@ -361,13 +361,13 @@
361361
(defun go-eldoc--retrieve-type (typeinfo symbol)
362362
(let ((case-fold-search nil))
363363
(cond ((string-match (format "^%s,,var \\(.+\\)$" symbol) typeinfo)
364-
(match-string 1 typeinfo))
364+
(match-string-no-properties 1 typeinfo))
365365
((string-match-p (format "\\`%s,,package\\s-*$" symbol) typeinfo)
366366
"package")
367367
((string-match (format "^%s,,\\(func.+\\)$" symbol) typeinfo)
368-
(match-string 1 typeinfo))
368+
(match-string-no-properties 1 typeinfo))
369369
((string-match (format "^%s,,\\(.+\\)$" symbol) typeinfo)
370-
(match-string 1 typeinfo)))))
370+
(match-string-no-properties 1 typeinfo)))))
371371

372372
(defun go-eldoc--get-cursor-info (bounds)
373373
(save-excursion

0 commit comments

Comments
 (0)