# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1373552169 18000
# Node ID aa5afa13e12c10af01d5ca7853bfa605dd61b946
# Parent  a7f5b0526a51cd8859bc929402fab5bb1f8898e6
emacs: add go-eldoc for better go programming

diff --git a/.elisp/settings/00.bootstrap.el b/.elisp/settings/00.bootstrap.el
--- a/.elisp/settings/00.bootstrap.el
+++ b/.elisp/settings/00.bootstrap.el
@@ -6,6 +6,7 @@
 
 (setq package-archives '(("durin42" . "http://durin42.com/elpa/")
                          ("marmalade" . "http://marmalade-repo.org/packages/")
+                         ("melpa" . "http://melpa.milkbox.net/packages/")
                          ("elpa" . "http://tromey.com/elpa/")))
 
 (defun af-bootstrap-packages ()
@@ -28,6 +29,11 @@
                   yaml-mode
                   company
                   wgrep
+                  ;; for go-eldoc
+                  popup
+                  auto-complete
+                  go-autocomplete
+                  go-eldoc
                   ))
     (unless (or (member pack package-activated-list)
                 (functionp pack))
diff --git a/.elisp/settings/80.go.el b/.elisp/settings/80.go.el
--- a/.elisp/settings/80.go.el
+++ b/.elisp/settings/80.go.el
@@ -30,7 +30,8 @@
         (message "Go is installed, loading go-mode")
         (add-to-list 'load-path goloc)
         (require 'go-mode)
-        (add-hook 'go-mode-hook          'af-go-hook)
+        (add-hook 'go-mode-hook 'af-go-hook)
+        (add-hook 'go-mode-hook 'go-eldoc-setup)
         (let* ((loc (af-get-gocode-elisp-location))
                (el (concat loc "/company-go.el")))
           (if (file-exists-p el)