emacs config changes

1 files changed, 11 insertions, 0 deletions

diff --git a/.emacs b/.emacs
index 0523a45..258d363 100644
--- a/.emacs
+++ b/.emacs
@@ -334,6 +334,9 @@ Extended Format date in the date field and return it as a string obeing
   :config
   (helm-mode 1))
 
+(use-package helm-org
+  :ensure t)
+
 (use-package info-look
   :ensure t)
 
@@ -460,6 +463,10 @@ Otherwise split the current paragraph into one sentence per line."
 (use-package octave
   :mode ("\\.m\'" . octave-mode))
 
+(use-package org
+  :custom
+  (org-link-file-path-type 'relative))
+
 (use-package org-noter
   :ensure t
   :custom
@@ -772,6 +779,10 @@ If not, issue a warning."
   :custom
   (column-mode-number t))
 
+(use-package smerge-mode
+  :custom
+  (smerge-command-prefix (kbd "C-c v")))
+
 (use-package sml-mode
   :ensure t
   :mode ("\\.sml\\'" . sml-mode))