diff options
| author | Juanma Barranquero | 2008-04-12 09:15:10 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-04-12 09:15:10 +0000 |
| commit | f5acc0717259c46dbe2660358dca316957aaa5d7 (patch) | |
| tree | 799561444d01ddc3520fbebdab495114a5984881 | |
| parent | 5b5a2ea177e799eba183a33aec466d62a1ca949f (diff) | |
| download | emacs-f5acc0717259c46dbe2660358dca316957aaa5d7.tar.gz emacs-f5acc0717259c46dbe2660358dca316957aaa5d7.zip | |
(Fexpand_file_name): Add declaration for `p' missing in previous change.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/fileio.c | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 75be9df4b12..dec4f11e353 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-04-12 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * fileio.c (Fexpand_file_name): Add declaration for `p' missing in | ||
| 4 | previous change. | ||
| 5 | |||
| 1 | 2008-04-12 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2008-04-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * fileio.c (Fexpand_file_name): Tighten the scope of `p' and `o' vars. | 8 | * fileio.c (Fexpand_file_name): Tighten the scope of `p' and `o' vars. |
| @@ -20,7 +25,7 @@ | |||
| 20 | 2008-04-10 Michael Albinus <michael.albinus@gmx.de> | 25 | 2008-04-10 Michael Albinus <michael.albinus@gmx.de> |
| 21 | 26 | ||
| 22 | * fileio.c (Fmake_symbolic_link): Surround code by #ifdef S_IFLNK | 27 | * fileio.c (Fmake_symbolic_link): Surround code by #ifdef S_IFLNK |
| 23 | only after check for file name handler functions. Signal, when | 28 | only after check for file name handler functions. Signal, when |
| 24 | native functionality is not supported. | 29 | native functionality is not supported. |
| 25 | (syms_of_fileio): Declare it unconditionally. | 30 | (syms_of_fileio): Declare it unconditionally. |
| 26 | 31 | ||
diff --git a/src/fileio.c b/src/fileio.c index 26b2ebdeee5..498d2bb192b 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -1545,6 +1545,7 @@ See also the function `substitute-in-file-name'. */) | |||
| 1545 | #ifdef WINDOWSNT | 1545 | #ifdef WINDOWSNT |
| 1546 | if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1])) | 1546 | if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1])) |
| 1547 | { | 1547 | { |
| 1548 | unsigned char *p; | ||
| 1548 | newdir = strcpy (alloca (strlen (newdir) + 1), newdir); | 1549 | newdir = strcpy (alloca (strlen (newdir) + 1), newdir); |
| 1549 | p = newdir + 2; | 1550 | p = newdir + 2; |
| 1550 | while (*p && !IS_DIRECTORY_SEP (*p)) p++; | 1551 | while (*p && !IS_DIRECTORY_SEP (*p)) p++; |