Commit e9e71564 authored by syl20bnr's avatar syl20bnr
Browse files

Merge branch 'develop' (v0.64.0)

parents 064a598b b3a1ca04
......@@ -283,6 +283,9 @@ dotspacemacs-configuration-layers '(company-mode
smex)
```
At anytime you can apply the changes made to the dotfile _without restarting_
`Spacemacs` by pressing <kbd>SPC m c c</kbd>.
The [comments in this file][dotfile template] contain further information about
how to customize Spacemacs. See the [dotfile configuration][dotfile] section of
the documentation for more information.
......
# Ace-window contribution layer for Spacemacs
<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc/generate-toc again -->
**Table of Contents**
- [Ace-window contribution layer for Spacemacs](#ace-window-contribution-layer-for-spacemacs)
- [Description](#description)
- [Install](#install)
- [Key bindings](#key-bindings)
<!-- markdown-toc end -->
## Description
This layer adds support for [ace-window][].
## Install
To use this contribution add it to your `~/.spacemacs`
```elisp
(setq-default dotspacemacs-configuration-layers '(ace-window))
```
## Key bindings
Key Binding | Description
----------------------|------------------------------------------------------------
<kbd>SPC b m m</kbd> | swap a buffer with another
<kbd>SPC w c</kbd> | delete a window (replace `delete-window`)
<kbd>SPC w m</kbd> | maximize a window (replace `toggle-maximize-buffer`)
<kbd>SPC w w</kbd> | switch to a window (replace `other-window`)
[ace-window]: https://github.com/abo-abo/ace-window
;;; extensions.el --- ace-window Layer extensions File for Spacemacs
;;
;; Copyright (c) 2012-2014 Sylvain Benner
;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
;;
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
;; URL: https://github.com/syl20bnr/spacemacs
;;
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
(defvar ace-window-pre-extensions
'(
;; pre extension ace-windows go here
)
"List of all extensions to load before the packages.")
(defvar ace-window-post-extensions
'(
;; post extension ace-windows go here
)
"List of all extensions to load after the packages.")
;; For each extension, define a function ace-window/init-<extension-ace-window>
;;
;; (defun ace-window/init-my-extension ()
;; "Initialize my extension"
;; )
;;
;; Often the body of an initialize function uses `use-package'
;; For more info on `use-package', see readme:
;; https://github.com/jwiegley/use-package
;;; packages.el --- ace-window Layer packages File for Spacemacs
;;
;; Copyright (c) 2012-2014 Sylvain Benner
;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
;;
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
;; URL: https://github.com/syl20bnr/spacemacs
;;
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
(defvar ace-window-packages '(ace-window)
"List of all packages to install and/or initialize. Built-in packages
which require an initialization must be listed explicitly in the list.")
(defvar ace-window-excluded-packages '()
"List of packages to exclude.")
(defun ace-window/init-ace-window ()
(use-package ace-window
:defer t
:init
(evil-leader/set-key
"bmm" 'ace-swap-window
"wc" 'ace-delete-window
"wm" 'ace-maximize-window
"ww" 'ace-window)
:config
(progn
;; add support for golden-ratio
(eval-after-load 'golden-ratio
'(setq golden-ratio-extra-commands
(append golden-ratio-extra-commands
'(ace-window
ace-delete-window
ace-select-window
ace-swap-window
ace-maximize-window)))))))
......@@ -11,6 +11,7 @@
- [Features](#features)
- [Company Auctex](#company-auctex)
- [Tags navigation](#tags-navigation)
- [Previewing](#previewing)
- [Keybindings](#keybindings)
- [Maintainer](#maintainer)
......@@ -32,12 +33,24 @@ To use this contribution add it to your `~/.spacemacs`
### Company Auctex
Along with other things this layer includes company-auctex, it's only enabled if you also enable my other contrib layer `company-mode`.
Along with other things this layer includes company-auctex, it's only enabled
if you also enable my other contrib layer `company-mode`.
### Tags navigation
Tags navigation can be performed with key `%` thanks to [evil-matchit][].
### Previewing
To perform full-document previews (that is, aside from the inline previewing
under `SPC m p`), add the following to your `.spacemacs`
under `dotspacemacs/config`. Then when you open up a compiled PDF, the preview
will update automatically when you recompile.
```elisp
(add-hook 'doc-view-mode-hook 'auto-revert-mode)
```
## Keybindings
Key Binding | Description
......@@ -60,7 +73,8 @@ Key Binding | Description
## Maintainer
This layer was created by and is maintained by @trishume, ping me in the Gitter chat if you have questions. Feel free to submit
PRs for this layer though if you have improvements.
This layer was created by and is maintained by @trishume, ping me in the Gitter
chat if you have questions. Feel free to submit PRs for this layer though if
you have improvements.
[evil-matchit]: https://github.com/redguardtoo/evil-matchit
......@@ -10,10 +10,6 @@
;;
;;; License: GPLv3
;; ---------------------------------------------------------------------------
;; Prefixes
;; ---------------------------------------------------------------------------
;; Variables
(defvar colors-enable-rainbow-identifiers nil
......
......@@ -61,11 +61,12 @@ refer to the `geeknote.el` [documentation][geeknote.el].
Key Binding | Description
----------------------|------------------------------------------------
<kbd>SPC a g c</kbd> | create a new note
<kbd>SPC a g e</kbd> | edit an existing note
<kbd>SPC a g f</kbd> | find a note using a keyword
<kbd>SPC a g s</kbd> | show an existing note
<kbd>SPC a g r</kbd> | remove an existing note
<kbd>SPC a e c</kbd> | create a new note
<kbd>SPC a e e</kbd> | edit an existing note
<kbd>SPC a e f</kbd> | find a note using a keyword
<kbd>SPC a e s</kbd> | show an existing note
<kbd>SPC a e r</kbd> | remove an existing note
<kbd>SPC a e m</kbd> | move a note to a different notebook
[Evernote]: https://evernote.com/
[geeknote]: http://www.geeknote.me
......
......@@ -27,6 +27,7 @@ which require an initialization must be listed explicitly in the list.")
geeknote-find
geeknote-show
geeknote-remove
geeknote-move
)
:init
(progn
......@@ -35,4 +36,5 @@ which require an initialization must be listed explicitly in the list.")
"aee" 'geeknote-edit
"aef" 'geeknote-find
"aes" 'geeknote-show
"aer" 'geeknote-remove))))
"aer" 'geeknote-remove
"aem" 'geeknote-move))))
# evil-snipe contribution layer for Spacemacs
![logo](img/Cat_With_Rifle.jpg)
<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc/generate-toc again -->
**Table of Contents**
- [evil-snipe contribution layer for Spacemacs](#evil-snipe-contribution-layer-for-spacemacs)
- [Description](#description)
- [Improved f and t searches](#improved-f-and-t-searches)
- [Improved precision search](#improved-precision-search)
- [Install](#install)
- [Key bindings](#key-bindings)
<!-- markdown-toc end -->
## Description
The package [evil-snipe](https://github.com/hlissner/evil-snipe)
- enables more efficient searches with `f/F/t/T`.
- adds a new, more precise search with `s/S`
`evil-snipe` changes `s/S` behavior in order to search forward/backwards in the
buffer with two chars.
## Install
### Layer
To use this contribution add it to your `~/.spacemacs`
```elisp
(setq-default dotspacemacs-configuration-layers '(evil-snipe))
```
### Alternate behavior for `f/F` and `t/T`
This alternate behavior is disabled by default, to enable it set the
layer variable `evil-snipe-enable-alternate-f-and-t-behaviors` to `t`:
```elisp
(setq-default dotspacemacs-configuration-layers
'(evil-snipe :variables evil-snipe-enable-alternate-f-and-t-behaviors t ))
```
Instead of repeating searches with `,/;` you can just press `f/t` again to
continue the search (`F/T` to go the opposite direction).
Evil-snipe also adds several scope options for searches (set
`evil-snipe-scope` and `evil-snipe-repeat-scope` to one of these, the default
value is `buffer`):
Value | Description
-----------------|------------------------------------------------------------
buffer | search in the rest of the buffer after the cursor (`vim-sneak` behavior)
line | search in the current line after the cursor (`vim-seek` behavior)
visible | search in the rest of the visible buffer only
whole-line | same as `line`, but highlight matches on either side of cursor
whole-buffer | same as `buffer`, but highlight *all* matches in buffer
whole-visible | same as 'visible, but highlight *all* visible matches in buffer
If you do not want to replace the regular `f/F/t/T` behavior, just
remove this line from `evil-snipe/packages.el`:
`(evil-snipe-replace-evil)`
## Key bindings
TODO
;;; config.el --- evil-snipe Layer configuration File for Spacemacs
;;
;; Copyright (c) 2012-2014 Sylvain Benner
;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
;;
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
;; URL: https://github.com/syl20bnr/spacemacs
;;
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
;; Variables
(defvar evil-snipe-enable-alternate-f-and-t-behaviors nil
"if non nil f/F/t/T behaviors are replaced by evil-snipe behavior.")
contrib/evil-snipe/img/Cat_With_Rifle.jpg

23.5 KB

(defvar evil-snipe-packages '(evil-snipe)
"List of all packages to install and/or initialize. Built-in packages
which require an initialization must be listed explicitly in the list.")
(defvar evil-snipe-excluded-packages '()
"List of packages to exclude.")
(defun evil-snipe/init-evil-snipe ()
(require 'evil-snipe)
(global-evil-snipe-mode t)
(setq evil-snipe-scope 'whole-buffer
evil-snipe-enable-highlight t
evil-snipe-enable-incremental-highlight t
evil-snipe-enable-half-cursor nil
evil-snipe-show-prompt nil
evil-snipe-smart-case t)
(when evil-snipe-enable-alternate-f-and-t-behaviors
(evil-snipe-replace-evil)
(setq evil-snipe-repeat-scope 'whole-buffer)))
......@@ -43,6 +43,8 @@ This layer also provides support for Github with:
- [magit-gh-pulls][]: handy `magit` add-on to manage Github pull requests.
- [gist.el][]: full-featured mode to browse and post Githug gists.
New to Magit? Checkout the [official intro][].
## Install
### Layer
......@@ -79,12 +81,15 @@ To display the `magit status` buffer in fullscreen set the variable
Magit auto-complete feature is enabled. For this feature to work best you
have to setup your Git repository directory in your `dotspacemacs/config`
function (the path should end up with a `/` to respect Emacs conventions):
function, this is the folder where you keep all your git-controlled projects
(the path should end up with a `/` to respect Emacs conventions):
```elisp
(setq magit-repo-dirs '("~/git/"))
(setq magit-repo-dirs '("~/repos/"))
```
For more information, see [Magit-User-Manual#Status][]
### Magit SVN plugin
For convenience the magit SVN plugin can be activated directly in the Git
......@@ -310,6 +315,8 @@ In the gist list buffer:
[download page]: http://git-scm.com/downloads
[git-gutter]: https://github.com/syohex/emacs-git-gutter-fringe
[magit]: http://magit.github.io/
[official intro]: https://magit.github.io/master/magit.html#Introduction
[Magit-User-Manual#Status]: https://magit.github.io/master/magit.html#Status
[git-flow]: https://github.com/jtatarik/magit-gitflow
[smeargle]: https://github.com/syohex/emacs-smeargle
[git-timemachine]: https://github.com/pidu/git-timemachine
......
......@@ -160,7 +160,7 @@ which require an initialization must be listed explicitly in the list.")
(when golden-ratio (golden-ratio-mode))))
(spacemacs|define-micro-state time-machine
:doc "[p] [N] previous [n] next [c] current [q] quit"
:doc "[p] [N] previous [n] next [c] current [y] copy hash [q] quit"
:on-enter (spacemacs//time-machine-ms-on-enter)
:on-exit (git-timemachine-quit)
:persistent t
......@@ -169,6 +169,7 @@ which require an initialization must be listed explicitly in the list.")
("p" git-timemachine-show-previous-revision)
("n" git-timemachine-show-next-revision)
("N" git-timemachine-show-previous-revision)
("y" git-timemachine-kill-revision)
("q" nil :exit t)))))
;; this mode is not up to date
......
......@@ -15,6 +15,7 @@
cc-mode
cmake-mode
flycheck
srefactor
)
"List of all packages to install and/or initialize. Built-in packages
which require an initialization must be listed explicitly in the list.")
......@@ -24,17 +25,32 @@ which require an initialization must be listed explicitly in the list.")
:defer t
:config
(progn
(add-hook 'c-mode-hook '(lambda () (c-toggle-auto-state t)))
(add-hook 'c++-mode-hook '(lambda () (c-toggle-auto-state t))))))
(require 'compile)
(mapc (lambda (m)
(add-to-list 'semantic-default-submodes 'global-semantic-stickyfunc-mode)
(add-to-list 'semantic-default-submodes 'global-semantic-idle-summary-mode)
(semantic-mode 1)
(c-toggle-auto-newline 1))
'(c-mode c++-mode)))))
(defun c-c++/init-srefactor ()
(use-package srefactor
:if (not (version< emacs-version "24.4"))
:init
(progn
(evil-leader/set-key-for-mode 'c-mode
"mr" 'srefactor-refactor-at-point)
(evil-leader/set-key-for-mode 'c++-mode
"mr" 'srefactor-refactor-at-point))))
(defun c-c++/init-cmake-mode ()
(use-package cmake-mode
:defer t
:init
(setq auto-mode-alist
(append '(("CMakeLists\\.txt\\'" . cmake-mode)
("\\.cmake\\'" . cmake-mode))
auto-mode-alist))))
(use-package cmake-mode
:defer t
:init
(setq auto-mode-alist
(append '(("CMakeLists\\.txt\\'" . cmake-mode)
("\\.cmake\\'" . cmake-mode))
auto-mode-alist))))
(defun c-c++/init-flycheck ()
(add-hook 'c-mode-hook 'flycheck-mode)
......
......@@ -19,13 +19,11 @@
(defvar clojure-enable-fancify-symbols nil
"If non nil the `fancify-symbols' function is enabled.")
(setq clojure/key-binding-prefixes '(("md" . "documentation")
("me" . "evaluation")
("mg" . "goto")
("mr" . "refactor")
("mt" . "test")))
(mapc (lambda (x) (spacemacs/declare-prefix (car x) (cdr x)))
clojure/key-binding-prefixes)
;; not supported for now
;; (setq clojure/key-binding-prefixes '(("md" . "documentation")
;; ("me" . "evaluation")
;; ("mg" . "goto")
;; ("mr" . "refactor")
;; ("mt" . "test")))
;; (mapc (lambda (x) (spacemacs/declare-prefix (car x) (cdr x)))
;; clojure/key-binding-prefixes)
......@@ -47,7 +47,8 @@ which require an initialization must be listed explicitly in the list.")
:config
(progn
;; add support for golden-ratio
(push 'cider-popup-buffer-quit-function golden-ratio-extra-commands)
(eval-after-load 'golden-ratio
'(push 'cider-popup-buffer-quit-function golden-ratio-extra-commands))
;; add support for evil
(push 'cider-stacktrace-mode evil-motion-state-modes)
(push 'cider-popup-buffer-mode evil-motion-state-modes)
......@@ -75,19 +76,19 @@ the focus."
(cider-insert-last-sexp-in-repl t)
(evil-insert-state))
(defun spacemacs/send-region-to-repl ()
(defun spacemacs/send-region-to-repl (start end)
"Send region to REPL and evaluate it without changing
the focus."
(interactive)
(interactive "r")
(spacemacs//cider-eval-in-repl-no-focus
(buffer-substring-no-properties (region-beginning) (region-end))))
(buffer-substring-no-properties start end)))
(defun spacemacs/send-region-to-repl-focus ()
(defun spacemacs/send-region-to-repl-focus (start end)
"Send region to REPL and evaluate it and switch to the REPL in
`insert state'."
(interactive)
(interactive "r")
(cider-insert-in-repl
(buffer-substring-no-properties (region-beginning) (region-end)) t)
(buffer-substring-no-properties start end) t)
(evil-insert-state))
(defun spacemacs/send-function-to-repl ()
......
......@@ -10,6 +10,7 @@
- [Key Bindings](#key-bindings)
- [Inferior REPL process](#inferior-repl-process)
- [Helpers](#helpers)
- [Options](#options)
<!-- markdown-toc end -->
......@@ -62,3 +63,12 @@ Send code to inferior process commands:
<kbd>SPC m h d</kbd> | view data under point using [ess-R-data-view][ess-R-data-view]
<kbd>SPC m h i</kbd> | object introspection popup [ess-R-object-popup][ess-R-object-popup]
<kbd>SPC m h t</kbd> | view table using [ess-R-data-view][ess-R-data-view]
## Options
`ess-smart-equals` is enabled by default. In order to disable it, set in your `~/.spacemacs`
```elisp
(setq-default dotspacemacs-configuration-layers '((ess :variables
ess-enable-smart-equals nil)))
```
;;; config.el --- ESS Layer configuration File for Spacemacs
;;
;; Copyright (c) 2012-2014 Sylvain Benner
;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
;;
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
;; URL: https://github.com/syl20bnr/spacemacs
;;
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
;; Variables
(defvar ess-enable-smart-equals t
"If non-nil smart-equal support is enabled")
......@@ -36,7 +36,6 @@ which require an initialization must be listed explicitly in the list.")
(interactive)
(-all? '---truthy? (list
(use-package ess-site)
(use-package ess-smart-underscore)
(use-package ess-R-object-popup)
(use-package ess-R-data-view))))
......@@ -134,8 +133,13 @@ not play nicely with autoloads"
(add-hook 'ess-mode-hook #'rainbow-delimiters-mode))
(defun ess/init-ess-smart-equals ()
(add-hook 'ess-mode-hook 'ess-smart-equals-mode)
(add-hook 'inferior-ess-mode-hook 'ess-smart-equals-mode))
(use-package ess-smart-equals
:defer t
:if ess-enable-smart-equals
:init
(progn
(add-hook 'ess-mode-hook 'ess-smart-equals-mode)
(add-hook 'inferior-ess-mode-hook 'ess-smart-equals-mode))))
(defun ess/init-company-ess ()
(use-package company-ess
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment