Merge branch 'develop' (additional fixes before 0.64.0 release)

contrib/smex/packages.el

@@ -45,7 +45,11 @@ which require an initialization must be listed explicitly in the list.")
         ;;                   (cdr (assoc 'ido-mode evil-leader--mode-maps)))
         )
 
-      (evil-leader/set-key dotspacemacs-command-key 'spacemacs/smex)
+      ;; define the key binding at the very end in order to allow the user
+      ;; to overwrite any key binding
+      (add-hook 'after-init-hook
+                (lambda () (evil-leader/set-key dotspacemacs-command-key
+                             'spacemacs/smex)))
       (evil-leader/set-key "m:" 'spacemacs/smex-major-mode-commands)
       (global-set-key (kbd "M-x") 'smex)
       (global-set-key (kbd "M-X") 'smex)

spacemacs/config.el

@@ -220,10 +220,6 @@ Can be installed with `brew install trash'."
 ;; Tramp history
 (setq tramp-persistency-file-name (concat spacemacs-cache-directory "tramp"))
 
-;; keep buffers opened when leaving an emacs client
-(setq server-kill-new-buffers nil)
-;; Kill magit temp buffers when done with them
-(setq server-temp-file-regexp "^/tmp/Re\\|/draft\\|COMMIT_EDITMSG$")
 ;; increase memory threshold for GC
 (setq gc-cons-threshold 20000000)
 

spacemacs/packages.el

@@ -606,6 +606,8 @@ which require an initialization must be listed explicitly in the list.")
     :config
     (progn
       ;; evil ex-command key
+      (define-key evil-normal-state-map (kbd dotspacemacs-command-key) 'evil-ex)
+      (define-key evil-visual-state-map (kbd dotspacemacs-command-key) 'evil-ex)
       (define-key evil-motion-state-map (kbd dotspacemacs-command-key) 'evil-ex)
       ;; Make evil-mode up/down operate in screen lines instead of logical lines
       (define-key evil-normal-state-map "j" 'evil-next-visual-line)
@@ -1222,7 +1224,6 @@ which require an initialization must be listed explicitly in the list.")
             helm-buffers-fuzzy-matching t
             helm-always-two-windows     t)
       (evil-leader/set-key
-        dotspacemacs-command-key 'helm-M-x
         "bs"  'helm-mini
         "sl"  'helm-semantic-or-imenu
         "hb"  'helm-bookmarks
@@ -1234,6 +1235,12 @@ which require an initialization must be listed explicitly in the list.")
         "fr"  'helm-recentf
         "<f1>" 'helm-apropos)
 
+      ;; define the key binding at the very end in order to allow the user
+      ;; to overwrite any key binding
+      (add-hook 'after-init-hook
+                (lambda ()
+                  (evil-leader/set-key dotspacemacs-command-key 'helm-M-x)))
+
       (defun spacemacs//helm-before-initialize ()
         "Stuff to do before helm initializes."
         ;; be sure that any previous micro-state face override are