From 3d10ad67421d9fd6fb8a959625dcc60eeeeeabb1 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Sun, 29 Oct 2017 00:27:00 -0400 Subject: [PATCH] core: change default value of dotspacemacs-elpa-subdirectory Set it to emacs-version as it is the saner defaults here. When updating the version of emacs, packages should be byte-recompiled. Thus this is safer to isolate each package by emacs-version. --- core/core-dotspacemacs.el | 2 +- core/templates/.spacemacs.template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/core-dotspacemacs.el b/core/core-dotspacemacs.el index ca441949d..d9cb20c5d 100644 --- a/core/core-dotspacemacs.el +++ b/core/core-dotspacemacs.el @@ -63,7 +63,7 @@ environment, otherwise it is strongly recommended to let it set to t.") (defvar dotspacemacs-elpa-timeout 5 "Maximum allowed time in seconds to contact an ELPA repository.") -(defvar dotspacemacs-elpa-subdirectory nil +(defvar dotspacemacs-elpa-subdirectory 'emacs-version "If non-nil, a form that evaluates to a package directory. For example, to use different package directories for different Emacs versions, set this to `emacs-version'.") diff --git a/core/templates/.spacemacs.template b/core/templates/.spacemacs.template index b6bcc1c8a..ec98b6267 100644 --- a/core/templates/.spacemacs.template +++ b/core/templates/.spacemacs.template @@ -93,8 +93,8 @@ It should only modify the values of Spacemacs settings." dotspacemacs-check-for-update nil ;; If non-nil, a form that evaluates to a package directory. For example, to ;; use different package directories for different Emacs versions, set this - ;; to `emacs-version'. (default nil) - dotspacemacs-elpa-subdirectory nil + ;; to `emacs-version'. (default 'emacs-version) + dotspacemacs-elpa-subdirectory 'emacs-version ;; One of `vim', `emacs' or `hybrid'. ;; `hybrid' is like `vim' except that `insert state' is replaced by the ;; `hybrid state' with `emacs' key bindings. The value can also be a list