From 156d16c2eff5307d7ef71c9e03da4ecc2a71b5ef Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Fri, 24 Oct 2014 19:33:46 -0400 Subject: [PATCH] ~/.spacemacs version is now a string Sorry you'll have to update your file one more time Just change 1 to be "1" --- .spacemacs.template | 7 +++++-- core/contribsys.el | 13 +++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.spacemacs.template b/.spacemacs.template index fbbd1d8e8..c143d7589 100644 --- a/.spacemacs.template +++ b/.spacemacs.template @@ -4,8 +4,8 @@ ;; Variables -(defconst dotspacemacs-version 1 - "The version number of this file.") +(defconst dotspacemacs-version "1.01" + "The version of this file.") (defvar dotspacemacs-configuration-layer-path '() "List of additional paths where to look for configuration layers. @@ -16,6 +16,9 @@ Paths must have a trailing slash (ie. `~/.mycontribs/')" "List of contribution to load." ) +(defvar dotspacemacs-fullscreen-at-startup t + "If non nil the frame is maximized when Emacs starts up.") + (defvar dotspacemacs-default-package-repository 'melpa-stable "The default package repository used if no explicit repository has been specified with an installed package." diff --git a/core/contribsys.el b/core/contribsys.el index 2ac002a8f..f54d55b5c 100644 --- a/core/contribsys.el +++ b/core/contribsys.el @@ -15,8 +15,8 @@ (load (concat spacemacs-core-directory "ht.el")) -(defconst spacemacs-dotspacemacs-version 1 - "Version execpted for ~/.spacemacs file.") +(defconst spacemacs-dotspacemacs-version "1.0" + "Minimum Version exepected for ~/.spacemacs file.") (defvar spacemacs-config-layers '() "Alist of configuration layers with the form (symbol . plist) where @@ -55,9 +55,14 @@ is its path.") (defun contribsys/check-dotspacemacs-version () "Return t if the check pass, otherwise return nil and display an error -message." +message. + +The check pass if the expected version stored in +`spacemacs-dotspacemacs-version' is less or equal to the current version of +~/.spacemacs +" (if (and (boundp 'dotspacemacs-version) - (equal dotspacemacs-version spacemacs-dotspacemacs-version)) + (not (version< dotspacemacs-version spacemacs-dotspacemacs-version))) t (defun display-startup-echo-area-message () "Change the default welcome message of minibuffer to another one."