Merge branch 'develop' (v0.3.3)

README.md

@@ -35,7 +35,7 @@ for contribution guidelines_
         - [Extensions and Packages declaration and initialization](#extensions-and-packages-declaration-and-initialization)
         - [Packages synchronization (Vundle like feature)](#packages-synchronization-vundle-like-feature)
     - [Contribution layers](#contribution-layers)
-        - [-](#-)
+        - [Adding a contribution layer](#adding-a-contribution-layer)
         - [Submitting a contribution layer upstream](#submitting-a-contribution-layer-upstream)
         - [Themes Megapack example](#themes-megapack-example)
     - [Pull Request Guidelines](#pull-request-guidelines)
@@ -376,7 +376,7 @@ It effectively makes `Spacemacs` to behave like [Vundle][vundle].
 you to share your own layer with other `Spacemacs` users. This kind of layer is
 called `contribution layer`.
 
-#### Adding a contribution layer
+### Adding a contribution layer
 
 Just create a configuration layer in `~/.emacs.d/contrib` or in a path that is
 registered in `dotspacemacs-configuration-layer-path` variable of your
@@ -388,7 +388,7 @@ For instance if you just want to add packages then only the `packages.el` file
 is necessary (as it is the case for the [Themes Megapack][themes-megapack]
 layer).
 
-#### Submitting a contribution layer upstream
+### Submitting a contribution layer upstream
 
 It is recommended to join a `README.md` file with your layer, ideally this file
 should document the packages of your layer as well as the key bindings
@@ -399,7 +399,7 @@ for pull requests.
 
 _Note: by submitting a configuration layer you become the maintainer of it._
 
-#### Themes Megapack example
+### Themes Megapack example
 
 This is a simple contribution layer listing a bunch of themes, you can find it
 [here][themes-megapack].
@@ -415,18 +415,16 @@ branch.
 
 _Guidelines:_
 - always create a branch for your pull request.
-- always branch from the `master` branch (this way `develop` remains in a
-read-only state from a contributor point of view, it allows the maintainers
-to freely perform altering tasks such as rewriting the history).
+- branch from develop for new features or fixes.
+- branch from `master` for hot fixes.
+- if you don't know if you must branch from `master` or `develop` then branch
+from `develop`.
 - commit often in your pull request branch with a concise and clear commit
 message. The first line of a commit message should be short, you can explain
 in details what you did in a paragraph by skipping a line after the first line.
 `often` is subtle, see `Notes` below.
-- if your pull request branch forked an old commit (i.e. not the current last
-commit in upstream master) then fetch upstream master and rebase your pull
-request branch on top of it and resolve any conflict locally in your pull
-request branch.
-- you are ready to open a pull request.
+- it is recommended to rebase your pull request branch on top of `master` or
+`develop` (depending on your base branch) before submitting.
 
 If you have any question on this process, join the [gitter chatroom][gitter]
 and ask your questions there. Do not hesitate to ask your questions even the

contrib/trishume/packages.el

@@ -9,6 +9,7 @@
     julia-mode
     helm-ag
     lua-mode
+    ag
     ))
 
 (defun trishume/init-auctex ()
@@ -80,7 +81,7 @@
         (interactive)
         (helm-ag (projectile-project-root)))
       (evil-leader/set-key
-        "pa" 'trishume-helm-ag))))
+        "oa" 'trishume-helm-ag))))
 
 (defun trishume/init-lua-mode ()
   (use-package lua-mode

spacemacs/packages.el

@@ -1322,6 +1322,8 @@ DELETE-FUNC when calling CALLBACK.
   (use-package helm
     :defer t
     :init
+    (setq helm-split-window-in-side-p nil
+          helm-always-two-windows     t)
     (evil-leader/set-key
         ":"   'helm-M-x
         "bs"  'helm-mini
@@ -1539,21 +1541,24 @@ DELETE-FUNC when calling CALLBACK.
       (setq neo-create-file-auto-open t
             neo-dont-be-alone t
             neo-banner-message "File Tree browser"
-            neo-smart-open t)
+            neo-smart-open t
+            neo-persist-show nil)
       (evil-leader/set-key "ft" 'neotree-toggle))
     :config
     (add-hook 'neotree-mode-hook
               (lambda ()
-                (define-key evil-normal-state-local-map (kbd "TAB") 'neotree-enter)
-                (define-key evil-normal-state-local-map (kbd "RET") 'neotree-enter)
-                (define-key evil-normal-state-local-map (kbd "D") 'neotree-delete-node)
-                (define-key evil-normal-state-local-map (kbd "H") 'neotree-hidden-file-toggle)
-                (define-key evil-normal-state-local-map (kbd "a") 'neotree-stretch-toggle)
-                (define-key evil-normal-state-local-map (kbd "A") 'neotree-stretch-toggle)
-                (define-key evil-normal-state-local-map (kbd "g") 'neotree-refresh)
-                (define-key evil-normal-state-local-map (kbd "q") 'neotree-hide)
-                (define-key evil-normal-state-local-map (kbd "?") 'evil-search-backward)
-                (define-key evil-normal-state-local-map (kbd "Q") 'kill-this-buffer)))
+                (define-key evil-motion-state-local-map (kbd "TAB") 'neotree-enter)
+                (define-key evil-motion-state-local-map (kbd "RET") 'neotree-enter)
+                (define-key evil-motion-state-local-map (kbd "D") 'neotree-delete-node)
+                (define-key evil-motion-state-local-map (kbd "H") 'neotree-hidden-file-toggle)
+                (define-key evil-motion-state-local-map (kbd "a") 'neotree-stretch-toggle)
+                (define-key evil-motion-state-local-map (kbd "A") 'neotree-stretch-toggle)
+                (define-key evil-motion-state-local-map (kbd "R") 'neotree-rename-node)
+                (define-key evil-motion-state-local-map (kbd "C") 'neotree-create-node)
+                (define-key evil-motion-state-local-map (kbd "g") 'neotree-refresh)
+                (define-key evil-motion-state-local-map (kbd "q") 'neotree-hide)
+                (define-key evil-motion-state-local-map (kbd "?") 'evil-search-backward)
+                (define-key evil-motion-state-local-map (kbd "Q") 'kill-this-buffer)))
     ))
 
 (defun spacemacs/init-org ()
@@ -1617,7 +1622,6 @@ DELETE-FUNC when calling CALLBACK.
       (push '("*nosetests*"                :dedicated t :position bottom :stick t :noselect t) popwin:special-display-config)
       (push '("^\*Flycheck.+\*$" :regexp t :dedicated t :position bottom :stick t :noselect t) popwin:special-display-config)
       (push '("^\*WoMan.+\*$"    :regexp t              :position bottom                     ) popwin:special-display-config)
-      (push '("^\*helm.*\*$"     :regexp t              :position bottom                     ) popwin:special-display-config)
       (defun spacemacs/remove-popwin-display-config (str)
         "Removes the popwin display configurations that matches the passed STR"
         (setq popwin:special-display-config