From 5617df57323d42d94bc4e32cbbb636c9ef0e8de9 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Tue, 20 Jan 2015 21:16:33 -0500 Subject: [PATCH 1/4] Set window-numbering-auto-assign-0-to-minibuffer to nil Resolves #459 --- spacemacs/packages.el | 1 + 1 file changed, 1 insertion(+) diff --git a/spacemacs/packages.el b/spacemacs/packages.el index 23dcae66707a..15b510b5b668 100644 --- a/spacemacs/packages.el +++ b/spacemacs/packages.el @@ -2078,6 +2078,7 @@ which require an initialization must be listed explicitly in the list.") (when (configuration-layer/package-declaredp 'powerline) (defun window-numbering-install-mode-line (&optional position) "Do nothing, the display is handled by the powerline.")) + (setq window-numbering-auto-assign-0-to-minibuffer nil) (evil-leader/set-key "0" 'select-window-0 "1" 'select-window-1 From 1a02989414599541ec1f45320a8d9053f3d37411 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Tue, 20 Jan 2015 21:25:21 -0500 Subject: [PATCH 2/4] Fix error message when opening NeoTree buffer Error: `Number 0 assigned to two buffers ...` --- spacemacs/packages.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spacemacs/packages.el b/spacemacs/packages.el index 15b510b5b668..ae6aa81a3a54 100644 --- a/spacemacs/packages.el +++ b/spacemacs/packages.el @@ -2109,11 +2109,12 @@ which require an initialization must be listed explicitly in the list.") ((equal str "9") " ➒ ") ((equal str "0") " ⓿ ")))) - (defun spacemacs//window-numbering-assign () + (defun spacemacs//window-numbering-assign (windows) "Custom number assignment for special buffers." - (when (equal (buffer-name) " *NeoTree*") 0)) - (setq window-numbering-assign-func ''spacemacs//window-numbering-assign) - )) + (mapc (lambda (w) (when (eq w neo-global--window) + (window-numbering-assign w 0))) + windows)) + (add-hook 'window-numbering-before-hook 'spacemacs//window-numbering-assign))) (defun spacemacs/init-yasnippet () (use-package yasnippet From 77f6acc29c9eed9985c0f3df7ae5889750a8405a Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Tue, 20 Jan 2015 21:34:28 -0500 Subject: [PATCH 3/4] Fix void-variable error introduced by last commit --- spacemacs/packages.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spacemacs/packages.el b/spacemacs/packages.el index ae6aa81a3a54..53264ffd527a 100644 --- a/spacemacs/packages.el +++ b/spacemacs/packages.el @@ -100,7 +100,7 @@ ;; rainbow-blocks rainbow-delimiters ;; install fail on windows - ;; rainbow-mode + rainbow-mode rcirc rcirc-color recentf @@ -2111,8 +2111,10 @@ which require an initialization must be listed explicitly in the list.") (defun spacemacs//window-numbering-assign (windows) "Custom number assignment for special buffers." - (mapc (lambda (w) (when (eq w neo-global--window) - (window-numbering-assign w 0))) + (mapc (lambda (w) + (when (and (boundp 'neo-global--window) + (eq w neo-global--window)) + (window-numbering-assign w 0))) windows)) (add-hook 'window-numbering-before-hook 'spacemacs//window-numbering-assign))) From 17a263d6d89f7d7e9171f8814aaa2fd995a46f51 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Tue, 20 Jan 2015 21:49:23 -0500 Subject: [PATCH 4/4] Bump version to 0.48.5 --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index e942382ffe7e..d93e2f85b94f 100644 --- a/init.el +++ b/init.el @@ -9,7 +9,7 @@ ;; This file is not part of GNU Emacs. ;; ;;; License: GPLv3 -(defconst spacemacs-version "0.48.3" "Spacemacs version.") +(defconst spacemacs-version "0.48.5" "Spacemacs version.") (defconst spacemacs-min-version "24.3" "Mininal required version of Emacs.") (defun spacemacs/emacs-version-ok ()