diff options
Diffstat (limited to 'emacs/.emacs.d/site-lisp')
-rwxr-xr-x[-rw-r--r--] | emacs/.emacs.d/site-lisp/oni-windows-nt.el | 140 |
1 files changed, 71 insertions, 69 deletions
diff --git a/emacs/.emacs.d/site-lisp/oni-windows-nt.el b/emacs/.emacs.d/site-lisp/oni-windows-nt.el index 427bbb6..411f079 100644..100755 --- a/emacs/.emacs.d/site-lisp/oni-windows-nt.el +++ b/emacs/.emacs.d/site-lisp/oni-windows-nt.el @@ -1,69 +1,71 @@ -;;; oni-windows-nt.el --- Windows-specific configuration -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2018 Tom Willemse
-
-;; Author: Tom Willemse <tom@ryuslash.org>
-;; Keywords: local
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Any settings that only apply when working on a Windows machine.
-
-;;; Code:
-
-(eval-when-compile
- (require 'package)
- (package-initialize)
-
- (require 'find-dired)
- (require 'ivy)
- (require 'grep)
- (require 'magit))
-
-(defun oni-windows-nt--disable-ivy (orig-fun &rest args)
- "Disable ivy while running ORIG-FUN with ARGS."
- (let ((ivy-enabled ivy-mode))
- (unwind-protect
- (progn
- (when ivy-enabled
- (ivy-mode -1))
- (apply orig-fun args))
- (when ivy-enabled
- (ivy-mode 1)))))
-
-(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")
-(add-to-list 'exec-path "c:/cygwin64/bin")
-
-(setq find-program (shell-quote-argument "c:/cygwin64/bin/find.exe"))
-
-(setq grep-program (shell-quote-argument "c:/cygwin64/bin/grep.exe"))
-
-(setq grep-use-null-device nil)
-
-(let ((exe (shell-quote-argument "c:/cygwin64/bin/ls.exe")))
- (setq find-ls-option
- (cons (concat "-exec " exe " -ld {} \";\"") "-ld")))
-
-(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"))
-
-(provide 'oni-windows-nt)
-;;; oni-windows-nt.el ends here
+;;; oni-windows-nt.el --- Windows-specific configuration -*- lexical-binding: t; -*- + +;; Copyright (C) 2018 Tom Willemse + +;; Author: Tom Willemse <tom@ryuslash.org> +;; Keywords: local + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see <https://www.gnu.org/licenses/>. + +;;; Commentary: + +;; Any settings that only apply when working on a Windows machine. + +;;; Code: + +(eval-when-compile + (require 'package) + (package-initialize) + + (require 'find-dired) + (require 'ivy) + (require 'grep) + (require 'magit)) + +(defun oni-windows-nt--disable-ivy (orig-fun &rest args) + "Disable ivy while running ORIG-FUN with ARGS." + (let ((ivy-enabled ivy-mode)) + (unwind-protect + (progn + (when ivy-enabled + (ivy-mode -1)) + (apply orig-fun args)) + (when ivy-enabled + (ivy-mode 1))))) + +(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") +(add-to-list 'exec-path "c:/cygwin64/bin") + +(setq find-program (shell-quote-argument "c:/cygwin64/bin/find.exe")) + +(setq grep-program (shell-quote-argument "c:/cygwin64/bin/grep.exe")) + +(setq grep-use-null-device nil) + +(setq buffer-file-coding-system 'utf-8-unix) + +(let ((exe (shell-quote-argument "c:/cygwin64/bin/ls.exe"))) + (setq find-ls-option + (cons (concat "-exec " exe " -ld {} \";\"") "-ld"))) + +(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")) + +(provide 'oni-windows-nt) +;;; oni-windows-nt.el ends here |