This commit was generated by cvs2svn to compensate for changes in r48, which

included commits to RCS files with non-trunk default branches.

diff --git a/dynodump/_dynodump.h b/dynodump/_dynodump.h
index 847c4eb..c09bd7f 100644 (file)
--- a/dynodump/_dynodump.h
+++ b/dynodump/_dynodump.h
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident  "@(#) $Id: _dynodump.h,v 1.3 1997/05/29 04:22:29 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: _dynodump.h,v 1.5 1996/05/23 18:39:07 georgn Exp $ - SMI"
 
 #ifndef        _DYNODUMP_DOT_H
 #define        _DYNODUMP_DOT_H

diff --git a/dynodump/dynodump.c b/dynodump/dynodump.c
index ff4477d..b684813 100644 (file)
--- a/dynodump/dynodump.c
+++ b/dynodump/dynodump.c
@@ -73,7 +73,7 @@
  * N.B. The above commentary is not quite correct in the flags have been hardwired
  *      to RTLD_SAVREL.
  */
-#pragma ident  "@(#) $Id: dynodump.c,v 1.6 1998/03/31 20:10:55 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: dynodump.c,v 1.8 1996/05/23 18:39:21 georgn Exp $ - SMI"
 
 #define __EXTENSIONS__ 1
 

diff --git a/dynodump/i386/_relocate.c b/dynodump/i386/_relocate.c
index f97dd1b..d3ec59c 100644 (file)
--- a/dynodump/i386/_relocate.c
+++ b/dynodump/i386/_relocate.c
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident  "@(#) $Id: _relocate.c,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: _relocate.c,v 1.4 1995/06/26 20:12:41 georgn Exp $ - SMI"
 
 /* LINTLIBRARY */
 

diff --git a/dynodump/i386/machdep.h b/dynodump/i386/machdep.h
index 4dc66fe..c90e29c 100644 (file)
--- a/dynodump/i386/machdep.h
+++ b/dynodump/i386/machdep.h
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident  "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:43 georgn Exp $ - SMI"
 
 /*
  * Global include file for all sgs Intel machine dependent macros, constants

diff --git a/dynodump/ppc/_relocate.c b/dynodump/ppc/_relocate.c
index 754b417..feb5ca9 100644 (file)
--- a/dynodump/ppc/_relocate.c
+++ b/dynodump/ppc/_relocate.c
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident "@(#) $Id: _relocate.c,v 1.4 1998/03/31 20:10:55 steve Exp $ - SMI"
+#pragma ident "@(#) $Id: _relocate.c,v 1.3 1995/06/26 20:16:39 georgn Exp $ - SMI"
 
 /* LINTLIBRARY */
 

diff --git a/dynodump/ppc/machdep.h b/dynodump/ppc/machdep.h
index a649a9c..2a3d1e6 100644 (file)
--- a/dynodump/ppc/machdep.h
+++ b/dynodump/ppc/machdep.h
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:20 steve Exp $ - SMI"
+#pragma ident "@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:49 georgn Exp $ - SMI"
 
 /*
  * Global include file for all sgs PowerPC machine dependent macros, constants

diff --git a/dynodump/sparc/_relocate.c b/dynodump/sparc/_relocate.c
index 14466f0..10b0fda 100644 (file)
--- a/dynodump/sparc/_relocate.c
+++ b/dynodump/sparc/_relocate.c
@@ -35,7 +35,7 @@
 /*
  * Update the value of the `_edata' and `_end' symbols.
  */
-#pragma ident  "@(#) $Id: _relocate.c,v 1.4 1998/03/31 20:10:55 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: _relocate.c,v 1.4 1995/06/26 20:13:26 georgn Exp $ - SMI"
 
 #include       <libelf.h>
 #include       <string.h>

diff --git a/dynodump/sparc/machdep.h b/dynodump/sparc/machdep.h
index b4b76d8..972081e 100644 (file)
--- a/dynodump/sparc/machdep.h
+++ b/dynodump/sparc/machdep.h
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident  "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:26 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:55 georgn Exp $ - SMI"
 
 /*
  * Global include file for all sgs SPARC machine dependent macros, constants

diff --git a/dynodump/syms.c b/dynodump/syms.c
index 0ac5cb8..c060f33 100644 (file)
--- a/dynodump/syms.c
+++ b/dynodump/syms.c
@@ -35,7 +35,7 @@
 /*
  * Update the value of the `_edata' and `_end' symbols.
  */
-#pragma ident  "@(#) $Id: syms.c,v 1.3 1997/05/29 04:22:30 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: syms.c,v 1.2 1995/03/06 22:39:22 georgn Exp $ - SMI"
 
 #include       <libelf.h>
 #include       <string.h>

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bce323a..a2d2860 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+1999-02-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.10 is released
+
 1999-02-02  XEmacs Build Bot <builds@cvs.xemacs.org>
 
        * XEmacs 21.2.9 is released

diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 8fa12d9..2a9e7d1 100755 (executable)
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -28,7 +28,7 @@ Options:
 
 Report bugs to <bug-gnu-emacs@prep.ai.mit.edu>.'
 
-Id='$Id: rcs2log,v 1.2 1997/07/09 04:31:03 steve Exp $'
+Id='$Id: rcs2log,v 1.37 1997/03/21 22:19:30 eggert Exp $'
 
 # Copyright 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 

diff --git a/lisp/alist.el b/lisp/alist.el
index 6ee8b03..4a1fd3a 100644 (file)
--- a/lisp/alist.el
+++ b/lisp/alist.el
@@ -4,7 +4,7 @@
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Version:
-;;     $Id: alist.el,v 1.1 1997/11/29 20:37:43 steve Exp $
+;;     $Id: alist.el,v 0.0 1997/02/28 02:18:23 tmorioka Exp $
 ;; Keywords: alist
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).

diff --git a/lisp/ldap.el b/lisp/ldap.el
index cad6f4f..2e01edb 100644 (file)
--- a/lisp/ldap.el
+++ b/lisp/ldap.el
@@ -5,7 +5,7 @@
 ;; Author: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Maintainer: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Created: Jan 1998
-;; Version: $Revision: 1.7.2.3 $
+;; Version: $Revision: 1.7.2.2 $
 ;; Keywords: help comm
 
 ;; This file is part of XEmacs

diff --git a/lisp/lib-complete.el b/lisp/lib-complete.el
index b524c11..19e66da 100644 (file)
--- a/lisp/lib-complete.el
+++ b/lisp/lib-complete.el
@@ -38,7 +38,7 @@
 ;; Last Modified By: Heiko M|nkel <muenkel@tnt.uni-hannover.de>
 ;; Additional XEmacs integration By: Chuck Thompson <cthomp@cs.uiuc.edu>
 ;; Last Modified On: Thu Jul 1 14:23:00 1994
-;; RCS Info        : $Revision: 1.3.2.1 $ $Locker:  $
+;; RCS Info        : $Revision: 1.1 $ $Locker:  $
 ;; ========================================================================
 ;; NOTE: XEmacs must be redumped if this file is changed.
 ;;

diff --git a/lisp/package-get.el b/lisp/package-get.el
index 3acf44e..149f531 100644 (file)
--- a/lisp/package-get.el
+++ b/lisp/package-get.el
@@ -941,15 +941,19 @@ It first checks if FILENAME already is a remote filename.  If it is
 not, then it uses the (car search) as the remote site-name and the (cadr
 search) as the remote-directory and concatenates filename.  In other
 words
-       site-name:remote-directory/filename
+       site-name:remote-directory/filename.
+
+If (car search) is nil, (cadr search is interpreted as  a local directory).
 "
-  (if (efs-ftp-path filename)
+  (if (file-remote-p filename)
       filename
     (let ((dir (cadr search)))
-      (concat (if (string-match "@" (car search))
-                 "/"
-               "/anonymous@")
-             (car search) ":"
+      (concat (when (car search)
+               (concat
+                (if (string-match "@" (car search))
+                    "/"
+                  "/anonymous@")
+                (car search) ":"))
              (if (string-match "/$" dir)
                  dir
                (concat dir "/"))

diff --git a/man/ChangeLog b/man/ChangeLog
index 779dde5..1bedbed 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+1999-02-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.10 is released
+
 1999-02-02  XEmacs Build Bot <builds@cvs.xemacs.org>
 
        * XEmacs 21.2.9 is released

diff --git a/man/info.texi b/man/info.texi
index 1b6c0da..d2fda6f 100644 (file)
--- a/man/info.texi
+++ b/man/info.texi
@@ -3,7 +3,7 @@
 @setfilename ../info/info.info
 @settitle Info 1.0
 @comment %**end of header 
-@comment $Id: info.texi,v 1.4 1998/06/30 06:35:28 steve Exp $
+@comment $Id: info.texi,v 1.4 1997/07/10 21:58:11 karl Exp $
 
 @dircategory Texinfo documentation system
 @direntry

diff --git a/man/texinfo.tex b/man/texinfo.tex
index 6057ffa..3ce4715 100644 (file)
--- a/man/texinfo.tex
+++ b/man/texinfo.tex
@@ -1,5 +1,5 @@
 % texinfo.tex -- TeX macros to handle Texinfo files.
-% $Id: texinfo.tex,v 1.5 1998/06/13 04:28:12 steve Exp $
+% $Id: texinfo.tex,v 2.227 1998/02/25 22:54:34 karl Exp $
 %
 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98
 % Free Software Foundation, Inc.
@@ -44,7 +44,7 @@
 
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision: 1.5 $
+\deftexinfoversion$Revision: 2.227 $
 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % If in a .fmt file, print the version number

diff --git a/man/texinfo.texi b/man/texinfo.texi
index 1c1fd16..db6ac4a 100644 (file)
--- a/man/texinfo.texi
+++ b/man/texinfo.texi
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
-@c $Id: texinfo.texi,v 1.8 1998/06/30 06:35:31 steve Exp $
+@c $Id: texinfo.txi,v 1.50 1998/02/27 21:21:34 karl Exp $
 @c %**start of header
 
 @c All text is ignored before the setfilename.

diff --git a/man/xemacs-faq.texi b/man/xemacs-faq.texi
index cc3c90f..9ad5a5f 100644 (file)
--- a/man/xemacs-faq.texi
+++ b/man/xemacs-faq.texi
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 1998/12/05 16:55:03 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 1998/05/03 10:22:33 $
 @sp 1
 @author Tony Rossini <arossini@@stat.sc.edu>
 @author Ben Wing <wing@@666.com>

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 7a0a030..2c4a4ac 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+1999-02-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.10 is released
+
 1999-02-02  XEmacs Build Bot <builds@cvs.xemacs.org>
 
        * XEmacs 21.2.9 is released

diff --git a/version.sh b/version.sh
index 00a59b0..d381b53 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 emacs_major_version=21
 emacs_minor_version=2
-emacs_beta_version=9
-xemacs_codename="Athena"
+emacs_beta_version=10
+xemacs_codename="Boreas"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=1