summaryrefslogtreecommitdiff
path: root/emacs.d/init.el
diff options
context:
space:
mode:
authorFranck Cuny <franck.cuny@gmail.com>2017-06-16 08:46:03 -0700
committerFranck Cuny <franck.cuny@gmail.com>2017-06-16 08:46:03 -0700
commitb0ea22bc9aeb7ce5fda6a9316f1081ba20c344fa (patch)
tree531a3b2cb3fdd7db713b1ede915ac8028b8617b2 /emacs.d/init.el
parent[git] stop using aliases (diff)
downloademacs.d-b0ea22bc9aeb7ce5fda6a9316f1081ba20c344fa.tar.gz
[emacs] Add org-mode configuration once again.
Only load some packages if we are using a recent version of Emacs.
Diffstat (limited to '')
-rw-r--r--emacs.d/init.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 440a879..aa020ac 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -8,7 +8,10 @@
(load (emacs-lib "settings.el"))
(load (emacs-lib "funcs.el"))
(load (emacs-lib "bindings.el"))
-(load (emacs-lib "packages.el"))
-(load (emacs-lib "twitter.el") 'missing-ok)
+
+(when (>= emacs-major-version 24)
+ (load (emacs-lib "packages.el"))
+ (load (emacs-lib "org.el"))
+ (load (emacs-lib "twitter.el") 'missing-ok))
(add-hook 'emacs-startup-hook #'fc/load-time)