From 95f41193666230f3b93351ffe0dde0e920806dd0 Mon Sep 17 00:00:00 2001
From: JAremko <w3techplayground@gmail.com>
Date: Mon, 29 Aug 2016 18:52:06 +0300
Subject: [PATCH] disabled by default centering in space-doc-mode.

Fix centered-buffer-mode conflict with Emacs 25
---
 doc/FAQ.org                                                   | 4 +++-
 .../local/centered-buffer-mode/centered-buffer-mode.el        | 3 ++-
 layers/+spacemacs/spacemacs-org/local/space-doc/space-doc.el  | 3 +--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/FAQ.org b/doc/FAQ.org
index 397cc7405..cb5c00afa 100644
--- a/doc/FAQ.org
+++ b/doc/FAQ.org
@@ -528,7 +528,9 @@ You can modify the list of visual enhancements applied by the =space-doc-mode=:
         org-kbd-face-remap
         resize-inline-images))
 #+END_SRC
-It's the default value of the variable with all enhancements.
+By default only =center-buffer-mode= is disabled.
+Both =space-doc-mode= and =center-buffer-mode= can be customized
+with "Easy Customization Interface".
 
 ** Remap paste key to be able to paste copied text multiple times
 In vim and evil, pasting over a text would cause it to be copied, hence making it impossible to paste
diff --git a/layers/+distributions/spacemacs-base/local/centered-buffer-mode/centered-buffer-mode.el b/layers/+distributions/spacemacs-base/local/centered-buffer-mode/centered-buffer-mode.el
index 3dcc1a34e..6ea2d66f5 100644
--- a/layers/+distributions/spacemacs-base/local/centered-buffer-mode/centered-buffer-mode.el
+++ b/layers/+distributions/spacemacs-base/local/centered-buffer-mode/centered-buffer-mode.el
@@ -215,7 +215,8 @@ minimize the performance hit when the mode isn't used."
                             'spacemacs--centered-buffer-mode-origin-buffer
                             buffer)))
         (when (ignore-errors (kill-buffer buffer))
-          (delete buffer 'spacemacs--centered-buffer-mode-indirect-buffers)
+          (setq spacemacs--centered-buffer-mode-indirect-buffers
+                (delete buffer spacemacs--centered-buffer-mode-indirect-buffers))
           (when (buffer-live-p origin-buffer)
             (spacemacs//centered-buffer-mode-buffer-fringr-color-toggle origin-buffer nil)
             (with-current-buffer origin-buffer
diff --git a/layers/+spacemacs/spacemacs-org/local/space-doc/space-doc.el b/layers/+spacemacs/spacemacs-org/local/space-doc/space-doc.el
index 8c01cbb05..b82b53afe 100644
--- a/layers/+spacemacs/spacemacs-org/local/space-doc/space-doc.el
+++ b/layers/+spacemacs/spacemacs-org/local/space-doc/space-doc.el
@@ -59,8 +59,7 @@ keeping their content visible.
 
 ;; NOTE: Dont forget to update Spacemacs FAQ if you modify this list!
 (defcustom spacemacs-space-doc-modificators
-  '(center-buffer-mode
-    org-indent-mode
+  '(org-indent-mode
     view-mode
     hide-line-numbers
     alternative-emphasis