From 5106427b97c966820c261b922d4d15c02d4372f3 Mon Sep 17 00:00:00 2001
From: Chizi123 <joelgrun@gmail.com>
Date: Sat, 24 Nov 2018 08:04:35 +0000
Subject: [PATCH] changed magit bindings
---
init.el | 137 ++++++++++++++++++++-------------------------
1 files changed, 61 insertions(+), 76 deletions(-)
diff --git a/init.el b/init.el
index cb0c2eb..4a90e4a 100644
--- a/init.el
+++ b/init.el
@@ -1,4 +1,4 @@
-(provide 'init)
+(setq inhibit-startup-message t)
;; set paths for executable
;; use mingw64 for aspell, poppler (pdf-tools), gcc, ghostscript
@@ -26,6 +26,9 @@
(require 'setup-programming)
(require 'setup-text)
(require 'setup-local)
+
+;; set default font
+(set-default-font "DejaVu Sans Mono-10")
;; setting up aspell
(require 'ispell)
@@ -102,6 +105,28 @@
(setq auto-package-update-hide-results t)
(auto-package-update-maybe))
+;; CEDET
+(use-package cedet)
+
+(use-package semantic
+ :config
+ (global-semanticdb-minor-mode 1)
+ (global-semantic-idle-scheduler-mode 1)
+ (global-semantic-idle-summary-mode 1)
+ (semantic-mode 1))
+
+(use-package ede
+ :config
+ (global-ede-mode))
+
+(setq
+ ;; use gdb-many-windows by default
+ gdb-many-windows t
+
+ ;; Non-nil means display source file containing the main routine at startup
+ gdb-show-main t
+ )
+
;; undo-tree
(use-package undo-tree
:ensure t
@@ -142,7 +167,7 @@
(auto-package-update-maybe))
;; workgroups2
-(use-package workgroups
+(use-package workgroups2
:ensure t
:config
(workgroups-mode 1)
@@ -223,12 +248,9 @@
;; magit config
(use-package magit
+ :ensure t
:commands magit-get-top-dir
- :bind (("C-x g s" . magit-status)
- ("C-x g f" . magit-file-log)
- ("C-x g h" . magit-log)
- ("C-x g c" . magit-branch)
- ("C-x g t" . magit-tag))
+ :bind ("C-x g" . magit-status)
:init
(progn
;; make magit status go full-screen but remember previous window
@@ -248,14 +270,6 @@
(defadvice git-commit-abort (after delete-window activate)
(delete-window))
- ;; these two force a new line to be inserted into a commit window,
- ;; which stops the invalid style showing up.
- ;; From: http://git.io/rPBE0Q
- (defun magit-commit-mode-init ()
- (when (looking-at "\n")
- (open-line 1)))
-
- (add-hook 'git-commit-mode-hook 'magit-commit-mode-init))
:config
(progn
;; restore previously hidden windows
@@ -265,40 +279,26 @@
;; we only want to jump to register when the last seen buffer
;; was a magit-status buffer.
(when (eq 'magit-status-mode current-mode)
- (jump-to-register :magit-fullscreen))))
+ (jump-to-register :magit-fullscreen)))))
- (defun magit-maybe-commit (&optional show-options)
- "Runs magit-commit unless prefix is passed"
- (interactive "P")
- (if show-options
- (magit-key-mode-popup-committing)
- (magit-commit)))
-
- (define-key magit-mode-map "c" 'magit-maybe-commit)
-
- ;; major mode for editing `git rebase -i` files
- (use-package rebase-mode)
-
- ;; magit settings
- (setq
- ;; use ido to look for branches
- magit-completing-read-function 'magit-ido-completing-read
- ;; don't put "origin-" in front of new branch names by default
- magit-default-tracking-name-function 'magit-default-tracking-name-branch-only
- ;; open magit status in same window as current buffer
- magit-status-buffer-switch-function 'switch-to-buffer
- ;; highlight word/letter changes in hunk diffs
- magit-diff-refine-hunk t
- ;; ask me if I want to include a revision when rewriting
- magit-rewrite-inclusive 'ask
- ;; ask me to save buffers
- magit-save-some-buffers t
- ;; pop the process buffer if we're taking a while to complete
- magit-process-popup-time 10
- ;; ask me if I want a tracking upstream
- magit-set-upstream-on-push 'askifnotset
- )
- (setq auto-package-update-delete-old-versions t)
+ ;; magit settings
+ (setq
+ ;; don't put "origin-" in front of new branch names by default
+ magit-default-tracking-name-function 'magit-default-tracking-name-branch-only
+ ;; open magit status in same window as current buffer
+ magit-status-buffer-switch-function 'switch-to-buffer
+ ;; highlight word/letter changes in hunk diffs
+ magit-diff-refine-hunk t
+ ;; ask me if I want to include a revision when rewriting
+ magit-rewrite-inclusive 'ask
+ ;; ask me to save buffers
+ magit-save-some-buffers t
+ ;; pop the process buffer if we're taking a while to complete
+ magit-process-popup-time 10
+ ;; ask me if I want a tracking upstream
+ magit-set-upstream-on-push 'askifnotset
+ )
+ (setq auto-package-update-delete-old-versions t)
(setq auto-package-update-hide-results t)
(auto-package-update-maybe)))
@@ -337,11 +337,6 @@
(nyan-mode))
;; semantic refactor
-(use-package semantic
- :ensure t
- :config
- (semantic-mode 1))
-
(use-package srefactor
:ensure t
:bind (("M-RET o" . 'srefactor-lisp-one-line)
@@ -357,14 +352,12 @@
(setq auto-package-update-hide-results t)
(auto-package-update-maybe))
-;; guide-key
-(use-package guide-key
+;; which-key
+(use-package which-key
:ensure t
:config
- (setq guide-key/guide-key-sequence '("C-x" "C-c" "M-g" "C-h"))
- (setq guide-key/recursive-key-sequence-flag t)
- (setq guide-key/popup-window-position 'bottom)
- (guide-key-mode 1)
+ (which-key-mode)
+ (which-key-setup-side-window-bottom)
(setq auto-package-update-delete-old-versions t)
(setq auto-package-update-hide-results t)
(auto-package-update-maybe))
@@ -428,20 +421,12 @@
(setq auto-package-update-hide-results t)
(auto-package-update-maybe))
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; 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.
- '(custom-safe-themes
- (quote
- ("ec5f697561eaf87b1d3b087dd28e61a2fc9860e4c862ea8e6b0b77bd4967d0ba" default)))
- '(package-selected-packages
- (quote
- (company-math latex-preview-pane auctex zenburn-theme org flycheck-pos-tip flycheck rtags racket-mode geiser auto-package-update use-package pdf-tools org-bullets x86-lookup ztree yasnippet workgroups2 volatile-highlights undo-tree srefactor smartparens nyan-mode magit ibuffer-vc helm-projectile guide-key ggtags diff-hl company-c-headers clean-aindent-mode))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; 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.
- )
+;; plantuml
+(use-package plantuml-mode
+ :ensure t
+ :init
+ (setq plantuml-jar-path "c:/ProgramData/chocolatey/lib/plantuml/tools/plantuml.jar")
+ :config
+ (setq auto-package-update-delete-old-versions t)
+ (setq auto-package-update-hide-results t)
+ (auto-package-update-maybe))
--
Gitblit v1.9.3