From: rearman <rearman@r717.net>
Date: Thu, 2 Mar 2023 20:32:49 +0000 (-0500)
Subject: customize faces, diff path for windows
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=a82f697b93fef2bec7fac0a0c9659590c2c68628;p=emacsinit.git

customize faces, diff path for windows

Issues with setting faces via init file, went the customize route for modeline,
modeline-inactive, and matching-paren.

Fixed path to diff.exe for windows, needed to escape a set of quotes inside the
quotes denoting the path as a string.
---

diff --git a/custom-set-variables.el b/custom-set-variables.el
index 9aa18f9..439bb46 100644
--- a/custom-set-variables.el
+++ b/custom-set-variables.el
@@ -22,4 +22,6 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(mode-line ((t (:foreground "black"))))
+ '(mode-line-inactive ((t (:foreground "darkgray"))))
+ '(show-paren-match ((t (:underline t)))))
diff --git a/setq-defaults.el b/setq-defaults.el
index 57fbf01..ca0ad50 100644
--- a/setq-defaults.el
+++ b/setq-defaults.el
@@ -39,8 +39,9 @@
 
 (if (eq system-type 'windows-nt)
     (setq delete-by-moving-to-trash t
-	  ediff-diff-program "c:/Program Files/Git/usr/bin/diff.exe"
-	  ediff-diff3-program "c:/Program Files/Git/usr/bin/diff3.exe"
+	  ediff-diff-program "\"c:/Program Files/Git/usr/bin/diff.exe\""
+	  ediff-diff3-program "\"c:/Program Files/Git/usr/bin/diff3.exe\""
+	  diff-command "\"c:/Program Files/Git/usr/bin/diff.exe\""
 	  openwith-associations '(("\\.pdf\\'" "sumatrapdf" (file))
 				  ("\\.xls\\'" "excel" (file))
 				  ("\\.xlsx\\'" "excel" (file))
@@ -69,9 +70,4 @@
 (global-hl-line-mode t)
 (global-prettify-symbols-mode t)
 (global-display-line-numbers-mode t)
-
-;; FACES
-(set-face-attribute 'show-paren-match nil :background nil :underline t)
-(set-face-attribute 'mode-line nil :background "#cae0a6" :foreground "black" :box nil)
-(set-face-attribute 'mode-line-inactive nil :background "#cae0a6" :foreground "darkgray" :box nil)
 (add-to-list 'default-frame-alist '(background-color . "#cae0a6"))