etags: Downcase drive letters, for consistency with Emacs proper.

* etags.c (upcase): Remove; no longer used.
(canonicalize_filename): Downcase drive letters.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c30e71b8400576ebb88a7c5413a223d13597b8b9..84e2ac3978605f5a25490357046ecc8475e12524 100644 (file)
--- 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 9ca10776259a70d8244082e817181ea19d86900c..29b830151be9b09b838bafa730794ad2a0f30f6c 100644 (file)
--- 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