Better check for emacs version prerequisite

Move the check at the very top of init.el
Resolves #453
This commit is contained in:
syl20bnr 2015-01-20 00:47:05 -05:00
parent 7a39a92edb
commit 3d02adf755
2 changed files with 7 additions and 12 deletions

View File

@ -17,11 +17,6 @@
(require 'emacs-backports)
(require 'themes-support)
(defconst spacemacs-version "0.48.2"
"Spacemacs version.")
(defconst spacemacs-min-version "24.3"
"Mininal required version of Emacs.")
(defconst spacemacs-repository "spacemacs"
"Name of the Spacemacs remote repository.")
(defconst spacemacs-repository-owner "syl20bnr"
@ -204,9 +199,6 @@ FILE-TO-LOAD is an explicit file to load after the installation."
(load-file (concat pkg-elpa-dir file-to-load)))
pkg-elpa-dir))))
(defun spacemacs/emacs-version-ok ()
(version<= spacemacs-min-version emacs-version))
(defun spacemacs/display-and-copy-version ()
"Echo the current spacemacs version and copy it."
(interactive)

11
init.el
View File

@ -9,13 +9,16 @@
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
(defconst spacemacs-version "0.48.2" "Spacemacs version.")
(defconst spacemacs-min-version "24.3" "Mininal required version of Emacs.")
(add-to-list 'load-path (concat user-emacs-directory "core/"))
(require 'spacemacs-mode)
(require 'configuration-layer)
(defun spacemacs/emacs-version-ok ()
(version<= spacemacs-min-version emacs-version))
(when (spacemacs/emacs-version-ok)
(add-to-list 'load-path (concat user-emacs-directory "core/"))
(require 'spacemacs-mode)
(require 'configuration-layer)
(dotspacemacs/load)
(spacemacs/initialize)
;; Initializing configuration from ~/.spacemacs