Move contribsys package.el initialization in a function

This commit is contained in:
syl20bnr 2014-11-16 22:36:07 -05:00
parent 50c9893ce7
commit 668b9f88f9
2 changed files with 19 additions and 16 deletions

View file

@ -1,19 +1,4 @@
;; Spacemacs Contribution System
(require 'package)
(setq package-archives '(("ELPA" . "http://tromey.com/elpa/")
("gnu" . "http://elpa.gnu.org/packages/")
("melpa" . "http://melpa.org/packages/")))
(package-initialize)
(setq warning-minimum-level :error)
;; Emacs 24.3 and above ships with python.el but in some Emacs 24.3.1 packages
;; for Ubuntu, python.el seems to be missing.
;; This hack adds marmalade repository for this case only.
(unless (or (package-installed-p 'python) (version< emacs-version "24.3"))
(add-to-list 'package-archives
'("marmalade" . "http://marmalade-repo.org/packages/")))
(load (concat spacemacs-core-directory "ht.el"))
(defconst spacemacs-dotspacemacs-version "1.0"
"Minimum Version exepected for ~/.spacemacs file.")
@ -78,6 +63,23 @@ NOT USED FOR NOW :-)"
(defvar dotspacemacs-excluded-packages '()
"A list of packages and/or extensions that will not be install and loaded.")
(defun contribsys/package.el-initialize ()
"Initialize package.el"
(require 'package)
(unless package--initialized
(load (concat spacemacs-core-directory "ht.el"))
(setq package-archives '(("ELPA" . "http://tromey.com/elpa/")
("gnu" . "http://elpa.gnu.org/packages/")
("melpa" . "http://melpa.org/packages/")))
(package-initialize)
;; Emacs 24.3 and above ships with python.el but in some Emacs 24.3.1 packages
;; for Ubuntu, python.el seems to be missing.
;; This hack adds marmalade repository for this case only.
(unless (or (package-installed-p 'python) (version< emacs-version "24.3"))
(add-to-list 'package-archives
'("marmalade" . "http://marmalade-repo.org/packages/")))
(setq warning-minimum-level :error)))
(defun contribsys/dotfile-location ()
"Return the absolute path to the spacemacs dotfile."
(concat user-home-directory ".spacemacs"))

View file

@ -2,6 +2,7 @@
(defconst spacemacs-core-directory
(expand-file-name (concat user-emacs-directory "core/"))
"Spacemacs core directory.")
(load (concat spacemacs-core-directory "contribsys.el"))
(load (concat spacemacs-core-directory "spacemacs-mode.el"))
(spacemacs/buffer)
@ -31,7 +32,7 @@
"Dropbox directory.")
;; if you have a dropbox, then ~/Dropbox/emacs is added to load path
(add-to-list 'load-path (concat user-dropbox-directory "emacs/"))
(load (concat spacemacs-core-directory "contribsys.el"))
(contribsys/package.el-initialize)
;; User configuration file for Spacemacs: ~/.spacemacs
(contribsys/load-dotfile)
(contribsys/call-dotfile-func dotspacemacs/init)