From 71f8919ebf96d94e7f570b21314e0b494c3fb359 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Wed, 25 Oct 2017 19:45:56 +0200
Subject: [PATCH] fix typo and use a layer variable for auto nameless-mode

---
 layers/+lang/emacs-lisp/README.org  | 10 ++++++----
 layers/+lang/emacs-lisp/config.el   |  3 +++
 layers/+lang/emacs-lisp/packages.el | 17 +++++++++--------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/layers/+lang/emacs-lisp/README.org b/layers/+lang/emacs-lisp/README.org
index 09b333cab..6c79b093a 100644
--- a/layers/+lang/emacs-lisp/README.org
+++ b/layers/+lang/emacs-lisp/README.org
@@ -98,11 +98,13 @@ function or press ~o~ to go out of it.
 7) Press ~a~ to stop debugging.
 
 * Nameless
-Nameless hides package namespaces in your emacs-lisp code, adn replace it by leading ~:~
-It can be toggled by ~SPC m~.
+Nameless hides package namespaces in your emacs-lisp code, and replaces it by leading ~:~
+It can be toggled by ~SPC m :~.
 
-To have it automatically on, you need to add ~(setq nameless-auto-mode t)~ in ~dotspacemacs/user-init~.
-Further configuration can be done with variable ~nameless-global-aliases~, cf [[https://github.com/Malabarba/Nameless#requiring-other-packages-as-aliases][original library documentation]]
+To have it automatically on, you need to define a layer variable:
+=(emacs-lisp :variables emacs-lisp-nameless-mode t)= in =.spacemacs= =dotspacemacs/layers=
+
+Further configuration can be done with the custom variable =nameless-global-aliases=, cf [[https://github.com/Malabarba/Nameless#requiring-other-packages-as-aliases][original library documentation]]
 
 * Key bindings
 
diff --git a/layers/+lang/emacs-lisp/config.el b/layers/+lang/emacs-lisp/config.el
index 9df71d824..facc5c7a8 100644
--- a/layers/+lang/emacs-lisp/config.el
+++ b/layers/+lang/emacs-lisp/config.el
@@ -13,3 +13,6 @@
 
 (spacemacs|define-jump-handlers emacs-lisp-mode)
 (spacemacs|define-jump-handlers lisp-interaction-mode)
+
+(defvar emacs-lisp-nameless-mode nil
+  "If non-nil, nameless-mode is automatically turn on for emacs-lisp buffers.")
diff --git a/layers/+lang/emacs-lisp/packages.el b/layers/+lang/emacs-lisp/packages.el
index efb3cf0c2..e6c5e3cb8 100644
--- a/layers/+lang/emacs-lisp/packages.el
+++ b/layers/+lang/emacs-lisp/packages.el
@@ -182,14 +182,15 @@
 (defun emacs-lisp/init-nameless ()
   (use-package nameless
     :defer t
-    :init (progn
-            (when (bound-and-true-p nameless-auto-mode)
-             (add-hook 'emacs-lisp-mode-hook 'nameless-mode-from-hook))
-            (spacemacs|add-toggle nameless
-              :status nameless-mode
-              :on (nameless-mode)
-              :off (nameless-mode -1)
-              :evil-leader-for-mode (emacs-lisp-mode . ":")))))
+    :init
+    (progn
+      (when emacs-lisp-nameless-mode
+        (add-hook 'emacs-lisp-mode-hook 'nameless-mode-from-hook))
+      (spacemacs|add-toggle nameless
+        :status nameless-mode
+        :on (nameless-mode)
+        :off (nameless-mode -1)
+        :evil-leader-for-mode (emacs-lisp-mode . ":")))))
 
 (defun emacs-lisp/init-overseer ()
   (use-package overseer