Merge branch 'master' of github.com:FG42/FG42

This commit is contained in:
Sameer Rahmani 2017-04-08 01:03:45 +04:30
commit a075dbe921
4 changed files with 21 additions and 8 deletions

View File

@ -85,6 +85,7 @@
:description "Jump to definition in another window using an external tool")
(require 'dumb-jump)
(dumb-jump-mode t)
(define-key dumb-jump-mode-map (kbd "M-g o") 'dumb-jump-go-other-window)
(define-key dumb-jump-mode-map (kbd "M-g j") 'dumb-jump-go)
(define-key dumb-jump-mode-map (kbd "M-g x") 'dumb-jump-go-prefer-external)
@ -98,7 +99,7 @@
(global-set-key (kbd "C-x g") 'magit-status))
(ability hl ()
"Highligh the current block of code"
"Highligh the current block of code. This ability may slows you down."
(require 'hl-sexp)
(add-hook 'prog-mode-hook #'hl-sexp-mode))
@ -117,14 +118,19 @@
(setq company-idle-delay 0.1)
(setq company-minimum-prefix-length 2)
;; Start autocompletion only after typing
;; Start autpocompletion only after typing
(setq company-begin-commands '(self-insert-command))
;; Force complete file names on "C-c /" key
(global-set-key (kbd "C-c /") 'company-files)
(add-hook 'after-init-hook 'company-statistics-mode)
(define-key company-active-map "\t" 'company-yasnippet-or-completion))
(define-key company-active-map "\t" 'company-yasnippet-or-completion)
(setq dabbrev-case-fold-search t)
(add-to-list 'company-backends 'company-dabbrev)
(add-to-list 'company-backends 'company-dabbrev-code))
(ability yas ()
"Snippet configuration."
@ -147,7 +153,7 @@
(add-hook 'after-init-hook 'global-flycheck-mode))
(ability spell ()
"Check spell of any word using ispell."
"Check spell of any word using ispell. This ability may slows you down"
(global-set-key (kbd "<f2>") 'ispell-word)
(setq flyspell-issue-message-flg nil))

View File

@ -1,4 +1,4 @@
;; Customizations --------------------------------------------
; Customizations --------------------------------------------
(defcustom fg42-todo-file "~/.TODO.org"
"Path to your TODO file. You can use a tramp address here as well."
:type 'string
@ -147,9 +147,9 @@
(require 'flx-ido)
(require 'ido-vertical-mode)
(ido-mode t)
(ido-everywhere t)
(ido-ubiquitous-mode 1)
(ido-mode t)
(smex-initialize)
(global-set-key (kbd "M-x") 'smex)
@ -203,7 +203,9 @@
;; (global-set-key (kbd "C-x b") 'ido-switch-buffer)))
;; Session Management ---------------------------------------
(desktop-save-mode 1)
(ability desktop-mode ()
"Save your current working buffers and restore later"
(desktop-save-mode 1))
;; Backup files ---------------------------------------------
;; Put them in one nice place if possible

View File

@ -7,6 +7,8 @@
(depends-on 'js2-mode)
(depends-on 'js2-refactor)
(depends-on 'smart-forward)
(depends-on 'ac-js2)
;;(depends-on 'tern)
(with-ability jade
(depends-on 'jade))

View File

@ -35,6 +35,10 @@
(add-hook 'js2-mode-hook #'init-jade)
(add-hook 'js2-mode-hook #'jade-interaction-mode))
(ability js-complition ()
(require 'ac-js2)
(add-to-list 'company-backends 'ac-js2-company))
(ability javascript-editor ('flycheck)
"Gives FG42 the ability to edit javascript."
@ -47,7 +51,6 @@
(add-hook 'js2-mode-hook 'javascript-callback)
;; (add-to-list 'company-backends 'company-tern)
(setq js2-highlight-level 3)
(require 'smart-forward)