Minor corg-mode improvements

emacs/.emacs.d/config/init-org.el

@@ -7,6 +7,7 @@
   (leader-def-key "o" '(nil :which-key "org"))
   :config
   (add-hook 'org-mode-hook #'auto-fill-mode)
+  (add-hook 'org-mode-hook (lambda () (require 'org-attach)))
   :custom
   (org-agenda-files `(,(expand-file-name "~/org/todo.org")
                       ,(expand-file-name "~/org/deft/unifydb.org")
@@ -36,9 +37,16 @@
   (org-agenda-span 'day)
   (org-agenda-todo-ignore-scheduled 'future)
   (org-agenda-tags-todo-honor-ignore-options t)
+  (org-file-apps '(("log" . emacs)
+                   (auto-mode . emacs)
+                   (directory . emacs)
+                   ("\\.pdf\\'" . emacs)
+                   ("\\.mm\\'" . default)
+                   ("\\.x?html?\\'" . default)))
   :general
   (leader-map "oa" #'org-agenda)
-  (leader-map "oc" #'org-capture))
+  (leader-map "oc" #'org-capture)
+  (normal org-mode-map "<return>" #'org-return))
 
 (use-package evil-org
   :after org