diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-22 09:37:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-22 09:37:06 -0800 |
| commit | e5075711e5a6ba7a82691f3daf4d84b067efb854 (patch) | |
| tree | 249060cb9515f9fdcb0e1a812e6db29bbc476228 /lib-src | |
| parent | bdaa0745ee781a8d03b4015ea75e8deb410179e8 (diff) | |
| download | emacs-e5075711e5a6ba7a82691f3daf4d84b067efb854.tar.gz | |
etags: Downcase drive letters, for consistency with Emacs proper.
* etags.c (upcase): Remove; no longer used.
(canonicalize_filename): Downcase drive letters.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/etags.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c30e71b8400..84e2ac39786 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,9 @@ 2011-02-22 Paul Eggert <eggert@cs.ucla.edu> + etags: Downcase drive letters, for consistency with Emacs proper. + * etags.c (upcase): Remove; no longer used. + (canonicalize_filename): Downcase drive letters. + Assume S_ISLNK etc. work, since gnulib supports this. * etags.c (S_ISREG): Remove. diff --git a/lib-src/etags.c b/lib-src/etags.c index 9ca10776259..29b830151be 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -239,7 +239,6 @@ If you want regular expression support, you should delete this notice and #define ISLOWER(c) islower (CHAR(c)) #define lowcase(c) tolower (CHAR(c)) -#define upcase(c) toupper (CHAR(c)) /* @@ -6638,7 +6637,7 @@ filename_is_absolute (char *fn) ); } -/* Upcase DOS drive letter and collapse separators into single slashes. +/* Downcase DOS drive letter and collapse separators into single slashes. Works in place. */ static void canonicalize_filename (register char *fn) @@ -6648,8 +6647,8 @@ canonicalize_filename (register char *fn) #ifdef DOS_NT /* Canonicalize drive letter case. */ - if (fn[0] != '\0' && fn[1] == ':' && ISLOWER (fn[0])) - fn[0] = upcase (fn[0]); + if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0])) + fn[0] = downcase (fn[0]); sep = '\\'; #endif |