Merge branch 'develop' (v0.8.0)

CONTRIBUTE.md

@@ -29,14 +29,15 @@ _PR = pull request_
   - if you still have several commits, squash them into only one commit
 - rebase your PR branch on top of upstream `develop` before submitting the PR
 
-Those PRs are fast-forwarded whenever it's possible.
+Those PRs are _fast-forwarded_ whenever it's possible and _cherry-picked_
+otherwise.
 
 2) For complex pull requests:
 
 - squash only the commits with uninteresting changes like typos, syntax fixes,
 etc... and keep the important steps in different commits.
 
-Those PRs are merged.
+Those PRs are _merged_.
 
 **Getting Help:**
 If you have any question on this process, join the [gitter chatroom][gitter]

README.md

@@ -114,9 +114,6 @@ for contribution guidelines_
                 - [Testing in Python](#testing-in-python)
                 - [Other Python commands](#other-python-commands)
             - [JavaScript](#javascript)
-            - [R (ESS)](#r-ess)
-                - [Inferior REPL process](#inferior-repl-process)
-                - [Other R commands](#other-r-commands)
             - [rcirc](#rcirc)
     - [Tips](#tips)
         - [Tips for Emacs users](#tips-for-emacs-users)
@@ -1618,43 +1615,6 @@ Tern includes the following key bindings:
 `C-c C-c`         | find the type of the thing under the cursor.
 `C-c C-d`         | find docs of the thing under the cursor. Press again to open the associated URL (if any).
 
-#### R (ESS)
-
-**Important**:
-In order to speed up the boot time of `Spacemacs`, `ESS` must be loaded
-manually via the key binding:
-
-    <SPC> e s s
-
-##### Inferior REPL process
-
-Start an `R` inferior REPL process with `<SPC> m i`.
-
-Send code to inferior process commands:
-
-    Key Binding   |                 Description
-------------------|------------------------------------------------------------
-`<SPC> m b`       | send buffer and keep code buffer focused
-`<SPC> m B`       | send buffer and switch to REPL in insert mode
-`<SPC> m f`       | send function and keep code buffer focused
-`<SPC> m F`       | send function and switch to REPL in insert mode
-`<SPC> m l`       | send line and keep code buffer focused
-`<SPC> m L`       | send line and switch to REPL in insert mode
-`<SPC> m r`       | send region and keep code buffer focused
-`<SPC> m R`       | send region and switch to REPL in insert mode
-`<SPC> m s`       | send region or line and step (debug)
-`<SPC> m S`       | send function or paragraph and step (debug)
-`CTRL+j`          | next item in REPL history
-`CTRL+k`          | previous item in REPL history
-
-##### Other R commands
-
-    Key Binding   |                 Description
-------------------|------------------------------------------------------------
-`<SPC> m p`       | object introspection popup [ess-R-object-popup][ess-R-object-popup]
-`<SPC> m v p`     | view data under point using [ess-R-data-view][ess-R-data-view] 
-`<SPC> m v t`     | view table using [ess-R-data-view][ess-R-data-view] 
-
 #### rcirc
 
     Key Binding   |                 Description

contrib/lang/ess/README.md

@@ -0,0 +1,48 @@
+# R (ESS) contribution layer for Spacemacs
+
+## Install
+
+To use this contribution add it to your `~/.spacemacs`
+
+```elisp
+(defvar dotspacemacs-configuration-layers '(ess)
+  "List of contribution to load."
+)
+```
+
+## Key Bindings
+
+**Important**:
+In order to speed up the boot time of `Spacemacs`, `ESS` must be loaded
+manually via the key binding:
+
+    <SPC> e s s
+
+### Inferior REPL process
+
+Start an `R` inferior REPL process with `<SPC> m i`.
+
+Send code to inferior process commands:
+
+    Key Binding   |                 Description
+------------------|------------------------------------------------------------
+`<SPC> m b`       | send buffer and keep code buffer focused
+`<SPC> m B`       | send buffer and switch to REPL in insert mode
+`<SPC> m f`       | send function and keep code buffer focused
+`<SPC> m F`       | send function and switch to REPL in insert mode
+`<SPC> m l`       | send line and keep code buffer focused
+`<SPC> m L`       | send line and switch to REPL in insert mode
+`<SPC> m r`       | send region and keep code buffer focused
+`<SPC> m R`       | send region and switch to REPL in insert mode
+`<SPC> m s`       | send region or line and step (debug)
+`<SPC> m S`       | send function or paragraph and step (debug)
+`CTRL+j`          | next item in REPL history
+`CTRL+k`          | previous item in REPL history
+
+### Other R commands
+
+    Key Binding   |                 Description
+------------------|------------------------------------------------------------
+`<SPC> m p`       | object introspection popup [ess-R-object-popup][ess-R-object-popup]
+`<SPC> m v p`     | view data under point using [ess-R-data-view][ess-R-data-view] 
+`<SPC> m v t`     | view table using [ess-R-data-view][ess-R-data-view] 

contrib/lang/ess/packages.el

@@ -0,0 +1,47 @@
+(defvar ess-packages
+  '(
+    ess
+    ess-R-data-view
+    ess-R-object-popup
+    ess-smart-underscore
+    )
+  "List of all packages to install and/or initialize. Built-in packages
+which require an initialization must be listed explicitly in the list.")
+
+(defvar ess-excluded-packages '()
+  "List of packages to exclude.")
+
+(defun ess/init-ess ()
+  ;; ESS is not quick to load so we just load it when
+  ;; we need it (see my-keybindings.el for the associated
+  ;; keybinding)
+  (defun load-ess-on-demand ()
+    (interactive)
+    (use-package ess-site)
+    (use-package ess-smart-underscore)
+    (use-package ess-R-object-popup)
+    (use-package ess-R-data-view)
+    )
+  (evil-leader/set-key "ess" 'load-ess-on-demand)
+
+  ;; R --------------------------------------------------------------------------
+  (eval-after-load "ess-site"
+    '(progn
+       (evil-leader/set-key-for-mode 'ess-mode
+         "mB" 'ess-eval-buffer-and-go
+         "mb" 'ess-eval-buffer
+         "mF" 'ess-eval-function-and-go
+         "mf" 'ess-eval-function
+         "mi" 'R
+         "mL" 'ess-eval-line-and-go
+         "ml" 'ess-eval-line
+         "mp" 'ess-R-object-popup
+         "mR" 'ess-eval-region-and-go
+         "mr" 'ess-eval-region
+         "mS" 'ess-eval-function-or-paragraph-and-step
+         "ms" 'ess-eval-region-or-line-and-step
+         "mvp" 'ess-R-dv-pprint
+         "mvt" 'ess-R-dv-ctable
+         )
+       (define-key inferior-ess-mode-map (kbd "C-j") 'comint-next-input)
+       (define-key inferior-ess-mode-map (kbd "C-k") 'comint-previous-input))))

contrib/syl20bnr/packages.el

@@ -5,6 +5,9 @@
   "List of all packages to install and/or initialize. Built-in packages
 which require an initialization must be listed explicitly in the list.")
 
+(defvar syl20bnr-excluded-packages '()
+  "List of packages to exclude.")
+
 (defun syl20bnr/init-rainbow-identifiers ()
   (use-package rainbow-identifiers
     :commands rainbow-identifiers-mode

contrib/themes-megapack/packages.el

@@ -89,3 +89,6 @@
   "List of all packages to install and/or initialize. Built-in packages
 which require an initialization must be listed explicitly in the list.")
 
+(defvar themes-megapack-excluded-packages '()
+  "List of packages to exclude.")
+