[nongnu] elpa/go-mode cf557a3 024/495: Merge branch 'fix/gh-2'

[ELPA Syncer]

branch: elpa/go-mode
commit cf557a385a5e8aebbc66e22866e9bb628214c531
Merge: 850986e 7fb4e67
Author: Dominik Honnef <dominikh@fork-bomb.org>
Commit: Dominik Honnef <dominikh@fork-bomb.org>

    Merge branch 'fix/gh-2'
    
    Conflicts:
        go-mode.el
---
 go-mode.el | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/go-mode.el b/go-mode.el
index 393e7d3..d48b9e2 100644
--- a/go-mode.el
+++ b/go-mode.el
@@ -6,12 +6,16 @@
 ;; Bugs:
 ;; - Disable escapes in `` strings
 ;; - Correct indentation for http://sprunge.us/iEaN
-;; - fontify types in struct definitions
+;; - Fontify types in struct definitions
+;; - Fontify unicode in method receiver types, array/slice/map types
+;;   and everywhere where type-name is being used
 
 (defconst go-dangling-operators-regexp "[^-]-\\|[^+]\\+\\|[/*&><.=|^]")
 (defconst gofmt-stdin-tag "<standard input>")
 (defconst go-identifier-regexp "[[:word:][:multibyte:]_]+")
+(defconst go-type-regexp "[[:word:][:multibyte:]_*]+")
 (defconst go-func-regexp (concat "\\<func\\>\\s *\\(" go-identifier-regexp 
"\\)"))
+(defconst go-func-meth-regexp (concat "\\<func\\>\\s *\\((\\s *" 
go-identifier-regexp "\\s +" go-type-regexp "\\s *)\\s *\\)?\\(" 
go-identifier-regexp "\\)("))
 
 (defvar go-mode-syntax-table
   (let ((st (make-syntax-table)))
@@ -214,11 +218,11 @@ built-ins, functions, and some types.")
         (if (>= count 0)
             (progn
               (go--backward-irrelevant)
-              (if (not (re-search-backward go-func-regexp nil t))
+              (if (not (re-search-backward go-func-meth-regexp nil t))
                   (setq failure t)))
-          (if (looking-at go-func-regexp)
+          (if (looking-at go-func-meth-regexp)
               (forward-char))
-          (if (not (re-search-forward go-func-regexp nil t))
+          (if (not (re-search-forward go-func-meth-regexp nil t))
               (setq failure t)))
         (setq first nil)))
     (if (< count 0)