|
@@ -91,6 +91,10 @@ found, otherwise returns nil." |
|
|
;; It seems malabar has been merged into jdee and this package |
|
|
;; It seems malabar has been merged into jdee and this package |
|
|
;; already removed |
|
|
;; already removed |
|
|
;; malabar-mode |
|
|
;; malabar-mode |
|
|
|
|
|
gosh-mode |
|
|
|
|
|
scala-mode |
|
|
|
|
|
;;ensime |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; ack |
|
|
;; ack |
|
|
color-moccur |
|
|
color-moccur |
|
@@ -118,14 +122,13 @@ found, otherwise returns nil." |
|
|
page-break-lines |
|
|
page-break-lines |
|
|
;; sync-recentf |
|
|
;; sync-recentf |
|
|
aggressive-indent |
|
|
aggressive-indent |
|
|
fancy-narrow |
|
|
|
|
|
|
|
|
;; fancy-narrow |
|
|
dired-filter |
|
|
dired-filter |
|
|
wgrep |
|
|
wgrep |
|
|
magit |
|
|
magit |
|
|
git-gutter |
|
|
git-gutter |
|
|
|
|
|
|
|
|
scala-mode |
|
|
|
|
|
;;ensime |
|
|
|
|
|
|
|
|
end-mark |
|
|
|
|
|
sl |
|
|
|
|
|
|
|
|
editorconfig |
|
|
editorconfig |
|
|
editorconfig-custom-majormode |
|
|
editorconfig-custom-majormode |
|
@@ -148,9 +151,6 @@ found, otherwise returns nil." |
|
|
ilookup |
|
|
ilookup |
|
|
pasteboard |
|
|
pasteboard |
|
|
|
|
|
|
|
|
end-mark |
|
|
|
|
|
sl |
|
|
|
|
|
gosh-mode |
|
|
|
|
|
)) |
|
|
)) |
|
|
|
|
|
|
|
|
(when (safe-require-or-eval 'package) |
|
|
(when (safe-require-or-eval 'package) |
|
@@ -681,8 +681,8 @@ found, otherwise returns nil." |
|
|
;; (set-face-underline 'vertical-border |
|
|
;; (set-face-underline 'vertical-border |
|
|
;; nil) |
|
|
;; nil) |
|
|
|
|
|
|
|
|
(when (safe-require-or-eval 'end-mark) |
|
|
|
|
|
(global-end-mark-mode)) |
|
|
|
|
|
|
|
|
;; (when (safe-require-or-eval 'end-mark) |
|
|
|
|
|
;; (global-end-mark-mode)) |
|
|
|
|
|
|
|
|
;; M-x highlight-* to highlight things |
|
|
;; M-x highlight-* to highlight things |
|
|
(global-hi-lock-mode 1) |
|
|
(global-hi-lock-mode 1) |
|
@@ -839,6 +839,19 @@ found, otherwise returns nil." |
|
|
;; See also https://github.com/magit/magit/issues/3517 |
|
|
;; See also https://github.com/magit/magit/issues/3517 |
|
|
(global-magit-file-mode -1)) |
|
|
(global-magit-file-mode -1)) |
|
|
|
|
|
|
|
|
|
|
|
(with-eval-after-load 'magit-section |
|
|
|
|
|
(set-face-background 'magit-section-highlight |
|
|
|
|
|
nil)) |
|
|
|
|
|
|
|
|
|
|
|
(with-eval-after-load 'magit-diff |
|
|
|
|
|
(set-face-background 'magit-diff-added-highlight |
|
|
|
|
|
nil) |
|
|
|
|
|
(set-face-background 'magit-diff-removed-highlight |
|
|
|
|
|
nil) |
|
|
|
|
|
(set-face-background 'magit-diff-context-highlight |
|
|
|
|
|
nil) |
|
|
|
|
|
) |
|
|
|
|
|
|
|
|
(when (boundp 'git-rebase-filename-regexp) |
|
|
(when (boundp 'git-rebase-filename-regexp) |
|
|
(add-to-list 'auto-mode-alist |
|
|
(add-to-list 'auto-mode-alist |
|
|
`(,git-rebase-filename-regexp . text-mode))) |
|
|
`(,git-rebase-filename-regexp . text-mode))) |
|
|