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 9aa18f963d9f488257e615813e09672a1ba105fa..439bb46d3413b6b204670e5c021c776c509f3de7 100644 (file)
--- 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 57fbf01b09d9e7ab5dd374e7a4145b2844a1a7f9..ca0ad509100b35e34596daa69ad29e2c1c692115 100644 (file)
--- 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"))