summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs/elisp/ap-functions.el2
-rw-r--r--emacs/init.el6
2 files changed, 8 insertions, 0 deletions
diff --git a/emacs/elisp/ap-functions.el b/emacs/elisp/ap-functions.el
index 104b4449..4c300015 100644
--- a/emacs/elisp/ap-functions.el
+++ b/emacs/elisp/ap-functions.el
@@ -44,3 +44,5 @@
                        ""))

         (command (read-shell-command "Shell command: " nil nil nil)))

     (shell-command (replace-regexp-in-string "%" file-buffer command) to-current-buffer)))

+

+(provide 'ap-functions)

diff --git a/emacs/init.el b/emacs/init.el
index 916cc420..1b7b4950 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -427,6 +427,12 @@ Values: `desktop', `server', `laptop'")
             (add-to-list 'tramp-remote-path "/usr/local/sbin")
             (add-to-list 'tramp-remote-path "~/bin")))
 
+(use-package ediff
+  :defer t
+  :config (progn
+            (setq ediff-split-window-function 'split-window-horizontally
+                  ediff-window-setup-function 'ediff-setup-windows-plain)))
+
 ;;;; Indentation
 
 (setq-default tab-width 4