From 97decd4df45244c1576c3802d9d9a9609cf9dae8 Mon Sep 17 00:00:00 2001
From: John Doty <john@d0ty.me>
Date: Thu, 15 Apr 2021 06:41:59 -0700
Subject: [PATCH] Shrug?

---
 .emacs.d/custom.el |  4 ++--
 .emacs.d/init.el   | 20 ++++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index c0aaf78..5c4ba3a 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -84,8 +84,8 @@
  '(tab-width 4)
  '(tags-revert-without-query t)
  '(tramp-completion-reread-directory-timeout nil)
- '(tramp-default-method "sshx")
- '(tramp-use-ssh-controlmaster-options nil)
+ '(tramp-default-method "sshx" nil (tramp))
+ '(tramp-use-ssh-controlmaster-options nil nil (tramp))
  '(transient-mark-mode t)
  '(truncate-lines t)
  '(typescript-indent-level 2)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 02eee76..194ec6f 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -273,6 +273,19 @@
         (emacs-lisp-docstring-fill-column t))
     (fill-paragraph nil region)))
 
+(defun my--fix-aspell ()
+  "Fix aspell location when it's not there, by looking in
+  hard-coded locations."
+  (require 'ispell)
+  (if (and (not (executable-find ispell-program-name))
+           (file-exists-p "c:/msys64/usr/bin/aspell.exe"))
+      (progn
+        (message "Redirecting aspell to known location")
+        (setq ispell-program-name "c:/msys64/usr/bin/aspell.exe"))))
+
+(add-hook 'ispell-minor-mode-hook 'my--fix-aspell)
+(add-hook 'flyspell-mode-hook 'my--fix-aspell)
+
 ;; =================================================================
 ;; Text mode configuration.
 ;; =================================================================
@@ -280,6 +293,7 @@
   "Doty's hook for text mode."
   (setq fill-column 70)
   (turn-on-auto-fill)
+  (my--fix-aspell)
   (flyspell-mode))
 
 (add-hook 'text-mode-hook 'my-text-mode-hook)
@@ -732,6 +746,7 @@
 (defun my-org-mode-hook ()
   "My org mode hook."
   (turn-off-filladapt-mode)
+  (my--fix-aspell)
   (require 'ox-quip))
 
 (use-package org
@@ -778,7 +793,7 @@
   (interactive)
   (dolist
       (ev (split-string
-           (shell-command-to-string "cmd /c \" \"%ProgramFiles(x86)%\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat\" x64 && set \"")
+           (shell-command-to-string "cmd /c \" \"%ProgramFiles(x86)%\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat\" && set \"")
            "[\n]+"))
     (letrec ((spev (split-string ev "="))
              (vn (car spev))
@@ -808,7 +823,8 @@
 ;; =================================================================
 ;; Magit stuff
 ;; =================================================================
-(global-set-key (kbd "C-x g") 'magit-status)
+(use-package magit :ensure
+  :bind ("C-x g" . magit-status))
 
 
 ;; =================================================================