No need to call set-loqal twice

1 files changed, 4 insertions, 8 deletions

diff --git a/lisp/init-go-mode.el b/lisp/init-go-mode.el
index 4612209..c88f65a 100644
--- a/lisp/init-go-mode.el
+++ b/lisp/init-go-mode.el
@@ -7,14 +7,10 @@
           (lambda ()
             ;; C-c p runs gofmt on the buffer
             (define-key go-mode-map (kbd "C-c p") 'gofmt)
-            ;; fix imenu expressions
+            ;; fix imenu expressions and use flat index
             (setq-local imenu-generic-expression
-                        `(("type" "^type *\\([^ \t\n\r\f]*\\)" 1)
-                          ("func" ,go-func-regexp 1)
-                          ("func" ,go-func-meth-regexp 2)))
-            ;; use flat index for imenu
-            (setq-local imenu-generic-expression
-                        (mapcar (lambda (arg) (cons nil (cdr arg)))
-                                imenu-generic-expression))))
+                        `((nil "^type *\\([^ \t\n\r\f]*\\)" 1)
+                          (nil ,go-func-regexp 1)
+                          (nil ,go-func-meth-regexp 2)))))
 
 (provide 'init-go-mode)