diff --git a/conf/dotemacs b/conf/dotemacs index f98473d..b44bda1 100644 --- a/conf/dotemacs +++ b/conf/dotemacs @@ -57,6 +57,7 @@ '(font-lock-comment-face ((t (:foreground "orange red")))) '(font-lock-keyword-face ((t (:foreground "DeepSkyBlue1"))))) +;; (set-frame-font "Terminus-10") ;; flymake --------------------------------------------------------- (require 'flymake) (add-hook 'find-file-hook 'flymake-find-file-hook) @@ -155,12 +156,73 @@ (add-hook 'before-save-hook 'delete-trailing-whitespace) ;; Configuring ECB and CEDET -(load-file "~/.emacs.d/cedet/cedet-devel-load.el") -(add-to-list 'semantic-default-submodes 'global-semantic-idle-summary-mode t) -(add-to-list 'semantic-default-submodes 'global-semantic-idle-completions-mode t) +;;(load-file "~/.emacs.d/cedet/cedet-devel-load.el") +;;(add-to-list 'semantic-default-submodes 'global-semantic-idle-summary-mode t) +;;(add-to-list 'semantic-default-submodes 'global-semantic-idle-completions-mode t) -(global-ede-mode 1) -(semantic-load-enable-code-helpers) -(global-srecode-minor-mode 1) +;;(global-ede-mode 1) +;;(semantic-load-enable-code-helpers) +;;(global-srecode-minor-mode 1) -(require 'ecb) +;;(require 'ecb) + +;; JS folding +(add-hook 'js-mode-hook + (lambda () + ;; Scan the file for nested code blocks + (imenu-add-menubar-index) + ;; Activate the folding mode + (hs-minor-mode t))) + +;; Lua mode -------------------- +(autoload 'lua-mode "lua-mode" "Lua editing mode." t) +(add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode)) +(add-to-list 'interpreter-mode-alist '("lua" . lua-mode)) + +;; HideShow -------------------- +(load-library "hideshow") +(global-set-key (kbd "C-\-") 'hs-toggle-hiding) +(global-set-key (kbd "C-\\") 'toggle-selective-display) + +(add-hook 'c-mode-common-hook 'hs-minor-mode) +(add-hook 'emacs-lisp-mode-hook 'hs-minor-mode) +(add-hook 'java-mode-hook 'hs-minor-mode) +(add-hook 'lisp-mode-hook 'hs-minor-mode) +(add-hook 'perl-mode-hook 'hs-minor-mode) +(add-hook 'sh-mode-hook 'hs-minor-mode) +(add-hook 'python-mode-hook 'hs-minor-mode) +(add-hook 'lua-mode-hook 'hs-minor-mode) +(add-hook 'js-mode-hook 'hs-minor-mode) + + +;; git-gutter ------------------ +(require 'fringe-helper) +(fringe-helper-define 'test-bitmap '(top repeat) + "XX......" + "..XX...." + "....XX.." + "......XX") + +(autoload 'hideshowvis-enable "hideshowvis" "Highlight foldable regions") + (autoload 'hideshowvis-minor-mode + "hideshowvis" + "Will indicate regions foldable with hideshow in the fringe." + 'interactive) +(dolist (hook (list 'emacs-lisp-mode-hook + 'c++-mode-hook + 'python-mode-hook)) + (add-hook hook 'hideshowvis-enable)) + + + +;;(require 'git-gutter) +;;(require 'git-gutter-fringe) + +;;(global-git-gutter-mode t) + +;;(add-hook 'ruby-mode-hook 'git-gutter-mode) + +;;(global-set-key (kbd "C-x C-g") 'git-gutter:toggle) + +;;(global-set-key (kbd "C-x p") 'git-gutter:previous-diff) +;;(global-set-key (kbd "C-x n") 'git-gutter:next-diff) diff --git a/conf/dotkuso b/conf/dotkuso index 75eea6e..ce3c28a 100644 --- a/conf/dotkuso +++ b/conf/dotkuso @@ -159,7 +159,7 @@ (global-set-key "\C-ca" 'org-agenda) (global-set-key "\C-cb" 'org-iswitchb) -;; HideShow +;; HideShow -------------------- (load-library "hideshow") (global-set-key (kbd "C-\-") 'hs-toggle-hiding) (global-set-key (kbd "C-\\") 'toggle-selective-display) @@ -177,22 +177,22 @@ (add-hook 'before-save-hook 'delete-trailing-whitespace) ;; Configuring ECB and CEDET -(load-file "~/.kuso.d/cedet/cedet-devel-load.el") -(add-to-list 'semantic-default-submodes 'global-semantic-idle-summary-mode t) -(add-to-list 'semantic-default-submodes 'global-semantic-idle-completions-mode t) +;;(load-file "~/.kuso.d/cedet/cedet-devel-load.el") +;;(add-to-list 'semantic-default-submodes 'global-semantic-idle-summary-mode t) +;;(add-to-list 'semantic-default-submodes 'global-semantic-idle-completions-mode t) -(global-ede-mode 1) -(semantic-load-enable-code-helpers) -(global-srecode-minor-mode 1) +;;(global-ede-mode 1) +;;(semantic-load-enable-code-helpers) +;;(global-srecode-minor-mode 1) -(require 'ecb) +;;(require 'ecb) -;; Lua-mode +;; Lua-mode ------------------- (autoload 'lua-mode "lua-mode" "Lua editing mode." t) (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode)) (add-to-list 'interpreter-mode-alist '("lua" . lua-mode)) -;; JS folding +;; JS folding ---------------- (add-hook 'js-mode-hook (lambda () ;; Scan the file for nested code blocks diff --git a/conf/emacs.d/snippets/text-mode/js-mode/README b/conf/emacs.d/snippets/text-mode/js-mode/README new file mode 100644 index 0000000..0e1ca7e --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/README @@ -0,0 +1 @@ +A Collection Of Javascript Snippets For YASnippet. diff --git a/conf/emacs.d/snippets/text-mode/js-mode/assert.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/assert.yasnippet new file mode 100644 index 0000000..59ec614 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/assert.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: assert +# key: assert +# -- +assert.${1:equal}($0); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/cb.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/cb.yasnippet new file mode 100644 index 0000000..9453e6a --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/cb.yasnippet @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: cb +# key: cb +# -- +function(error, $1){ +$0 +} diff --git a/conf/emacs.d/snippets/text-mode/js-mode/com.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/com.yasnippet new file mode 100644 index 0000000..1eff9fe --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/com.yasnippet @@ -0,0 +1,10 @@ +# -*- mode: snippet -*- +# name: com +# key: com +# -- + +/** + * $0 + * @param {${1:String}} $2 + * @return {${3:String}} + */ diff --git a/conf/emacs.d/snippets/text-mode/js-mode/describe.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/describe.yasnippet new file mode 100644 index 0000000..c40bae7 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/describe.yasnippet @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: desc +# key: desc +# -- +describe('$1', function(){ +$2 +}); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/err.snippet b/conf/emacs.d/snippets/text-mode/js-mode/err.snippet new file mode 100644 index 0000000..a4b713b --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/err.snippet @@ -0,0 +1,9 @@ +# -*- mode: snippet -*- +# name: err +# key: err +# -- +if(${1:error}){ + callback($1); + return; +} +$2 diff --git a/conf/emacs.d/snippets/text-mode/js-mode/error.snippet b/conf/emacs.d/snippets/text-mode/js-mode/error.snippet new file mode 100644 index 0000000..1c99ad2 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/error.snippet @@ -0,0 +1,9 @@ +# -*- mode: snippet -*- +# name: error +# key: error +# -- +if(${1:error}){ + callback($1); + return; +} +$2 diff --git a/conf/emacs.d/snippets/text-mode/js-mode/expect.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/expect.yasnippet new file mode 100644 index 0000000..832739b --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/expect.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: expect +# key: expect +# -- +expect($1).${2:to.equal}($0); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/exports.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/exports.yasnippet new file mode 100644 index 0000000..6e183cd --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/exports.yasnippet @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: exports +# key: exports +# -- +module.exports = { +$0 +}; diff --git a/conf/emacs.d/snippets/text-mode/js-mode/fn.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/fn.yasnippet new file mode 100644 index 0000000..67294fc --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/fn.yasnippet @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: fn +# key: fn +# -- +function$1($2){ +$0 +} diff --git a/conf/emacs.d/snippets/text-mode/js-mode/for.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/for.yasnippet new file mode 100644 index 0000000..97d772f --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/for.yasnippet @@ -0,0 +1,9 @@ +# -*- mode: snippet -*- +# name: for +# key: for +# -- +var ${1:i} = ${2:-1}, len = $3.length; + +for(; ++$1 < len;){ + $4 +} diff --git a/conf/emacs.d/snippets/text-mode/js-mode/id.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/id.yasnippet new file mode 100644 index 0000000..47f00b9 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/id.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: id +# key: id +# -- +document.getElementById('$0'); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/if.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/if.yasnippet new file mode 100644 index 0000000..0fac855 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/if.yasnippet @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: if +# key: if +# -- +if( ${1} ){ +$0 +} diff --git a/conf/emacs.d/snippets/text-mode/js-mode/invoc.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/invoc.yasnippet new file mode 100644 index 0000000..cf46321 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/invoc.yasnippet @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: invoc +# key: invoc +# -- +(function($1){ +$0 +})($2); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/it.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/it.yasnippet new file mode 100644 index 0000000..161d51f --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/it.yasnippet @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: it +# key: it +# -- +it('$1', function(done){ +$2 +}); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/log.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/log.yasnippet new file mode 100644 index 0000000..19ff1be --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/log.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: log +# key: log +# -- +console.${1:log}( $0 ); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/method.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/method.yasnippet new file mode 100644 index 0000000..67fb56a --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/method.yasnippet @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: method +# key: method +# -- +$1.prototype.$2 = function($3){ +${0} +}; diff --git a/conf/emacs.d/snippets/text-mode/js-mode/mod.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/mod.yasnippet new file mode 100644 index 0000000..c1b9867 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/mod.yasnippet @@ -0,0 +1,11 @@ +# -*- mode: snippet -*- +# name: mod +# key: mod +# -- +var $1 = require("${2:$1}")$3 + +module.exports = { + $4: $4$5 +}; + +$0 diff --git a/conf/emacs.d/snippets/text-mode/js-mode/prop.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/prop.yasnippet new file mode 100644 index 0000000..dc234c7 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/prop.yasnippet @@ -0,0 +1,19 @@ +# -*- mode: snippet -*- +# name: prop +# key: prop +# -- + +var $1 = (function(){ + + var value = undefined; + + return function $1(newValue){ + + if( $1.arguments.length > 0 ){ + value = newValue; + } + + return value; + }; + +})(); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/proto.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/proto.yasnippet new file mode 100644 index 0000000..c6fe215 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/proto.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: proto +# key: proto +# -- +$1.prototype.$2 = $0 diff --git a/conf/emacs.d/snippets/text-mode/js-mode/rq.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/rq.yasnippet new file mode 100644 index 0000000..864534d --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/rq.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: rq +# key: rq +# -- +$1 = require("${2:$1}")$0 diff --git a/conf/emacs.d/snippets/text-mode/js-mode/rt.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/rt.yasnippet new file mode 100644 index 0000000..d9a5bdf --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/rt.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: rt +# key: rt +# -- +return$0; diff --git a/conf/emacs.d/snippets/text-mode/js-mode/slice.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/slice.yasnippet new file mode 100644 index 0000000..2dd65be --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/slice.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: slice +# key: slice +# -- +Array.prototype.slice.${1:call}($0); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/super.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/super.yasnippet new file mode 100644 index 0000000..4638026 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/super.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: super +# key: super +# -- +$1.prototype.${2:constructor}.${3:call}($0); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/switch.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/switch.yasnippet new file mode 100644 index 0000000..5e4fc3f --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/switch.yasnippet @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: switch +# key: switch +# -- +switch($1){ +$0 +}; diff --git a/conf/emacs.d/snippets/text-mode/js-mode/throw.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/throw.yasnippet new file mode 100644 index 0000000..dbef383 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/throw.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: throw +# key: throw +# -- +throw new Error("$1"); diff --git a/conf/emacs.d/snippets/text-mode/js-mode/try.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/try.yasnippet new file mode 100644 index 0000000..903378f --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/try.yasnippet @@ -0,0 +1,9 @@ +# -*- mode: snippet -*- +# name: try +# key: try +# -- +try { + $1 +} catch(error) { + $0 +} diff --git a/conf/emacs.d/snippets/text-mode/js-mode/var.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/var.yasnippet new file mode 100644 index 0000000..77d52a5 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/var.yasnippet @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: var +# key: var +# -- +var $1 = $0 diff --git a/conf/emacs.d/snippets/text-mode/js-mode/wh.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/wh.yasnippet new file mode 100644 index 0000000..f733ac4 --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/wh.yasnippet @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: wh +# key: wh +# -- +while($1){ +$0 +} diff --git a/conf/emacs.d/snippets/text-mode/js-mode/while.yasnippet b/conf/emacs.d/snippets/text-mode/js-mode/while.yasnippet new file mode 100644 index 0000000..9eff9df --- /dev/null +++ b/conf/emacs.d/snippets/text-mode/js-mode/while.yasnippet @@ -0,0 +1,10 @@ +# -*- mode: snippet -*- +# name: while +# key: while +# -- + +var i = $1.length; + +while( i -- ){ + $0 +} \ No newline at end of file