Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-241
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-242
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-243
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-244
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-245
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-246
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248
   src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-250
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-251
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-252
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-253
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-254
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-255
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-153

2 files changed, 17 insertions, 5 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index eaf07239901..e2fcc6cc939 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * make-docfile.c (IS_DIRECTORY_SEP): New macro.
+        (put_filename): Remove unused variable len.  Use IS_DIRECTORY_SEP
+        instead of a literal '/'.
+
 2004-04-23  Juanma Barranquero  <lektu@terra.es>
 
         * makefile.w32-in: Add "-*- makefile -*-" mode tag.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index ba73f5800a7..1c0bc559225 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -60,6 +60,10 @@ Boston, MA 02111-1307, USA.  */
 #define READ_BINARY "r"
 #endif /* not DOS_NT */
 
+#ifndef IS_DIRECTORY_SEP
+#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/')
+#endif
+
 int scan_file ();
 int scan_lisp_file ();
 int scan_c_file ();
@@ -183,11 +187,13 @@ void
 put_filename (filename)
      char *filename;
 {
-  char *tmp = filename;
-  int len;
-  
-  while ((tmp = index (filename, '/')))
-    filename = tmp + 1;
+  char *tmp;
+
+  for (tmp = filename; *tmp; tmp++)
+    {
+      if (IS_DIRECTORY_SEP(*tmp))
+        filename = tmp + 1;
+    }
 
   putc (037, outfile);
   putc ('S', outfile);