diff --git a/init.el b/init.el index eb3dc605e..11202730e 100644 --- a/init.el +++ b/init.el @@ -17,17 +17,16 @@ (defconst spacemacs-version "0.105.0" "Spacemacs version.") (defconst spacemacs-emacs-min-version "24.3" "Minimal version of Emacs.") -(defun spacemacs/emacs-version-ok () - (version<= spacemacs-emacs-min-version emacs-version)) - -(if (spacemacs/emacs-version-ok)(progn - (load-file (concat user-emacs-directory "core/core-load-paths.el")) - (when init-file-debug (require 'core-debug)) - (require 'core-spacemacs) - (spacemacs/init) - (spacemacs/maybe-install-dotfile) - (configuration-layer/sync) - (spacemacs/setup-startup-hook) - (require 'server) - (unless (server-running-p) (server-start))) - (message "Emacs too old! Spacemacs version %d requires Emacs version %d" spacemacs-emacs-min-version spacemacs-emacs-min-version)) +(if (not (version<= spacemacs-emacs-min-version emacs-version)) + (message (concat "Your version of Emacs (%s) is too old. " + "Spacemacs requires Emacs version %d or above.") + emacs-version spacemacs-emacs-min-version) + (load-file (concat user-emacs-directory "core/core-load-paths.el")) + (when init-file-debug (require 'core-debug)) + (require 'core-spacemacs) + (spacemacs/init) + (spacemacs/maybe-install-dotfile) + (configuration-layer/sync) + (spacemacs/setup-startup-hook) + (require 'server) + (unless (server-running-p) (server-start)))