TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve theme installation robustness 

Also use stock Emacs functions for warning reporting before the
home buffer is actually created.
This commit is contained in:
syl20bnr 2016-02-19 23:30:35 -05:00
parent da83bef2cb
commit 6bb306a999
2 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-configuration-layer.el
View File

@ -239,18 +239,19 @@ refreshed during the current session."
(with-timeout
(dotspacemacs-elpa-timeout
(progn
(spacemacs-buffer/append
(display-warning
'spacemacs
(format
"\nError connection time out for %s repository!"
(car archive)))
(car archive)) :warning)
'error))
(condition-case err
(url-retrieve-synchronously (cdr archive))
('error
(spacemacs-buffer/append
(display-warning 'spacemacs
(format
"\nError while contacting %s repository!"
(car archive)))
(car archive)) :warning)
'error))))
(let ((package-archives (list archive)))
(package-refresh-contents))))

58
core/core-themes-support.el
View File

@ -189,30 +189,40 @@ package name does not match theme name + `-theme' suffix.")
(defun spacemacs/load-theme (theme)
"Load THEME."
;; Required dependencies for some themes
(when (or (eq 'zonokai-blue theme)
(eq 'zonokai-red theme)
(eq 'solarized-light theme)
(eq 'solarized-dark theme))
(spacemacs/load-or-install-package 'dash))
;; Unless Emacs stock themes
(unless (or (memq theme (custom-available-themes))
(eq 'default theme))
(cond
;; themes with explicitly declared package names
((assq theme spacemacs-theme-name-to-package)
(let* ((pkg (spacemacs//get-theme-package theme))
(pkg-dir (spacemacs/load-or-install-package pkg)))
(when (or (eq 'moe-light theme)
(eq 'moe-dark theme))
(load-file (concat pkg-dir "moe-light-theme.el"))
(load-file (concat pkg-dir "moe-dark-theme.el")))
(add-to-list 'custom-theme-load-path pkg-dir)))
(t
;; other themes
;; we assume that the package name is suffixed with `-theme'
;; if not we will handle the special themes as we get issues in the tracker.
(let ((pkg (spacemacs//get-theme-package theme)))
(spacemacs/load-or-install-package pkg)))))
(condition-case err
(progn
(when (or (eq 'zonokai-blue theme)
(eq 'zonokai-red theme)
(eq 'solarized-light theme)
(eq 'solarized-dark theme))
(spacemacs/load-or-install-package 'dash))
;; Unless Emacs stock themes
(unless (or (memq theme (custom-available-themes))
(eq 'default theme))
(cond
;; themes with explicitly declared package names
((assq theme spacemacs-theme-name-to-package)
(let* ((pkg (spacemacs//get-theme-package theme))
(pkg-dir (spacemacs/load-or-install-package pkg)))
(when (or (eq 'moe-light theme)
(eq 'moe-dark theme))
(load-file (concat pkg-dir "moe-light-theme.el"))
(load-file (concat pkg-dir "moe-dark-theme.el")))
(add-to-list 'custom-theme-load-path pkg-dir)))
(t
;; other themes
;; we assume that the package name is suffixed with `-theme'
;; if not we will handle the special themes as we get issues
;; in the tracker.
(let ((pkg (spacemacs//get-theme-package theme)))
(spacemacs/load-or-install-package pkg))))))
('error
(setq theme 'default)
(display-warning 'spacemacs
(format (concat "An error occurred while retrieving the "
"theme, using default theme. (error: %s)")
err)
:warning)))
(mapc 'disable-theme custom-enabled-themes)
(if (eq 'default theme)
(progn