소스 검색

Fix don't load symlinks (Emacs interlocking files) * testing/org-test.el: During test development various interlocking files may be present in testing/lisp directory (since they are being edited by emacs). Currently org-test-load will attempt to load these

Martyn Jago 13 년 전
부모
커밋
49d6951caa
1개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      testing/org-test.el

+ 3 - 2
testing/org-test.el

@@ -276,8 +276,9 @@ otherwise place the point at the beginning of the inserted text."
 		 (if (file-directory-p path)
 		     (rld path)
 		   (catch 'missing-test-dependency
-		     (when (string-match "^[A-Za-z].*\\.el$" path)
-		       load-file path))))
+		     (when (string-match "^[A-Za-z].*\\.el$"
+					 (file-name-nondirectory path))
+		       (load-file path)))))
 	       (directory-files base 'full
 				"^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*\\.el$"))))
     (rld (expand-file-name "lisp" org-test-dir))