Merge remote-tracking branch 'origin/master' into yelp

Conflicts:
	elpa/find-file-in-project-3.2/find-file-in-project.el
	init.el
	lisp/emacs-testify
This commit is contained in:
2013-07-18 20:26:45 -07:00
2 changed files with 19 additions and 9 deletions

View File

@@ -66,7 +66,7 @@
May be set using .dir-locals.el. Checks each entry if set to a list.")
(defvar ffip-patterns
'("*.html" "*.org" "*.txt" "*.md" "*.el" "*.clj" "*.py" "*.rb" "*.js" "*.pl"
'("*.html" "*.el" "*.clj" "*.py" "*.rb" "*.js"
"*.sh" "*.erl" "*.hs" "*.ml" "*.sql" "*.c" "*.erb")
"List of patterns to look for with `find-file-in-project'.")
@@ -145,6 +145,7 @@ directory they are found in so that they are unique."
(interactive)
(setq ffip-project-files-cache '()))
(defun ffip-get-project-files ()
(when (equal (assoc (ffip-project-root) ffip-project-files-cache) nil)
(add-to-list 'ffip-project-files-cache `(,(ffip-project-root) ,(ffip-project-files))))