From c2004f6d949d3f05ee020c43ae107681700d0400 Mon Sep 17 00:00:00 2001 From: Stephen Spalding Date: Wed, 18 Feb 2015 11:13:05 -0500 Subject: [PATCH 1/4] clojure: mgv -> mgg; update docs --- contrib/lang/clojure/README.md | 5 +++-- contrib/lang/clojure/packages.el | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/lang/clojure/README.md b/contrib/lang/clojure/README.md index 0fa8b8d06911..69b2c02287d7 100644 --- 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 ----------------------|------------------------------------------------------------ -SPC m g v | goto var +SPC m g g | goto var SPC m g e | goto error -SPC m g s | goto symbol +SPC m g r | goto resource +SPC m g b | go back ### REPL diff --git a/contrib/lang/clojure/packages.el b/contrib/lang/clojure/packages.el index 0824612f85b8..b94fb7748add 100644 --- 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 From ecd0fc0c52756522177d7dfccefc64440b3d9180 Mon Sep 17 00:00:00 2001 From: Josh Chase Date: Wed, 18 Feb 2015 12:11:51 -0800 Subject: [PATCH 2/4] Fix bug in the go/init-go-oracle function --- contrib/lang/go/extensions.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/lang/go/extensions.el b/contrib/lang/go/extensions.el index acc932394ed7..3b45453ec129 100644 --- 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) From 894c223c3347001306fce6a8550184e1615ab6fb Mon Sep 17 00:00:00 2001 From: Cong Nguyen Date: Thu, 19 Feb 2015 11:06:41 +0700 Subject: [PATCH 3/4] fix company-go loading before go-mode --- contrib/lang/go/packages.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/lang/go/packages.el b/contrib/lang/go/packages.el index 7eb98d36d81e..5d95c7a5e391 100644 --- 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)) ) ) From 058300b88fc3bb16f8eb77705e14edaa10466262 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Thu, 19 Feb 2015 07:09:13 -0500 Subject: [PATCH 4/4] Bump version to 0.62.1 --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 62aa6eca773c..eb14262cee30 100644 --- 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 ()