Merge branch 'develop' (v0.62.1)

syl20bnr · Feb 19, 2015 · 25e8981 · 25e8981
2 parents dc739ec + 058300b
commit 25e8981
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/contrib/lang/clojure/README.md b/contrib/lang/clojure/README.md
@@ -87,9 +87,10 @@ instructions at the [cider repository][cider_install].
 
     Key Binding       |                 Description
 ----------------------|------------------------------------------------------------
-<kbd>SPC m g v</kbd>  | goto var
+<kbd>SPC m g g</kbd>  | goto var
 <kbd>SPC m g e</kbd>  | goto error
-<kbd>SPC m g s</kbd>  | goto symbol
+<kbd>SPC m g r</kbd>  | goto resource
+<kbd>SPC m g b</kbd>  | go back
 
 ### REPL
 

diff --git a/contrib/lang/clojure/packages.el b/contrib/lang/clojure/packages.el
@@ -74,7 +74,7 @@ which require an initialization must be listed explicitly in the list.")
         "mdd" 'cider-doc
         "mdg" 'cider-grimoire
         "mdj" 'cider-javadoc
-        "mgv" 'cider-jump-to-var
+        "mgg" 'cider-jump-to-var
         "mgr" 'cider-jump-to-resource
         "mge" 'cider-jump-to-compilation-error
         "mgb" 'cider-jump-back

diff --git a/contrib/lang/go/extensions.el b/contrib/lang/go/extensions.el
@@ -34,7 +34,7 @@
     (if (not go-path)
         (spacemacs/message (concat "Warning: GOPATH variable not found, "
                                    "go-oracle configuration skipped."))
-      (load-gopath-file "/src/code.google.com/p/go.tools/cmd/oracle/oracle.el")
+      (load-gopath-file go-path "/src/code.google.com/p/go.tools/cmd/oracle/oracle.el")
       (load-file (concat (file-name-as-directory go-path)
                          "src/code.google.com/p/go.tools/cmd/oracle/oracle.el"))
       (add-hook 'go-mode-hook 'go-oracle-mode)

diff --git a/contrib/lang/go/packages.el b/contrib/lang/go/packages.el
@@ -43,6 +43,6 @@ which require an initialization must be listed explicitly in the list.")
  (use-package company-go
    :if (boundp 'company-backends)
    :defer t
-   :init (add-to-list 'company-backends 'company-go)
+   :init (eval-after-load 'go-mode '(add-to-list 'company-backends 'company-go))
   )
 )
diff --git a/init.el b/init.el
@@ -9,7 +9,7 @@
 ;; This file is not part of GNU Emacs.
 ;;
 ;;; License: GPLv3
-(defconst spacemacs-version           "0.62.0" "Spacemacs version.")
+(defconst spacemacs-version           "0.62.1" "Spacemacs version.")
 (defconst spacemacs-emacs-min-version   "24.3" "Minimal version of Emacs.")
 
 (defun spacemacs/emacs-version-ok ()