b9972d7223
- Backport of bugfixes from F-12 branch (spec file changelog entries follow) - Backport fixes for bugs 516391, 484830, 474958 from F-13 branch (Jonathan G. Underwood) - Add cwd to load-path in byte-compile macro for add-on packaging (Jonathan G. Underwood) - Add some commentary to spec file (Jonathan G. Underwood) - Add patch to fix rhbz#547566 from Juanma Barranquero (Jonathan G. Underwood) - Simpler fix for rhbz#517272 (Karel Klic) - Fixed rhbz#545398 - ETags messes up filenames (Karel Klic) - fix #543046 - Using scroll bar in emacs highlights/selects text (Daniel Novotny)
20 lines
641 B
Diff
20 lines
641 B
Diff
diff -up emacs-23.1/lib-src/etags.c.memmove emacs-23.1/lib-src/etags.c
|
|
--- emacs-23.1/lib-src/etags.c.memmove 2009-06-21 06:37:34.000000000 +0200
|
|
+++ emacs-23.1/lib-src/etags.c 2009-12-08 17:55:41.442792036 +0100
|
|
@@ -6695,13 +6695,13 @@ absolute_filename (file, dir)
|
|
else if (cp[0] != '/')
|
|
cp = slashp;
|
|
#endif
|
|
- strcpy (cp, slashp + 3);
|
|
+ memmove (cp, slashp + 3, strlen(slashp + 2));
|
|
slashp = cp;
|
|
continue;
|
|
}
|
|
else if (slashp[2] == '/' || slashp[2] == '\0')
|
|
{
|
|
- strcpy (slashp, slashp + 2);
|
|
+ memmove (slashp, slashp + 2, strlen(slashp + 1));
|
|
continue;
|
|
}
|
|
}
|