From f8f488540525247ddada2292b520ce3279d9cb34 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 30 Dec 2017 02:51:58 -0500 Subject: [PATCH] Don't install org-plus-contrib in Emacs 26+ Emacs 26+ has Org 9.1.4 built in. --- modules/lang/org/packages.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index b04980c74..37f729a8f 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -1,11 +1,12 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/org/packages.el -;; NOTE This is an insecure source, but unavoidable if we want org 9.0+ (which -;; this module requires). orgmode.org offers no secure access to this repo. If -;; this bothers you, comment out this `package!' block and download -;; org-plus-contrib from orgmode.org. -(package! org-plus-contrib :recipe (:fetcher github :repo "emacsmirror/org" :files (:defaults "contrib/lisp/*.el"))) +(when (version< emacs-version "26.1") + ;; We want org 9.1.x, but the org packaged with Emacs 25.x and under is 8.x. + ;; The only secure (and reasonably trustworthy) source for this is via + ;; emacsmirror. Emacs 26+ comes with Org 9.1.4. + (package! org-plus-contrib + :recipe (:fetcher github :repo "emacsmirror/org" :files (:defaults "contrib/lisp/*.el")))) (package! org-bullets :recipe (:fetcher github :repo "hlissner/org-bullets")) (package! toc-org)