Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
   Add lisp/emacs-lisp/macroexp.el

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

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

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

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

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

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

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

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

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

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

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

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

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


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

3 files changed, 43 insertions, 15 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 6ea0e8be97a..5758a6d0b89 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,18 @@
+2004-02-14  Paul Eggert  <eggert@twinsun.com>
+
+        * rcs2log: Work correctly if CVSROOT specifies :fork: or
+        :local: methods, or omits the colon between the hostname
+        and the path.  Allow :/ in repository path, since CVS does.
+        Fix typo: "pository" should be set from $CVSROOT, not $repository.
+        This fixes a bug reported by Wolfgang Scherer in
+        <http://mail.gnu.org/archive/html/bug-gnu-emacs/2004-02/msg00085.html>,
+        along with some related bugs I discovered by inspecting how
+        CVS itself parses $CVSROOT.
+
+2004-02-04  J,bi(Br,bt(Bme Marant <jmarant@nerim.net> (tiny)
+
+        * emacsclient.c (decode_options): Fix handling of alternate editor.
+
 2004-01-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacsclient.c (main): Don't use the hostname in the socket name.
@@ -14,6 +29,12 @@
         Only try su-fallback if the socket name was not explicit.
         Check socket name length in su-fallback case as well.
 
+2004-01-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacsclient.c (main): Stop if socket name too long.
+        Only try su-fallback if the socket name was not explicit.
+        Check socket name length in su-fallback case as well.
+
 2004-01-08  Andreas Schwab  <schwab@suse.de>
 
         * emacsclient.c (main): Save errno from socket_status.
@@ -54,7 +75,7 @@
 
 2003-08-25  Takaaki Ota  <Takaaki.Ota@am.sony.com>  (tiny change)
 
-        * etags.c (consider_token): check C++ `operator' only when the
+        * etags.c (consider_token): Check C++ `operator' only when the
         token len is long enough.
 
 2003-08-20  Dave Love  <fx@gnu.org>
@@ -5493,7 +5514,8 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
+    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+        1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
         Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 0f42f096643..771eeac05e6 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -106,6 +106,8 @@ decode_options (argc, argv)
      int argc;
      char **argv;
 {
+  alternate_editor = getenv ("ALTERNATE_EDITOR");
+
   while (1)
     {
       int opt = getopt_long (argc, argv,
@@ -114,8 +116,6 @@ decode_options (argc, argv)
       if (opt == EOF)
         break;
 
-      alternate_editor = getenv ("ALTERNATE_EDITOR");
-
       switch (opt)
         {
         case 0:
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 4400fb72578..658a30c789b 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -29,10 +29,10 @@ Options:
 
 Report bugs to <bug-gnu-emacs@gnu.org>.'
 
-Id='$Id: rcs2log,v 1.52 2003/12/27 08:18:08 uid65632 Exp $'
+Id='$Id: rcs2log,v 1.53 2004/02/15 07:41:58 uid65632 Exp $'
 
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003
-#  Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
+# 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ Id='$Id: rcs2log,v 1.52 2003/12/27 08:18:08 uid65632 Exp $'
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-Copyright='Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2004 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
@@ -251,18 +251,24 @@ case $rlogfile in
                 rlog='cvs -q log'
                 repository=`sed 1q <CVS/Repository` || exit
                 test ! -f CVS/Root || CVSROOT=`cat <CVS/Root` || exit
+                pository=
                 case $CVSROOT in
-                *:/*:/*)
-                        echo >&2 "$0: $CVSROOT: CVSROOT has multiple ':/'s"
-                        exit 1;;
-                *:/*)
+                /* | :fork:* | :local:*) ;;
+                */*)
                         # remote repository
-                        pository=`expr "X$repository" : '.*:\(/.*\)'`;;
-                *)
+                        pository=`expr "X$CVSROOT" : '[^/]*\(.*\)'`;;
+                esac
+                case $pository in
+                '')
                         # local repository
                         case $repository in
                         /*) ;;
-                        *) repository=${CVSROOT?}/$repository;;
+                        *)
+                                repository=${CVSROOT?}/$repository
+                                case $repository in
+                                :fork:* | :local:*)
+                                        repository=`expr "$repository" : ':[^:]*:\(.*\)'`;;
+                                esac;;
                         esac
                         if test ! -d "$repository"
                         then