Some minor fixes

4 files changed, 3 insertions, 6 deletions

diff --git a/emacs/.emacs.d/init/ycp-editing.el b/emacs/.emacs.d/init/ycp-editing.el
index b77f1ea..bddd955 100644
--- a/emacs/.emacs.d/init/ycp-editing.el
+++ b/emacs/.emacs.d/init/ycp-editing.el
@@ -133,7 +133,7 @@
 (setq delete-old-versions t)
 (setq version-control t)
 
-(add-hook 'text-mode-hook #'turn-on-auto-fill)
+(add-hook 'text-mode-hook #'my-text-modes-setup)
 
 (add-to-list
  'auto-mode-alist
diff --git a/emacs/.emacs.d/init/ycp-org.el b/emacs/.emacs.d/init/ycp-org.el
index 578932e..25a8a2a 100644
--- a/emacs/.emacs.d/init/ycp-org.el
+++ b/emacs/.emacs.d/init/ycp-org.el
@@ -60,8 +60,6 @@
   (add-hook 'org-mode-hook (lambda () (electric-indent-local-mode -1)))
   ;; disable truncate lines
   (add-hook 'org-mode-hook #'toggle-truncate-lines)
-  ;; disable yas-minor-mode for org
-  (add-hook 'org-mode-hook (lambda () (yas-minor-mode -1)))
   (add-hook 'org-mode-hook (lambda () (setq-local tab-width 2)))
 
   (setq org-adapt-indentation 'headline-data)
diff --git a/emacs/.emacs.d/init/ycp-system.el b/emacs/.emacs.d/init/ycp-system.el
index 5951aac..5670eed 100644
--- a/emacs/.emacs.d/init/ycp-system.el
+++ b/emacs/.emacs.d/init/ycp-system.el
@@ -84,9 +84,7 @@
   (connection-local-set-profiles
    '(:application tramp :protocol "adb")
    'adb-shell)
-  (require 'my-system)
-  ;; Stop tramp from interfering with everything
-  (setq file-name-handler-alist (my-file-handlers-without-tramp)))
+  )
 
 (provide 'ycp-system)
 ;;; ycp-system.el ends here
diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el
index d30fcc7..1f52df6 100644
--- a/emacs/.emacs.d/init/ycp-vc.el
+++ b/emacs/.emacs.d/init/ycp-vc.el
@@ -70,6 +70,7 @@
           "======="
           B ">>>>>>> B: Incoming"))
   (setq ediff-diff-options "-w")
+  (setq ediff-window-setup-function 'ediff-setup-windows-plain)
   )
 
 (my-package vc-git