Merge branch 'master' of https://github.com/magnars/.emacs.d

Conflicts:
	.mc-lists.el

.gitignore

@@ -12,3 +12,5 @@ site-lisp/adventur-mode
 .DS_Store
 .yas-compiled-snippets.el
 .cask
+/url/
+/var/

.mc-lists.el

@@ -27,7 +27,10 @@
         clj-hippie-expand-no-case-fold
         cljr-cycle-coll
         cljr-raise-sexp
+        cljr-slash
+        cljr-splice-sexp-killing-backward
         cljr-unwind
+        clojure-toggle-keyword-string
         cua-replace-region
         cua-set-mark
         delete-blank-lines
@@ -55,12 +58,15 @@
         js2r-move-line-up
         js2r-split-string
         js2r-var-to-this
+        jump-char-forward
+        jump-char-process-char
         kill-and-retry-line
         kill-region-or-backward-word
         kill-sexp
         live-cycle-clj-coll
         magit-stage-item
         markdown-enter-key
+        markdown-insert-link
         move-line-down
         move-line-up
         move-text-down
@@ -169,6 +175,7 @@
         js2r-extract-var
         js2r-rename-var
         jump-between-source-and-test-files
+        kill-this-buffer
         kmacro-end-or-call-macro
         magit-status
         mc/add-cursor-on-click

sane-defaults.el

@@ -98,6 +98,9 @@
 ;; Sentences do not need double spaces to end. Period.
 (set-default 'sentence-end-double-space nil)
 
+;; 80 chars is a good width.
+(set-default 'fill-column 80)
+
 ;; Add parts of each file's directory to the buffer name if not unique
 (require 'uniquify)
 (setq uniquify-buffer-name-style 'forward)

setup-ffip.el

@@ -50,14 +50,15 @@
 
 (setq-default ffip-find-options
               (ffip--create-exclude-find-options
-               '("node_modules"
-                 "target"
-                 "out"
-                 "overlays"
-                 "build"
-                 "dist"
-                 "vendor"
-                 ".cask"
-                 ".repl")))
+               '("/node_modules"
+                 "/target"
+                 "/out"
+                 "/overlays"
+                 "/build"
+                 "/dist"
+                 "/vendor"
+                 "/.cask"
+                 "/generated"
+                 "/.repl")))
 
 (provide 'setup-ffip)

users/fimasvee/project-mappings.el

@@ -359,6 +359,13 @@
               (set (make-local-variable 'js2-basic-offset) 4)
               (set (make-local-variable 'js2r-use-strict) nil))))
 
+;; SPiD
+
+(add-hook 'js2-mode-hook
+          (lambda ()
+            (when (string-match-p "projects/spid" (buffer-file-name))
+              (set (make-local-variable 'js2-basic-offset) 4))))
+
 ;; no-adventur
 
 (defun custom-persp/no-adventur ()