diff options
| author | Ken Brown | 2019-07-15 09:32:49 -0400 |
|---|---|---|
| committer | Ken Brown | 2019-07-21 10:40:54 -0400 |
| commit | 8b13ec1d7022b05ce71982c83f320d5272b92de7 (patch) | |
| tree | 19e21f261d255ca52d9de7fe7e181579cde0c056 /test/src | |
| parent | 0c48c0d0b241c1f3d089be033a7dea3a9b947ca5 (diff) | |
| download | emacs-8b13ec1d7022b05ce71982c83f320d5272b92de7.tar.gz emacs-8b13ec1d7022b05ce71982c83f320d5272b92de7.zip | |
Fix expand-file-name for names starting with '~'
* src/fileio.c: (file_name_absolute_no_tilde_p):
New static function.
(Fexpand_file_name): If the current buffer's default-directory
starts with "~user" where "user" is not a valid user name, don't
give the '~' a special meaning. Just treat the value of
default-directory as a relative name. (Bug#36502)
* test/src/fileio-tests.el
(fileio-tests--relative-default-directory): Add a test.
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/fileio-tests.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el index 0e0230a145d..813ee5f798f 100644 --- a/test/src/fileio-tests.el +++ b/test/src/fileio-tests.el | |||
| @@ -131,4 +131,8 @@ Also check that an encoding error can appear in a symlink." | |||
| 131 | (ert-deftest fileio-tests--relative-default-directory () | 131 | (ert-deftest fileio-tests--relative-default-directory () |
| 132 | "Test expand-file-name when default-directory is relative." | 132 | "Test expand-file-name when default-directory is relative." |
| 133 | (let ((default-directory "some/relative/name")) | 133 | (let ((default-directory "some/relative/name")) |
| 134 | (should (file-name-absolute-p (expand-file-name "foo"))))) | 134 | (should (file-name-absolute-p (expand-file-name "foo")))) |
| 135 | (let* ((default-directory "~foo") | ||
| 136 | (name (expand-file-name "bar"))) | ||
| 137 | (should (and (file-name-absolute-p name) | ||
| 138 | (not (eq (aref name 0) ?~)))))) | ||