Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added keybindings for slime-edit-definition* functions. #2648

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8444dc3
core: fix evilification of evil-escape starter key
syl20bnr Jul 3, 2015
1307472
git layer: update documentation
syl20bnr Jul 3, 2015
922358c
Update change log
syl20bnr Jul 3, 2015
de5c2b2
Bump version to 0.103.1
syl20bnr Jul 3, 2015
1c2e95e
Link git folder to the correct location.
Profpatsch Jul 4, 2015
e3ce5a6
Recommend removal of old slime installs.
h3dkandi Jul 4, 2015
b55e17a
Variable name has changed in magit 2.1.0.
travisbhartwell Jul 2, 2015
adcbd93
Fixes links to other documents (.md => .org)
cscorley Jul 4, 2015
d91f8f1
Fix the link for `pt` in README.md.
xfq Jul 4, 2015
0262e7a
[git] Bind `magit-blame` rather than `magit-blame-mode` to "gb".
jenanwise Jul 4, 2015
70f14f1
Fix the document of version control keybinding
kccai Jul 3, 2015
b93b912
Fixed docs
stormpat Jul 3, 2015
7a2a420
Fixing typo in git command to update spacemacs
dstcruz Jul 2, 2015
2c8f9bd
fix: broken link in README
madand Jul 2, 2015
c07835e
Update key sequence to open rebase buffer for Magit 2.1
zachlatta Jul 2, 2015
d555002
Typo fixes
xfq Jul 2, 2015
9ad578a
Minor fix of the org table
kccai Jul 2, 2015
7137a37
Use magit-log-all in place of magit-log
Jul 2, 2015
da804f5
Fix issues in VIMUSERS.org.
person808 Jun 26, 2015
f26d188
Fix typo in Github readme
stnly Jun 26, 2015
c9756b5
Fix typo in c-c++ README.
person808 Jun 26, 2015
a9c140d
slime layer: minor typo fix
syl20bnr Jul 4, 2015
18b6277
0.103.2 change log
syl20bnr Jul 5, 2015
93e3b88
Bump version to 0.103.2
syl20bnr Jul 5, 2015
1484fc8
reveal-in-finder was renamed to reveal-in-osx-finder
syohex Aug 4, 2015
2fa60e4
Bump version to 0.103.3
syl20bnr Aug 5, 2015
b65ee09
Set clojure-mode keybindings for derived modes
benalbrecht Aug 6, 2015
f7a2e36
Bump version to 0.103.4
syl20bnr Aug 7, 2015
b84f9a4
Change elpa to use http.
robbyoconnor Aug 10, 2015
846df5b
Fixed osx/init function for reveal-in-osx-finder
fintelkai Aug 7, 2015
55900f4
Bump version to 0.103.5
syl20bnr Aug 10, 2015
887fafb
Added keybindings for slime-edit-definition* functions.
BnMcGn Aug 13, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 39 additions & 4 deletions CHANGELOG.org
Original file line number Diff line number Diff line change
@@ -1,5 +1,40 @@
* Release 0.103.x (2015/07/01)
** 0.103.0
* Release 0.103.x
** 0.103.5 (2015/08/09)
*** Layer changes
**** Osx
- Fix initialization of =reveal-in-osx-finder= (thanks to fintelkai)
*** Core
- Temporarily switch to HTTP instead of HTTPS to communicate with
elpa.gnu.org (thanks to robbyoconnor)
** 0.103.4 (2015/08/07)
*** Layer changes
**** Clojure
- Fix key bindings for new Clojure major modes: =clojurec-mode=,
=clojurescript-mode= and =clojurex-mode= (thanks to benalbrecht)
** 0.103.3 (2015/08/04)
*** Layer changes
**** Osx
- Rename =reveal-in-finder= to its new name =reveal-in-osx-finder=
(thanks to syohex)
** 0.103.2 (2015/07/04)
*** Layer changes
**** Git
- Fix =magit-repository-directories= variable name (thanks to travisbhartwell)
- Fix =magit-blame= key binding (thanks to jenanwise)
- Use -magit-log-all= instead of =magit-log= on ~SPC g l~ (thanks to tuhdo)
*** Other fixes and improvements
- Typos and documentation improvements (thanks to cscorley, dstcruz, h3dkandi,
kccai, MadAnd, person808, Profpatsch, stnly, stormpat, xfq, zachlatta)
** 0.103.1 (2015/07/02)
*** Layer changes
**** Git
- Fix ~F~ in Vim style in =Magit= status buffer, now ~F~ is correctly
bound to =pull= popup menu
- Fix intermittent erroneous ~k~ key binding in =Magit= status buffer.
*** Core
- Fix mandatory dependency on =evil-escape=
- Fix evilification of =evil-escape= starter key
** 0.103.0 (2015/07/01)
*** IMPORTANT: Breaking changes
- Spacemacs is now compatible only with =Magit 2.1= and later, be
sure to update your packages.
Expand Down Expand Up @@ -139,7 +174,7 @@
jenanwise)
**** Gtags
- Enable =helm-gtags= for =compilation-mode= and =shell-mode= (thanks to tuhdo)
**** Hakell
**** Haskell
- Add =company-cabal= support for auto-completion in =.cabal= files (thanks
to bjarkevad)
- Fix error with =electric-indent-local-mode= in some versions of Emacs
Expand All @@ -149,7 +184,7 @@
- Add ~C-RET~ and ~S-RET~ key bindings to behave like the =ein= web interface
(thanks to cpaulik)
- Bind ~SPC f s~ to save the notebook (thanks to cpaulik)
**** Latex
**** LaTeX
- Add support for =RefTeX= (thanks to JP-Ellis)
- Add support for =LatexMk=, to enable it set the layer variable
=latex-build-command= to ="LatexMk"= (thanks to JP-Ellis)
Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
|
<b><a href="doc/DOCUMENTATION.org#goals">goals</a></b>
|
<b><a href="doc/DOCUMENTATION.org#who-can-benefit-from-this-">for whom?</a></b>
<b><a href="doc/DOCUMENTATION.org#user-content-who-can-benefit-from-this">for whom?</a></b>
|
<b><a href="doc/DOCUMENTATION.org#screenshots">screenshots</a></b>
|
Expand Down Expand Up @@ -203,7 +203,7 @@ To fix it change the owner of the directory `~/.emacs.d/server`:

Source: [Stackoverflow][so-server-unsafe]

For efficient searches we recommend to install `pt` [the platinum searcher][].
For efficient searches we recommend to install `pt` ([the platinum searcher][]).
`pt` version 1.7.7 or higher is required.

# Install
Expand Down Expand Up @@ -438,7 +438,7 @@ We especially need to create more configuration layers that, for instance, bring
support for new languages.

If you are ready to contribute please begin by consulting the
[contribution guidelines][CONTRIBUTE.org] and [conventions][CONVENTIONS.md],
[contribution guidelines][CONTRIBUTE.org] and [conventions][CONVENTIONS.org],
thanks!

# License
Expand Down Expand Up @@ -519,8 +519,11 @@ the [emacs-mac-port][] build. See the [install OSX section][] for more
details.

[Twitter]: http://i.imgur.com/tXSoThF.png
[CONTRIBUTE.org]: doc/CONTRIBUTE.org
[CONVENTIONS.org]: doc/CONVENTIONS.org
[DOCUMENTATION.org]: doc/DOCUMENTATION.org
[HOWTOs.org]: doc/HOWTOs.org
[VIMUSERS.org]: doc/VIMUSERS.org
[config]: doc/DOCUMENTATION.org#configuration-layers
[dotfile]: doc/DOCUMENTATION.org#dotfile-configuration
[manage_config]: doc/DOCUMENTATION.org#managing-private-configuration-layers
Expand All @@ -534,9 +537,7 @@ details.
[Evil Mode]: doc/DOCUMENTATION.org#evil
[private]: ./private
[layers]: ./contrib
[DOCUMENTATION.org]: doc/DOCUMENTATION.org
[font section]: doc/DOCUMENTATION.org#font
[CONTRIBUTE.org]: doc/CONTRIBUTE.org
[powerline-seps]: doc/DOCUMENTATION.org#powerline-separators
[FAQ]: https://github.com/syl20bnr/spacemacs#faq
[dotfile template]: ./core/templates/.spacemacs.template
Expand All @@ -552,11 +553,11 @@ details.
[emacs-mac-port-server]: https://github.com/railwaycat/emacs-mac-port/blob/master/README-mac#L210-L213
[homebrew]: https://github.com/Homebrew/homebrew
[emacs-for-windows]: http://emacsbinw64.sourceforge.net/
[the platinum searcher]:
[the platinum searcher]: https://github.com/monochromegane/the_platinum_searcher
[powerline-srgb-issue]: https://github.com/milkypostman/powerline/issues/54
[powerline-doc]: doc/DOCUMENTATION.org#powerline-separators
[so-server-unsafe]: http://stackoverflow.com/questions/885793/emacs-error-when-calling-server-start
[Spacemacs logo]: https://github.com/nashamri/spacemacs-logo
[Nasser Alshammari]: https://github.com/nashamri
[cpaulik-unity-icon]: http://splendidabacus.com/posts/2015/03/spacemacs-unity-icon/
[Windows Image Support]: http://stackoverflow.com/questions/2650041/emacs-under-windows-and-png-files
[Windows Image Support]: http://stackoverflow.com/questions/2650041/emacs-under-windows-and-png-files
2 changes: 1 addition & 1 deletion contrib/!lang/c-c++/README.org
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ by setting the variable =c-c++-default-mode-for-headers= to =c++-mode=.

#+BEGIN_SRC emacs-lisp
(setq-default dotspacemacs-configuration-layers
'((c-c++ variables:
'((c-c++ :variables
c-c++-default-mode-for-headers 'c++-mode)))
#+END_SRC

Expand Down
137 changes: 70 additions & 67 deletions contrib/!lang/clojure/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -138,43 +138,44 @@ the focus."
(evilify cider-inspector-mode cider-inspector-mode-map
(kbd "L") 'cider-inspector-pop)

(evil-leader/set-key-for-mode 'clojure-mode
"mhh" 'cider-doc
"mhg" 'cider-grimoire
"mhj" 'cider-javadoc
(dolist (m '(clojure-mode clojurec-mode clojurescript-mode clojurex-mode))
(evil-leader/set-key-for-mode m
"mhh" 'cider-doc
"mhg" 'cider-grimoire
"mhj" 'cider-javadoc

"meb" 'cider-eval-buffer
"mee" 'cider-eval-last-sexp
"mef" 'cider-eval-defun-at-point
"mer" 'cider-eval-region
"mew" 'cider-eval-last-sexp-and-replace
"meb" 'cider-eval-buffer
"mee" 'cider-eval-last-sexp
"mef" 'cider-eval-defun-at-point
"mer" 'cider-eval-region
"mew" 'cider-eval-last-sexp-and-replace

"mgb" 'cider-jump-back
"mge" 'cider-jump-to-compilation-error
"mgg" 'cider-jump-to-var
"mgr" 'cider-jump-to-resource
"mgb" 'cider-jump-back
"mge" 'cider-jump-to-compilation-error
"mgg" 'cider-jump-to-var
"mgr" 'cider-jump-to-resource

"msb" 'cider-load-buffer
"msB" 'spacemacs/cider-send-buffer-in-repl-and-focus
"msc" 'cider-connect
"mse" 'spacemacs/cider-send-last-sexp-to-repl
"msE" 'spacemacs/cider-send-last-sexp-to-repl-focus
"msf" 'spacemacs/cider-send-function-to-repl
"msF" 'spacemacs/cider-send-function-to-repl-focus
"msi" 'cider-jack-in
"msn" 'spacemacs/cider-send-ns-form-to-repl
"msN" 'spacemacs/cider-send-ns-form-to-repl-focus
"msq" 'cider-quit
"msr" 'spacemacs/cider-send-region-to-repl
"msR" 'spacemacs/cider-send-region-to-repl-focus
"mss" 'cider-switch-to-repl-buffer
"msb" 'cider-load-buffer
"msB" 'spacemacs/cider-send-buffer-in-repl-and-focus
"msc" 'cider-connect
"mse" 'spacemacs/cider-send-last-sexp-to-repl
"msE" 'spacemacs/cider-send-last-sexp-to-repl-focus
"msf" 'spacemacs/cider-send-function-to-repl
"msF" 'spacemacs/cider-send-function-to-repl-focus
"msi" 'cider-jack-in
"msn" 'spacemacs/cider-send-ns-form-to-repl
"msN" 'spacemacs/cider-send-ns-form-to-repl-focus
"msq" 'cider-quit
"msr" 'spacemacs/cider-send-region-to-repl
"msR" 'spacemacs/cider-send-region-to-repl-focus
"mss" 'cider-switch-to-repl-buffer

"mta" 'spacemacs/cider-test-run-all-tests
"mtr" 'spacemacs/cider-test-rerun-tests
"mtt" 'spacemacs/cider-test-run-focused-test
"mta" 'spacemacs/cider-test-run-all-tests
"mtr" 'spacemacs/cider-test-rerun-tests
"mtt" 'spacemacs/cider-test-run-focused-test

"mdi" 'cider-inspect
"mdb" 'cider-debug-defun-at-point)
"mdi" 'cider-inspect
"mdb" 'cider-debug-defun-at-point))
(when clojure-enable-fancify-symbols
(clojure/fancify-symbols 'cider-repl-mode)))

Expand All @@ -196,41 +197,43 @@ the focus."
(cljr-add-keybindings-with-prefix "C-c C-f")
;; not supported for now
;; (spacemacs/declare-prefix "mr" "clj-refactor")
(evil-leader/set-key-for-mode 'clojure-mode
"mrad" 'cljr-add-declaration
"mrai" 'cljr-add-import-to-ns
"mram" 'cljr-add-missing-libspec
"mrap" 'cljr-add-project-dependency
"mrar" 'cljr-add-require-to-ns
"mrau" 'cljr-add-use-to-ns
"mrcc" 'cljr-cycle-coll
"mrci" 'cljr-cycle-if
"mrcn" 'cljr-clean-ns
"mrcp" 'cljr-cycle-privacy
"mrdk" 'cljr-destructure-keys
"mref" 'cljr-extract-function
"mrel" 'cljr-expand-let
"mrfu" 'cljr-find-usages
"mrhd" 'cljr-hotload-dependency
"mril" 'cljr-introduce-let
"mrmf" 'cljr-move-form
"mrml" 'cljr-move-to-let
"mrpc" 'cljr-project-clean
"mrpf" 'cljr-promote-function
"mrrd" 'cljr-remove-debug-fns
"mrrf" 'cljr-rename-file
"mrrl" 'cljr-remove-let
"mrrr" 'cljr-remove-unused-requires
"mrrs" 'cljr-rename-symbol
"mrru" 'cljr-replace-use
"mrsn" 'cljr-sort-ns
"mrsp" 'cljr-sort-project-dependencies
"mrsr" 'cljr-stop-referring
"mrtf" 'cljr-thread-first-all
"mrth" 'cljr-thread
"mrtl" 'cljr-thread-last-all
"mrua" 'cljr-unwind-all
"mruw" 'cljr-unwind))))

(dolist (m '(clojure-mode clojurec-mode clojurescript-mode clojurex-mode))
(evil-leader/set-key-for-mode m
"mrad" 'cljr-add-declaration
"mrai" 'cljr-add-import-to-ns
"mram" 'cljr-add-missing-libspec
"mrap" 'cljr-add-project-dependency
"mrar" 'cljr-add-require-to-ns
"mrau" 'cljr-add-use-to-ns
"mrcc" 'cljr-cycle-coll
"mrci" 'cljr-cycle-if
"mrcn" 'cljr-clean-ns
"mrcp" 'cljr-cycle-privacy
"mrdk" 'cljr-destructure-keys
"mref" 'cljr-extract-function
"mrel" 'cljr-expand-let
"mrfu" 'cljr-find-usages
"mrhd" 'cljr-hotload-dependency
"mril" 'cljr-introduce-let
"mrmf" 'cljr-move-form
"mrml" 'cljr-move-to-let
"mrpc" 'cljr-project-clean
"mrpf" 'cljr-promote-function
"mrrd" 'cljr-remove-debug-fns
"mrrf" 'cljr-rename-file
"mrrl" 'cljr-remove-let
"mrrr" 'cljr-remove-unused-requires
"mrrs" 'cljr-rename-symbol
"mrru" 'cljr-replace-use
"mrsn" 'cljr-sort-ns
"mrsp" 'cljr-sort-project-dependencies
"mrsr" 'cljr-stop-referring
"mrtf" 'cljr-thread-first-all
"mrth" 'cljr-thread
"mrtl" 'cljr-thread-last-all
"mrua" 'cljr-unwind-all
"mruw" 'cljr-unwind)))))

(defun clojure/init-clojure-mode ()
(use-package clojure-mode
Expand Down
2 changes: 1 addition & 1 deletion contrib/!lang/latex/README.org
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ The variable =latex-nofill-env= provide the list of environment names where
| ~SPC m p p~ | preview at point |
| ~SPC m p f~ | cache preamble for preview |
| ~SPC m p c~ | clear previews |
| ~SPC m v ~ | view |
| ~SPC m v~ | view |


** RefTeX
Expand Down
8 changes: 4 additions & 4 deletions contrib/!source-control/git/README.org
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function, this is the folder where you keep all your git-controlled projects
(the path should end up with a ~=/~= to respect Emacs conventions):

#+BEGIN_SRC emacs-lisp
(setq magit-repo-dirs '("~/repos/"))
(setq magit-repository-directories '("~/repos/"))
#+END_SRC

For more information, see [[https://magit.github.io/master/magit.html#Status][Magit-User-Manual#Status]]
Expand Down Expand Up @@ -128,7 +128,7 @@ style you can refer directly to the magit manual:
| ~b b~ | checkout a branch |
| ~b c~ | create a branch |
| ~f f~ | fetch changes |
| ~C-f -r F~ | pull and rebase |
| ~F -r F~ | pull and rebase |
| ~h~ | go left |
| ~j~ | go down |
| ~C-S-j~ or ~C-n~ | goto next magit section |
Expand Down Expand Up @@ -199,7 +199,7 @@ message.
- ~C-c C-c~ to submit the changes
- Squash last commit:
- ~L l~ to open =log buffer=
- ~E~ on the second to last commit, it opens the =rebase buffer=
- ~r e~ on the second to last commit, it opens the =rebase buffer=
- ~j~ to put point on last commit
- ~s~ to squash it
- ~C-c C-c~ to continue to the =commit message buffer=
Expand All @@ -214,7 +214,7 @@ message.
- ~M~ to open the =remote popup=
- ~a~ to add a remote, type the name (i.e. =upstream=) and the URL
- Pull changes from upstream (the parent repository you have forked) and push:
- ~C-f -r C-u F~ and choose =upstream= or the name you gave to it
- ~F -r C-u F~ and choose =upstream= or the name you gave to it
- ~P P~ to push the commit to =origin=

** Git time machine
Expand Down
4 changes: 2 additions & 2 deletions contrib/!source-control/git/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
(magit-diff "HEAD"))

(evil-leader/set-key
"gb" 'magit-blame-mode
"gl" 'magit-log
"gb" 'magit-blame
"gl" 'magit-log-all
"gL" 'magit-log-buffer-file
"gs" 'magit-status
"gd" 'spacemacs/magit-diff-head
Expand Down
2 changes: 1 addition & 1 deletion contrib/!source-control/github/README.org
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This layers adds support for [[http://github.com][Github]].

** Features:
- [[https://github.com/sigma/magit-gh-pulls][magit-gh-pulls]]: handy =magit= add-on to manage Github pull requests.
- [[https://github.com/defunkt/gist.el][gist.el]]: full-featured mode to browse and post Githug gists.
- [[https://github.com/defunkt/gist.el][gist.el]]: full-featured mode to browse and post Github gists.
- [[https://github.com/osener/github-browse-file][github-browse-file]] and [[https://github.com/sshaw/git-link][git-link]]: quickly browse github URL in your
browser.

Expand Down
8 changes: 4 additions & 4 deletions contrib/!source-control/version-control/README.org
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ To use this contribution add it to your =~/.spacemacs=

| Key Binding | Description |
|-------------+---------------|
| ~g h g~ | Go to hunk |
| ~g h N~ | Previous hunk |
| ~g h n~ | Next hunk |
| ~g h r~ | Revert hunk |
| ~SPC g h g~ | Go to hunk |
| ~SPC g h N~ | Previous hunk |
| ~SPC g h n~ | Next hunk |
| ~SPC g h r~ | Revert hunk |
4 changes: 2 additions & 2 deletions contrib/auto-completion/README.org
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ The variable has no effect when =auto-complete= is used.
** Show snippets in auto-completion popup

By default, snippets are not shown in the auto-completion popup. To show them in
the popup, set the variable =auto-completion-show-snippets-in-popup= to =t=.
the popup, set the variable =auto-completion-enable-snippets-in-popup= to =t=.

#+BEGIN_SRC emacs-lisp
(setq-default dotspacemacs-configuration-layers
'((auto-completion :variables
auto-completion-show-snippets-in-popup t))
auto-completion-enable-snippets-in-popup t))
#+END_SRC

** Enable company or auto-complete globally
Expand Down
2 changes: 1 addition & 1 deletion contrib/osx/keybindings.el
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(when (system-is-mac)
(evil-leader/set-key "bf" 'reveal-in-finder)
(evil-leader/set-key "bf" 'reveal-in-osx-finder)

;; this is only applicable to GUI mode
(when (display-graphic-p)
Expand Down
Loading