Merge branch 'master' of github.com:FG42/FG42
This commit is contained in:
commit
237d5147e5
|
@ -6,7 +6,7 @@
|
|||
(theme themes/color-theme-monokai)
|
||||
|
||||
;; Disable abilities which we do not want to load
|
||||
(disable 'rbenv 'helm)
|
||||
(disable 'rbenv 'helm 'spell 'linum)
|
||||
|
||||
;; Activate these extensions
|
||||
(activate-extensions 'editor
|
||||
|
|
|
@ -11,6 +11,10 @@
|
|||
(depends-on 'yasnippet)
|
||||
(depends-on 'hl-sexp)
|
||||
(depends-on 'smart-mode-line)
|
||||
|
||||
(with-ability dumb-jump
|
||||
(depends-on 'dumb-jump))
|
||||
|
||||
(with-ability bookmarks
|
||||
(depends-on 'bm))
|
||||
|
||||
|
|
|
@ -69,6 +69,27 @@
|
|||
(bm-buffer-save-all)
|
||||
(bm-repository-save))))
|
||||
|
||||
(ability dumb-jump ()
|
||||
"Easily jump to defination for most langs using ag"
|
||||
(cheatsheet-add :group '--Development--
|
||||
:key "M-g o"
|
||||
:description "Jump to definition in another window")
|
||||
(cheatsheet-add :group '--Development--
|
||||
:key "M-g j"
|
||||
:description "Jump to definition in current buffer")
|
||||
(cheatsheet-add :group '--Development--
|
||||
:key "M-g x"
|
||||
:description "Jump to definition using an external tool")
|
||||
(cheatsheet-add :group '--Development--
|
||||
:key "M-g z"
|
||||
:description "Jump to definition in another window using an external tool")
|
||||
|
||||
(require 'dumb-jump)
|
||||
(define-key dumb-jump-map (kbd "M-g o") 'dumb-jump-go-other-window)
|
||||
(define-key dumb-jump-map (kbd "M-g j") 'dumb-jump-go)
|
||||
(define-key dumb-jump-map (kbd "M-g x") 'dumb-jump-go-prefer-external)
|
||||
(define-key dumb-jump-map (kbd "M-g z") 'dumb-jump-go-prefer-external-other-window))
|
||||
|
||||
(ability git ()
|
||||
"A wonderful git interface for FG42"
|
||||
(cheatsheet-add :group '--Development--
|
||||
|
|
|
@ -100,8 +100,10 @@
|
|||
(column-number-mode t)
|
||||
|
||||
;; linum mode
|
||||
(global-linum-mode)
|
||||
(setq linum-format " %3d ")
|
||||
(ability linum ()
|
||||
"Line numbering ability"
|
||||
(global-linum-mode)
|
||||
(setq linum-format " %3d "))
|
||||
|
||||
(menu-bar-mode -1)
|
||||
(show-paren-mode t)
|
||||
|
|
Loading…
Reference in New Issue