Merge branch 'develop' (v0.35.0)

.gitmodules

@@ -10,9 +10,6 @@
 [submodule "spacemacs/extensions/evil-plugins"]
 	path = spacemacs/extensions/evil-plugins
 	url = http://github.com/tarao/evil-plugins
-[submodule "spacemacs/extensions/use-package"]
-	path = spacemacs/extensions/use-package
-	url = http://github.com/jwiegley/use-package
 [submodule "spacemacs/extensions/emoji-cheat-sheet"]
 	path = spacemacs/extensions/emoji-cheat-sheet
 	url = http://github.com/ShingoFukuyama/emacs-emoji-cheat-sheet

contrib/colors/README.md

@@ -0,0 +1,67 @@
+# Colors contribution layer for Spacemacs
+
+![logo](rainbow_dash.png)
+
+<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc/generate-toc again -->
+**Table of Contents**
+
+- [Colors contribution layer for Spacemacs](#colors-contribution-layer-for-spacemacs)
+    - [Description](#description)
+    - [Install](#install)
+    - [Key bindings](#key-bindings)
+        - [Rainbow Identifiers](#rainbow-identifiers)
+    - [Screenshots](#screenshots)
+        - [Python](#python)
+
+<!-- markdown-toc end -->
+
+## Description
+
+This layer colors your life with:
+- [rainbow identifiers][]
+
+[rainbow identifiers][] mode will colorize each variables and functions with an
+almost unique color. The keywords and the declaration of function colors are
+disabled in order to make the colorized variables and functions stand out.
+
+## Install
+
+To use this contribution add it to your `~/.spacemacs`
+
+```elisp
+(setq-default dotspacemacs-configuration-layers '(colors)
+  "List of contribution to load."
+)
+```
+
+## Key bindings
+
+The prefix associated with colors is <kbd>C</kbd>.
+
+### Rainbow Identifiers
+
+`rainbow-identifiers` mode can be toggled on and off with:
+
+    <SPC> t C i
+
+Note that the toggle is local to the current buffer.
+
+The `saturation` and `lightness` of identifier colors can be adjusted live
+with the micro-state:
+
+Key Binding   | Description
+--------------|------------------------------------------------------------
+`<SPC> C i s` | initiate change `saturation` mini-mode
+`<SPC> C i l` | initiate change `lightness` mini-mode
+`+`           | increase the `saturation` or `lightness`
+`-`           | decrease the `saturation` or `lightness`
+`=`           | reset the `saturation` or `lightness`
+Any other key | leave the change mini-mode
+
+## Screenshots
+
+### Python
+
+![theme_tweaks_python](img/theme-tweaks-python.png)
+
+[rainbow identifiers]: https://github.com/Fanael/rainbow-identifiers

contrib/colors/config.el

@@ -0,0 +1,9 @@
+;; ---------------------------------------------------------------------------
+;; Prefixes 
+;; ---------------------------------------------------------------------------
+
+(setq spacemacs/key-binding-prefixes '(("C" .  "colors")
+                                       ("Ci" . "colors-identifiers")
+                                       ("tC" . "toggles-colors")))
+(mapc (lambda (x) (spacemacs/declare-prefix (car x) (cdr x)))
+      spacemacs/key-binding-prefixes)

contrib/colors/packages.el

@@ -0,0 +1,162 @@
+(defvar colors-packages
+  '(
+    rainbow-identifiers
+    )
+  "List of all packages to install and/or initialize. Built-in packages
+which require an initialization must be listed explicitly in the list.")
+
+(defun colors/init-rainbow-identifiers ()
+  (use-package rainbow-identifiers
+    :commands rainbow-identifiers-mode
+    :init
+    (progn 
+      (setq rainbow-identifiers-choose-face-function 'rainbow-identifiers-cie-l*a*b*-choose-face
+            rainbow-identifiers-cie-l*a*b*-saturation 100
+            rainbow-identifiers-cie-l*a*b*-lightness 40
+            ;; override theme faces
+            rainbow-identifiers-faces-to-override '(highlight-quoted-symbol
+                                                    font-lock-variable-name-face))
+
+      (defun colors/toggle-rainbow-indentifiers ()
+        "Toggle rainbow identifiers."
+        (interactive)
+        (if (and (boundp 'rainbow-identifiers-mode)
+                 (symbol-value rainbow-identifiers-mode))
+            (progn
+              (colors//tweak-theme-colors-font-lock t)
+              (rainbow-identifiers-mode -1))
+          (colors//tweak-theme-colors-font-lock)
+          (rainbow-identifiers-mode)))
+      (evil-leader/set-key "tCi" 'colors/toggle-rainbow-indentifiers)
+
+      (add-to-hooks 'rainbow-identifiers-mode '(prog-mode-hook
+                                                erlang-mode-hook))
+
+      (defun colors//tweak-theme-colors-font-lock (&optional restore)
+        "Nilify some font locks. If RESTORE in non nil the font locks are
+ restored."
+        ;; To make the variables stand out, keyword coloring is disabled
+        (cond
+         (restore
+          (set-attributes-from-alist
+           'font-lock-function-name-face original-font-lock-function-name-face-attributes)
+          (set-attributes-from-alist
+           'font-lock-keyword-face original-font-lock-keyword-face-attributes))
+         (t
+          (set-face-attribute 'font-lock-function-name-face nil
+                              :foreground nil :slant 'normal :weight 'normal)
+          (set-face-attribute 'font-lock-keyword-face nil
+                              :foreground nil :slant 'normal :weight 'bold)))
+        (font-lock-fontify-buffer))
+
+      (defun colors//tweak-theme-colors (theme)
+        "Tweak color themes by adjusting rainbow-identifiers colors settings an by
+disabling some faces in order to make colored identifiers stand out."
+        (interactive)
+        ;; tweak the saturation and lightness of identifier colors
+        (pcase theme
+          (`leuven (setq rainbow-identifiers-cie-l*a*b*-saturation 100
+                                  rainbow-identifiers-cie-l*a*b*-lightness 40))
+          (`monokai (setq rainbow-identifiers-cie-l*a*b*-saturation 55
+                          rainbow-identifiers-cie-l*a*b*-lightness 60))
+          (`solarized-dark (setq rainbow-identifiers-cie-l*a*b*-saturation 85
+                                 rainbow-identifiers-cie-l*a*b*-lightness 65))
+          (`solarized-light (setq rainbow-identifiers-cie-l*a*b*-saturation 100
+                                  rainbow-identifiers-cie-l*a*b*-lightness 40))
+          (`zenburn (setq rainbow-identifiers-cie-l*a*b*-saturation 40
+                          rainbow-identifiers-cie-l*a*b*-lightness 65))
+          (_ (setq rainbow-identifiers-cie-l*a*b*-saturation 80
+                   rainbow-identifiers-cie-l*a*b*-lightness 45)))
+        ;; backup to original font locks
+        (let ((frame (selected-frame)))
+          (setq original-font-lock-function-name-face-attributes
+                (face-all-attributes font-lock-function-name-face frame))
+          (setq original-font-lock-keyword-face-attributes
+                (face-all-attributes font-lock-keyword-face frame)))
+        ;; tweak the font locks
+        (colors//tweak-theme-colors-font-lock)))
+    (colors//tweak-theme-colors spacemacs-cur-theme)
+
+    (defadvice spacemacs/post-theme-init (after colors/post-theme-init activate)
+      "Adjust lightness and brightness of rainbow-identifiers on post theme init."
+      (colors//tweak-theme-colors spacemacs-cur-theme))
+
+    :config
+    (progn
+      ;; functions to change saturation and lightness of colors
+      (defun colors//change-color-mini-mode-doc (component)
+        "Display a short documentation in the mini buffer."
+        (let ((var (intern (format
+                            "rainbow-identifiers-cie-l*a*b*-%s" component))))
+          (echo "Change color %s mini-mode (value: %s)
+  + to increase %s
+  - to decrease %s
+  = to reset
+Press any other key to exit." component (eval var) component component)))
+
+      (defun colors/change-color-component-overlay-map (component)
+        "Set a temporary overlay map to easily change a color COMPONENT from
+ rainbow-identifier mode. The color COMPONENT can be 'saturation' or
+ 'lightness'."
+        (set-temporary-overlay-map
+         (let ((map (make-sparse-keymap))
+               (up-func (intern (format "colors/change-color-%s-up" component)))
+               (down-func (intern (format "colors/change-color-%s-down" component)))
+               (reset-func (intern (format "colors/change-color-%s-reset" component))))
+           (define-key map (kbd "+") up-func)
+           (define-key map (kbd "-") down-func)
+           (define-key map (kbd "=") reset-func)
+           map) t)
+           (colors//change-color-mini-mode-doc component)) 
+
+      (defun colors/start-change-color-saturation ()
+        "Initiate the overlay map to change the saturation."
+        (interactive)
+        (colors/change-color-component-overlay-map "saturation"))
+      (defun colors/change-color-saturation-up ()
+        "Increase the saturation by 5 units."
+        (interactive)
+        (colors//change-color-component-func "saturation" 5))
+      (defun colors/change-color-saturation-down ()
+        "Decrease the saturation by 5 units."
+        (interactive)
+        (colors//change-color-component-func "saturation" -5))
+      (defun colors/change-color-saturation-reset ()
+        "Reset the saturation to 100."
+        (interactive)
+        (colors//change-color-component-func "saturation" 100 t))
+      (defun colors/start-change-color-lightness ()
+        "Initiate the overlay map to change the lightness."
+        (interactive)
+        (colors/change-color-component-overlay-map "lightness"))
+      (defun colors/change-color-lightness-up ()
+        "Increase the lightness by 5 units."
+        (interactive)
+        (colors//change-color-component-func "lightness" 5))
+      (defun colors/change-color-lightness-down ()
+        "Decrease the lightness by 5 units."
+        (interactive)
+        (colors//change-color-component-func "lightness" -5))
+      (defun colors/change-color-lightness-reset ()
+        "Reset the lightness to 40."
+        (interactive)
+        (colors//change-color-component-func "lightness" 40 t))
+
+      (defun colors//change-color-component-func
+        (component inc &optional reset)
+        "Change the color component by adding INC value to it. If RESET is not
+ nil the color component is set to INC."
+        (let* ((var (intern (format
+                             "rainbow-identifiers-cie-l*a*b*-%s" component)))
+               (new-value (+ (eval var) inc)))
+          (if reset
+              (set var inc)
+            (progn
+              (if (< new-value 0)
+                  (setq new-value 0))
+              (set var new-value)))
+          (font-lock-fontify-buffer)
+          (colors/change-color-component-overlay-map component)))
+      ;; key bindings
+      (evil-leader/set-key "Cis" 'colors/start-change-color-saturation)
+      (evil-leader/set-key "Cil" 'colors/start-change-color-lightness))))

contrib/git/packages.el

@@ -1,5 +1,6 @@
 (defvar git-packages
   '(
+    fringe-helper
     git-gutter-fringe
     git-messenger
     git-timemachine
@@ -42,15 +43,15 @@ which require an initialization must be listed explicitly in the list.")
     ))
 
 (defun git/init-git-gutter-fringe ()
-  (use-package git-gutter-fringe
-    :commands git-gutter-mode
+  (use-package git-gutter
+    :defer t
     :init
     (add-to-hooks 'git-gutter-mode '(markdown-mode-hook
                                      org-mode-hook
-                                     prog-mode-hook
-                                     ))
+                                     prog-mode-hook))
     :config
     (progn
+      (require 'git-gutter-fringe)
       (setq git-gutter:hide-gutter t)
       ;; Don't need log/message.
       (setq git-gutter:verbosity 0)