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

[org] Fix installation from nongnu elpa and double ownership of org

This commit is contained in:
Maximilian Wolff 2021-05-29 22:12:28 +02:00
parent 63197014cc
commit 5e26865ef9
No known key found for this signature in database
GPG Key ID: 2DD07025BFDBD89A
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.lock
View File

@ -3,19 +3,20 @@
(setq configuration-layer-stable-elpa-name "spacelpa")
(setq configuration-layer-stable-elpa-version "0.400")
(setq configuration-layer-stable-elpa-archive (concat configuration-layer-stable-elpa-directory
"spacelpa-"
configuration-layer-stable-elpa-version))
"spacelpa-"
configuration-layer-stable-elpa-version))
(setq configuration-layer-elpa-subdirectory "develop")
(setq configuration-layer-elpa-archives
`(("melpa" . "melpa.org/packages/")
("org" . "orgmode.org/elpa/")
("gnu" . "elpa.gnu.org/packages/")
("spacelpa" . ,(concat configuration-layer-stable-elpa-archive "/packages/"))))
`(("melpa" . "melpa.org/packages/")
("org" . "orgmode.org/elpa/")
("gnu" . "elpa.gnu.org/packages/")
("nongnu" . "elpa.nongnu.org/nongnu/")
("spacelpa" . ,(concat configuration-layer-stable-elpa-archive "/packages/"))))
(setq package-archive-priorities
'(("spacelpa" . 8)
("melpa" . 4)
("org" . 2)
("org" . 3)
("nongnu" . 2)
("gnu" . 1)))

22
layers/+spacemacs/spacemacs-org/packages.el
View File

@ -33,7 +33,6 @@
;; layer. So it is easier for users to steal the ownership of the
;; `org' package.
(default-org-config :location built-in)
(org :step pre)
org-superstar
(space-doc :location local)
toc-org
@ -42,9 +41,6 @@
(defun spacemacs-org/post-init-flyspell ()
(spell-checking/add-flyspell-hook 'org-mode-hook))
;; dummy init function to force installation of `org'
(defun spacemacs-org/init-org ())
(defun spacemacs-org/init-default-org-config ()
(use-package org
:commands (org-clock-out org-occur-in-agenda-files org-agenda-files)
@ -64,15 +60,15 @@
;; this is consistent with the value of
;; `helm-org-headings-max-depth'.
org-imenu-depth 8)
:config
(progn
(font-lock-add-keywords
'org-mode '(("\\(@@html:<kbd>@@\\) \\(.*\\) \\(@@html:</kbd>@@\\)"
(1 font-lock-comment-face prepend)
(2 font-lock-function-name-face)
(3 font-lock-comment-face prepend))))
;; Open links and files with RET in normal state
(evil-define-key 'normal org-mode-map (kbd "RET") 'org-open-at-point)))))
:config
(progn
(font-lock-add-keywords
'org-mode '(("\\(@@html:<kbd>@@\\) \\(.*\\) \\(@@html:</kbd>@@\\)"
(1 font-lock-comment-face prepend)
(2 font-lock-function-name-face)
(3 font-lock-comment-face prepend))))
;; Open links and files with RET in normal state
(evil-define-key 'normal org-mode-map (kbd "RET") 'org-open-at-point)))))
(defun spacemacs-org/init-org-superstar ()
(use-package org-superstar