Move windown setqs to setq-defaults.el

diff --git a/bindings.el b/bindings.el
index 254ccbc5b3495edee2a533b81491787fa2bfd6af..3bbca40233a5b915157125701d3ec779c5cbe238 100644 (file)
--- a/bindings.el
+++ b/bindings.el
@@ -26,7 +26,7 @@
 (global-set-key [end] 'end-of-buffer)
 (global-set-key [C-left] 'previous-window-any-frame)
 (global-set-key [C-right] 'next-window-any-frame)
-(global-set-key [?\C-\S-k] 'kill-whole-line)
+(global-set-key [?\C-\S-K] 'kill-whole-line)
 (global-set-key [?\C-\S-S] 'isearch-forward-regexp)
 (global-set-key [?\C-\S-R] 'isearch-backward-regexp)
 ;; OVERRIDES - ctl-x-map

diff --git a/init.el b/init.el
index 2b364d7436a2fe45b8cc502a0df4bf8c61b8a86f..9c7acfede4f5590034b785bcd92fca26ba58261d 100644 (file)
--- a/init.el
+++ b/init.el
@@ -14,22 +14,7 @@
 (load user-hooks)
 (load user-bindings)
 
-;; SETUP FOR SHARED WINDOWS/WSL INIT
-(if (eq system-type 'windows-nt)
-    (progn (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"
-                openwith-associations '(("\\.pdf\\'" "sumatrapdf" (file))
-                                        ("\\.xls\\'" "excel" (file))
-                                        ("\\.xlsx\\'" "excel" (file))
-                                        ("\\.doc\\'" "word" (file))
-                                        ("\\.docx\\'" "word" (file))
-                                        ("\\.adpro\\'" "PoductivitySuite" (file))))
-          (load (expand-file-name "win-defuns.el" user-emacs-directory)))
-  (setq openwith-associations '(("\\.pdf\\'" "zathura" (file))
-                               ("\\.xls\\'" "libreoffice" (file))
-                               ("\\.xlsx\\'" "libreoffice" (file))
-                               ("\\.doc\\'" "libreoffice" (file))
-                               ("\\.docx\\'" "libreoffice" (file)))))
+(when (eq system-type 'windows-nt)
+  (load (expand-file-name "win-defuns.el" user-emacs-directory)))
 
 (load custom-file 'noerror)

diff --git a/setq-defaults.el b/setq-defaults.el
index 3778a15d3f6b7ca70129f44cda3e4b9ea33b7bc5..2b07485b16aeaa65b26a357a93e33d7de8014f59 100644 (file)
--- a/setq-defaults.el
+++ b/setq-defaults.el
@@ -21,7 +21,6 @@
       global-hl-line-sticky-flag t
       echo-keystrokes 0.01
       save-interprogram-paste-before-kill t
-      confirm-kill-emacs nil
       confirm-kill-processes nil
       frame-title-format "%b - EMACS"
       eshell-destroy-buffer-when-process-dies t
@@ -38,6 +37,21 @@
                               ("<=" . 8804)
                               (">=" . 8805)))
 
+(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"
+         openwith-associations '(("\\.pdf\\'" "sumatrapdf" (file))
+                                 ("\\.xls\\'" "excel" (file))
+                                 ("\\.xlsx\\'" "excel" (file))
+                                 ("\\.doc\\'" "word" (file))
+                                 ("\\.docx\\'" "word" (file))
+                                 ("\\.adpro\\'" "PoductivitySuite" (file))))
+  (setq openwith-associations '(("\\.pdf\\'" "zathura" (file))
+                               ("\\.xls\\'" "libreoffice" (file))
+                               ("\\.xlsx\\'" "libreoffice" (file))
+                               ("\\.doc\\'" "libreoffice" (file))
+                               ("\\.docx\\'" "libreoffice" (file)))))
 ;; OPTIONS
 (save-place-mode 1)
 (fringe-mode 1)
@@ -51,15 +65,15 @@
 (global-hl-line-mode t)
 (global-prettify-symbols-mode t)
 (global-display-line-numbers-mode t)
+
 (let ((my-bg-col "#cae0a6"))
+  (set-face-background 'show-paren-match nil)
+  (set-face-underline 'show-paren-match t)
   (set-face-foreground 'mode-line "black")
   (set-face-foreground 'mode-line-inactive "darkgray")
   (set-face-background 'mode-line my-bg-col)
   (set-face-background 'mode-line-inactive my-bg-col)
   (add-to-list 'default-frame-alist '(background-color . my-bg-col)))
-(set-face-background 'show-paren-match nil)
-(set-face-underline 'show-paren-match t)
-
 
 (unless (display-graphic-p)
   (xterm-mouse-mode 1))