Merged in changes from CVS trunk.

Patches applied:

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-549
   Use symbol-matching for generic-mode keywords

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

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


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

2 files changed, 10 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index b0960f9a98b..c04bdf2f094 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,11 @@
 2004-09-13  Francesco Potort,Al(B  <pot@gnu.org>
 
+        * etags.c (main): When relative file names are given as argument,
+        make them relative to the current working dir, rather than
+        relative to the output tags file, if the latter is in /dev.
+
+2004-09-13  Francesco Potort,Al(B  <pot@gnu.org>
+
         * etags.c [EXIT_SUCCESS, EXIT_FAILURE]: Define them when no
         <stdlib.h> is available.
         (enum sym_type): New st_C_attribute value for parsing
diff --git a/lib-src/etags.c b/lib-src/etags.c
index f68c2e2bb95..a6004a048a9 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -40,7 +40,7 @@
  * configuration file containing regexp definitions for etags.
  */
 
-char pot_etags_version[] = "@(#) pot revision number is 17.4";
+char pot_etags_version[] = "@(#) pot revision number is 17.5";
 
 #define TRUE    1
 #define FALSE   0
@@ -1314,7 +1314,9 @@ main (argc, argv)
       cwd = concat (oldcwd, "/", "");
       free (oldcwd);
     }
-  if (streq (tagfile, "-"))
+  /* Relative file names are made relative to the current directory. */
+  if (streq (tagfile, "-")
+      || strneq (tagfile, "/dev/", 5))
     tagfiledir = cwd;
   else
     tagfiledir = absolute_dirname (tagfile, cwd);