diff options
| author | Paul Eggert | 2013-02-10 00:26:56 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-02-10 00:26:56 -0800 |
| commit | 7ba11bee64c8b4c735e016bb28aa3ee6ff7990f5 (patch) | |
| tree | 093ee3b373f66b443547c743698f46906ce71269 /src | |
| parent | 8b0590de7e8a7572954b078c381ad432eedc9a5d (diff) | |
| download | emacs-7ba11bee64c8b4c735e016bb28aa3ee6ff7990f5.tar.gz emacs-7ba11bee64c8b4c735e016bb28aa3ee6ff7990f5.zip | |
* fileio.c (Fexpand_file_name): Omit confusing pointer comparison
that was not needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fileio.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 05d69382855..a9a92e0cbab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-02-10 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * fileio.c (Fexpand_file_name): Omit confusing pointer comparison | ||
| 4 | that was not needed. | ||
| 5 | |||
| 1 | 2013-02-09 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-02-09 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Minor hashing refactoring. | 8 | Minor hashing refactoring. |
diff --git a/src/fileio.c b/src/fileio.c index 1b293e3a971..ddf23867104 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -1348,8 +1348,8 @@ filesystem tree, not (expand-file-name ".." dirname). */) | |||
| 1348 | #ifdef WINDOWSNT | 1348 | #ifdef WINDOWSNT |
| 1349 | char *prev_o = o; | 1349 | char *prev_o = o; |
| 1350 | #endif | 1350 | #endif |
| 1351 | while (o != target && (--o) && !IS_DIRECTORY_SEP (*o)) | 1351 | while (o != target && (--o, !IS_DIRECTORY_SEP (*o))) |
| 1352 | ; | 1352 | continue; |
| 1353 | #ifdef WINDOWSNT | 1353 | #ifdef WINDOWSNT |
| 1354 | /* Don't go below server level in UNC filenames. */ | 1354 | /* Don't go below server level in UNC filenames. */ |
| 1355 | if (o == target + 1 && IS_DIRECTORY_SEP (*o) | 1355 | if (o == target + 1 && IS_DIRECTORY_SEP (*o) |