Permalink
Browse files

Merge remote-tracking branch 'refs/remotes/magnars/master'

Conflicts:
	custom.el
  • Loading branch information...
2 parents c9bae52 + e56e71c commit 106a0c4f839fc61f34a9ecb08fb8f9ffcd1e3eb8 @cjohansen committed Jun 19, 2014
Showing with 13 additions and 11 deletions.
  1. +1 −2 custom.el
  2. +3 −1 setup-ffip.el
  3. +9 −8 setup-ido.el
View
@@ -5,8 +5,7 @@
;; If there is more than one, they won't work right.
'(custom-safe-themes (quote ("9527feeeec43970b1d725bdc04e97eb2b03b15be982ac50089ad223d3c6f2920" "c03d60937e814932cd707a487676875457e0b564a615c1edfd453f23b06fe879" "f3ec2da81c2b1f66f911fe47843a09055754b40fafaddcce79bbd4d781161329" "30c6aef3025cd6f05ccb611ec8838a448a14a6784987ed98b24f78916d63b388" "84ff07913c6109d12bfda40644daeaaa8f4665afb5f04e13e422bd98b02ee88b" "cf33119622dd833e4d8f904f34c5e3ff95d1d3d45bada72dd44648b3470bdebe" "f5776f3da6117901f29405fe52edb2bcba6a687629b4cbd5923d1a642484f2f9" "d56e289b10204629ac5c35b9621a650a534ef3baf183a1c601b4936482321df1" "50ceca952b37826e860867d939f879921fac3f2032d8767d646dd4139564c68a" "ff73e1b0216feca9e041dcb3196938442cc6aa8319f97eedbc2a3e38c8ca9825" "a18dd0a954ac63a80e62c8cb1b550ffcf5d8461189c7c672555faadf2facfcf3" "cb36f8e44d41595010baa23737984c4ecb2d8cc2e363ec15fbfa0408c2f8ea9f" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "9f42bccce1e13fa5017eb8718574db099e85358b9f424db78e7318f86d1be08f" default)))
'(ido-use-filename-at-point nil)
- '(fill-column 80)
- '(safe-local-variable-values (quote ((eval font-lock-add-keywords nil (quote (("defexamples\\|def-example-group\\| => " (0 (quote font-lock-keyword-face)))))) (eval when (and (buffer-file-name) (file-regular-p (buffer-file-name)) (string-match-p "^[^.]" (buffer-file-name))) (emacs-lisp-mode)) (eval font-lock-add-keywords nil (quote (("defexamples\\| => " (0 (quote font-lock-keyword-face)))))) (encoding . utf-8)))))
+ '(safe-local-variable-values (quote ((eval font-lock-add-keywords nil (quote (("defexamples\\|def-example-group\\| => " (0 (quote font-lock-keyword-face))) ("(defexamples[[:blank:]]+\\(.*\\)" (1 (quote font-lock-function-name-face)))))) (eval font-lock-add-keywords nil (quote (("defexamples\\|def-example-group\\| => " (0 (quote font-lock-keyword-face)))))) (eval when (and (buffer-file-name) (file-regular-p (buffer-file-name)) (string-match-p "^[^.]" (buffer-file-name))) (emacs-lisp-mode)) (eval font-lock-add-keywords nil (quote (("defexamples\\| => " (0 (quote font-lock-keyword-face)))))) (encoding . utf-8)))))
(custom-set-faces
;; custom-set-faces was added by Custom.
View
@@ -51,6 +51,7 @@
(setq-default ffip-find-options
(ffip--create-exclude-find-options
'("/node_modules"
+ "/bower_components"
"/target"
"/out"
"/overlays"
@@ -59,6 +60,7 @@
"/vendor"
"/.cask"
"/generated"
- "/.repl")))
+ "/.repl"
+ "/.tmp")))
(provide 'setup-ffip)
View
@@ -29,16 +29,17 @@
(require 'dash)
+(defun my/ido-go-straight-home ()
+ (interactive)
+ (cond
+ ((looking-back "~/") (insert "projects/"))
+ ((looking-back "/") (insert "~/"))
+ (:else (call-interactively 'self-insert-command))))
+
(defun my/setup-ido ()
;; Go straight home
- (define-key ido-file-completion-map
- (kbd "~")
- (lambda ()
- (interactive)
- (cond
- ((looking-back "~/") (insert "projects/"))
- ((looking-back "/") (insert "~/"))
- (:else (call-interactively 'self-insert-command)))))
+ (define-key ido-file-completion-map (kbd "~") 'my/ido-go-straight-home)
+ (define-key ido-file-completion-map (kbd "C-~") 'my/ido-go-straight-home)
;; Use C-w to go back up a dir to better match normal usage of C-w
;; - insert current file name with C-x C-w instead.

0 comments on commit 106a0c4

Please sign in to comment.