(readline_internal) [DOS_NT]: Don't include CRs when

computing character positions in source files.

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 97f860a96a416d283805e98b3a8c2276e788fb3f..35e396c3be70b8fc387d2efd65e888873b65615f 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4105,7 +4105,16 @@ readline_internal (linebuffer, stream)
          if (p > buffer && p[-1] == '\r')
            {
              *--p = '\0';
+#ifdef DOS_NT
+             /* Assume CRLF->LF translation will be performed by Emacs
+                when loading this file, so CRs won't appear in the buffer.
+                It would be cleaner to compensate within Emacs;
+                however, Emacs does not know how many CRs were deleted
+                before any given point in the file.  */
+             chars_deleted = 1;
+#else
              chars_deleted = 2;
+#endif
            }
          else
            {