Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
Matthew Trentacoste
Matthew Trentacoste committed Mar 16, 2011
2 parents f24be4b + a3c6dc0 commit fd5010e6165b7a35c16e521090be2fdfc0fb4488
Showing with 2 additions and 2 deletions.
  1. +2 −2 topfunky/js.el
View
@@ -14,9 +14,9 @@
;; USAGE:
;; (require 'topfunky/js)
-(setq js2-basic-offset 2)
+(setq js2-basic-offset 4)
(setq js2-auto-indent-flag nil)
-(setq javascript-indent-level 2)
+(setq javascript-indent-level 4)
(setq topfunky-js-imenu-generic-expression
'(("Named Function" "function\\s-+\\(\\w+\\)\\s-*(" 1)

0 comments on commit fd5010e

Please sign in to comment.