diff options
| author | Joonatan O'Rourke <joonatan.orourke@gmail.com> | 2015-09-28 19:39:16 +0300 |
|---|---|---|
| committer | Joonatan O'Rourke <joonatan.orourke@gmail.com> | 2015-10-10 19:08:18 +0300 |
| commit | cfde59a5bfefaf87ce6fdf0197326bd2dae930a8 (patch) | |
| tree | d9fdf20d45c55fbe404d36a48af2a94db5e3cb4a | |
| parent | 43b99b70cffcd674d79efdfd6fb564ffa69b2f0e (diff) | |
Fix non-ASCII parsing in dirconfig
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | projectile.el | 2 | ||||
| -rw-r--r-- | test/projectile-test.el | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7859e8e..77ba8c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ This is done via the variables `projectile-project-compilation-cmd` and `project * [#667](https://github.com/bbatsov/projectile/issues/667) Use `file-truename` when caching filenames to prevent duplicate/symlinked filepaths from appearing when opening a project file. * [#625](https://github.com/bbatsov/projectile/issues/625): Ensure the directory has a trailing slash while searching for it. * [#763](https://github.com/bbatsov/projectile/issues/763): Check for `projectile-use-git-grep` in `helm-projectile-grep` +* Fix `projectile-parse-dirconfig-file` to parse non-ASCII characters properly. ## 0.12.0 (03/29/2015) diff --git a/projectile.el b/projectile.el index 965ddf5..10ec40b 100644 --- a/projectile.el +++ b/projectile.el @@ -1107,7 +1107,7 @@ prefix the string will be assumed to be an ignore string." (let (keep ignore (dirconfig (projectile-dirconfig-file))) (when (projectile-file-exists-p dirconfig) (with-temp-buffer - (insert-file-contents-literally dirconfig) + (insert-file-contents dirconfig) (while (not (eobp)) (pcase (char-after) (?+ (push (buffer-substring (1+ (point)) (line-end-position)) keep)) diff --git a/test/projectile-test.el b/test/projectile-test.el index d64b97f..619b268 100644 --- a/test/projectile-test.el +++ b/test/projectile-test.el @@ -127,7 +127,7 @@ (ert-deftest projectile-test-parse-dirconfig-file () (noflet ((file-exists-p (filename) t) (file-truename (filename) filename) - (insert-file-contents-literally + (insert-file-contents (filename) (save-excursion (insert |