From a2227eb50a350f944ee1546df006937db825be93 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 9 Jul 2018 18:41:28 -0700 Subject: [PATCH] Remove Windows-specific compilation settings These are now included in my global configuration. --- emacs/.emacs.d/site-lisp/oni-windows-nt.el | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/emacs/.emacs.d/site-lisp/oni-windows-nt.el b/emacs/.emacs.d/site-lisp/oni-windows-nt.el index b5c5cef..ef3c30d 100755 --- a/emacs/.emacs.d/site-lisp/oni-windows-nt.el +++ b/emacs/.emacs.d/site-lisp/oni-windows-nt.el @@ -45,12 +45,6 @@ (when ivy-enabled (ivy-mode 1))))) -(defun oni-windows-nt--compilation-finish-notify-function (buffer status) - (when (string= (buffer-name buffer) "*compilation*") - (if (string= (string-trim status) "finished") - (alert "Compilation finished succesfully") - (alert "Compilation finished with an error")))) - (add-to-list 'load-path (locate-user-emacs-file "vendor/p4-vc")) (add-to-list 'exec-path "c:/Program Files/Git/bin") (add-to-list 'exec-path "C:/Program Files/Git/usr/bin") @@ -62,7 +56,7 @@ (setq grep-use-null-device nil) -(setq buffer-file-coding-system 'utf-8-unix) +(setq-default buffer-file-coding-system 'utf-8-unix) (let ((exe (shell-quote-argument "c:/cygwin64/bin/ls.exe"))) (setq find-ls-option @@ -74,13 +68,16 @@ (setq alert-toaster-command "U:/projects/toaster/toast/bin/Release/toast.exe") (setq alert-toaster-default-icon "c:/Users/WillemsenT/Emacs-25.1-2/share/emacs/25.1/etc/images/icons/hicolor/48x48/apps/emacs.png")) -(add-hook 'compilation-finish-functions #'oni-windows-nt--compilation-finish-notify-function) - (with-eval-after-load 'grep (add-function :around (symbol-function 'grep-read-files) #'oni-windows-nt--disable-ivy)) (with-eval-after-load 'magit (setq magit-git-executable "c:/msys64/usr/bin/git.exe")) +(with-eval-after-load 'vc + (require 'vc-p4)) + + (server-mode) + (provide 'oni-windows-nt) ;;; oni-windows-nt.el ends here