-
Notifications
You must be signed in to change notification settings - Fork 2
/
settings.el
48 lines (38 loc) · 1.79 KB
/
settings.el
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
(delete-selection-mode 1)
(if (eq system-type 'windows-nt)
(progn
(setq explicit-shell-file-name "C:\\bench\\tools\\scoop\\apps\\git\\current\\bin\\bash.exe")
;;(setq shell-file-name "C:\\bench\\tools\\scoop\\apps\\git\\current\\bin\\bash.exe")
(setq shell-file-name "bash")
;;(setq explicit-bash.exe-args '("--noediting" "--login" "-i"))
;;(setenv "PID" nil)
)
)
;;(add-hook 'comint-output-filter-functions 'comint-strip-ctrl-m)
(global-set-key [f1] 'shell)
(setq split-height-threshold nil)
(setq split-width-threshold 0)
(electric-pair-mode)
(server-start)
(global-so-long-mode t)
;; (add-hook 'rectangle-mark-mode-on-hook (lambda () (progn
;; (local-set-key (kbd "C-c SPC") 'mc/edit-lines)
;; (message "Custom Shortcuts for rectangle On."))))
;; (add-hook 'rectangle-mark-mode-off-hook (lambda () (progn
;; (local-unset-key (kbd "C-c SPC") nil)
;; (message "Custom Shortcuts for rectangle Off."))))
(auto-save-visited-mode t)
(setq ediff-split-window-function 'split-window-horizontally)
;; EDiff Settings
(setq ediff-window-setup-function 'ediff-setup-windows-plain)
(setq ediff-split-window-function 'split-window-horizontally)
;; (csetq ediff-diff-options "-w") ignores whitespace
(defun ora-ediff-hook ()
(ediff-setup-keymap)
(define-key ediff-mode-map "j" 'ediff-next-difference)
(define-key ediff-mode-map "k" 'ediff-previous-difference))
;; ======== Org Shit =========
(define-key global-map (kbd "C-c e") 'org-table-recalculate-buffer-tables)
(add-hook 'ediff-mode-hook 'ora-ediff-hook)
(winner-mode)
(add-hook 'ediff-after-quit-hook-internal 'winner-undo)