Merged changes for compatibility with newer prelude release.

init.el

@@ -99,8 +99,8 @@ by Prelude.")
 
 ;; the core stuff
 (require 'prelude-packages)
+(require 'prelude-custom)  ;; Needs to be loaded before core, editor and ui
 (require 'prelude-ui)
-(require 'prelude-custom)  ;; Needs to be loaded before core and editor
 (require 'prelude-core)
 (require 'prelude-mode)
 (require 'prelude-editor)

modules/prelude-go.el

@@ -42,15 +42,18 @@
 ;; Ignore go test -c output files
 (add-to-list 'completion-ignored-extensions ".test")
 
+(define-key 'help-command (kbd "G") 'godoc)
+
 (eval-after-load 'go-mode
   '(progn
      (defun prelude-go-mode-defaults ()
-       ;; Default key bindings for gotest.el
+       ;; Add to default go-mode key bindings
        (let ((map go-mode-map))
          (define-key map (kbd "C-c a") 'go-test-current-project) ;; current package, really
          (define-key map (kbd "C-c m") 'go-test-current-file)
          (define-key map (kbd "C-c .") 'go-test-current-test)
-         (define-key map (kbd "C-c b") 'go-run))
+         (define-key map (kbd "C-c b") 'go-run)
+         (define-key map (kbd "C-h f") 'godoc-at-point))
 
        ;; Prefer goimports to gofmt if installed
        (let ((goimports (executable-find "goimports")))

personal/custom.el

@@ -4,10 +4,6 @@
 ;;; These options are ones that don't somehow fit under the guise of the other
 ;;; configuration files.
 
-;;; Code:
-(load-library "~/.emacs.d/personal/repo.el")
-
-
 ; install aditional packages
 (prelude-require-packages '(autopair powershell csharp-mode jedi fill-column-indicator mark-multiple rect-mark flymake smex imenu))
 

prelude-modules.el

@@ -1,23 +0,0 @@
-;;; Uncomment the modules you'd like to use and restart Prelude afterwards
-
-(require 'prelude-c)
-;; (require 'prelude-clojure)
-;; (require 'prelude-coffee)
-;; (require 'prelude-common-lisp)
-(require 'prelude-css)
-(require 'prelude-emacs-lisp)
-(require 'prelude-erc)
-(require 'prelude-erlang)
-;; (require 'prelude-haskell)
-(require 'prelude-js)
-;; (require 'prelude-latex)
-(require 'prelude-lisp)
-;; (require 'prelude-mediawiki)
-(require 'prelude-org)
-(require 'prelude-perl)
-(require 'prelude-python)
-;; (require 'prelude-ruby)
-;; (require 'prelude-scala)
-(require 'prelude-scheme)
-;; (require 'prelude-scss)
-(require 'prelude-xml)

sample/prelude-modules.el

@@ -4,6 +4,7 @@
 (require 'prelude-erc)
 (require 'prelude-ido) ;; Super charges Emacs completion for C-x C-f and more
 ;; (require 'prelude-helm) ;; Interface for narrowing and search
+;; (require 'prelude-helm-everywhere) ;; Enable Helm everywhere
 (require 'prelude-company)
 ;; (require 'prelude-key-chord) ;; Binds useful features to key combinations
 ;; (require 'prelude-mediawiki)
@@ -17,11 +18,13 @@
 ;; (require 'prelude-css)
 (require 'prelude-emacs-lisp)
 ;; (require 'prelude-erlang)
+;; (require 'prelude-elixir)
 ;; (require 'prelude-go)
 ;; (require 'prelude-haskell)
 (require 'prelude-js)
 ;; (require 'prelude-latex)
 (require 'prelude-lisp)
+;; (require 'prelude-ocaml)
 (require 'prelude-org) ;; Org-mode helps you keep TODO lists, notes and more
 (require 'prelude-perl)
 ;; (require 'prelude-python)
@@ -32,3 +35,4 @@
 ;; (require 'prelude-scss)
 ;; (require 'prelude-web) ;; Emacs mode for web templates
 (require 'prelude-xml)
+;; (require 'prelude-yaml)