Skip to content

Commit

Permalink
Merge branch 'develop' (v0.101.1)
Browse files Browse the repository at this point in the history
  • Loading branch information
syl20bnr committed Apr 13, 2015
2 parents d56a2b0 + 2bd3b2b commit 539a126
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
7 changes: 7 additions & 0 deletions contrib/org/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
"List of all packages to install and/or initialize. Built-in packages
which require an initialization must be listed explicitly in the list.")

(defvar org-excluded-packages
'(
;; seems to be problematic, to investigate
ox-gfm
)
"List of packages to exclude.")

(defun org/init-evil-org ()
(use-package evil-org
:commands evil-org-mode
Expand Down
9 changes: 7 additions & 2 deletions core/core-spacemacs-buffer.el
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ Doge special text banner can be reachable via `999', `doge' or `random*'.
(insert-file-contents banner))
(spacemacs-buffer//inject-version)
(spacemacs-buffer//insert-buttons)
(when (file-exists-p spacemacs-buffer--cache-file)
(load spacemacs-buffer--cache-file))
(if (file-exists-p spacemacs-buffer--cache-file)
(load spacemacs-buffer--cache-file)
(unless (file-exists-p dotspacemacs-filepath)
;; fresh install of spacemacs, the release notes are not displayed
(setq spacemacs-buffer--release-note-version spacemacs-version)
(spacemacs/dump-vars-to-file
'(spacemacs-buffer--release-note-version) spacemacs-buffer--cache-file)))
;; if there is an installed dotfile we check the variable
;; spacemacs-buffer--release-note-version to decide whether
;; we show the release note
Expand Down
2 changes: 1 addition & 1 deletion init.el
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
(defconst spacemacs-version "0.101.0" "Spacemacs version.")
(defconst spacemacs-version "0.101.1" "Spacemacs version.")
(defconst spacemacs-emacs-min-version "24.3" "Minimal version of Emacs.")

(defun spacemacs/emacs-version-ok ()
Expand Down

0 comments on commit 539a126

Please sign in to comment.