# HG changeset patch # User cvs # Date 1186992166 -7200 # Node ID 92f8ad5d0d3f87eae6ae2aeafabbfdb82f26a411 # Parent a15e4b3d59c6847c8f9dc6e4343d1afc44e9277a Import from CVS: tag r20-4b1 diff -r a15e4b3d59c6 -r 92f8ad5d0d3f CHANGES-beta --- a/CHANGES-beta Mon Aug 13 10:02:23 2007 +0200 +++ b/CHANGES-beta Mon Aug 13 10:02:46 2007 +0200 @@ -1,4 +1,8 @@ -*- indented-text -*- +to 20.4 beta1 "Century" +-- Version fork, package work will be carried on in this branch +-- Miscellaneous bug fixes + to 20.3 beta28 "Reykjavik" -- about.el additions and updates -- See etc/BETA for initial package documentation diff -r a15e4b3d59c6 -r 92f8ad5d0d3f ChangeLog --- a/ChangeLog Mon Aug 13 10:02:23 2007 +0200 +++ b/ChangeLog Mon Aug 13 10:02:46 2007 +0200 @@ -1,5 +1,15 @@ +1997-10-12 SL Baur + + * XEmacs 20.4-beta1 is released. + + * XEmacs 19.16-pre9 is released. + + * XEmacs 19.16-pre8 is released. + 1997-10-11 SL Baur + * XEmacs 20.3-beta28 is released. + * Makefile.in (src/paths.h): Update PATH_INFOPATH (infopath): New shell variable. (infopath_user_defined): Ditto. diff -r a15e4b3d59c6 -r 92f8ad5d0d3f README --- a/README Mon Aug 13 10:02:23 2007 +0200 +++ b/README Mon Aug 13 10:02:46 2007 +0200 @@ -1,4 +1,4 @@ -This directory tree holds version 20.3 of XEmacs, the extensible, +This directory tree holds version 20.4 of XEmacs, the extensible, customizable, self-documenting real-time display editor. See the file `etc/NEWS' for information on new features and other diff -r a15e4b3d59c6 -r 92f8ad5d0d3f lisp/ChangeLog --- a/lisp/ChangeLog Mon Aug 13 10:02:23 2007 +0200 +++ b/lisp/ChangeLog Mon Aug 13 10:02:46 2007 +0200 @@ -1,3 +1,8 @@ +1997-10-12 SL Baur + + * prim/package-admin.el (package-admin-add-binary-package): + Correctly deal with package-paths with a single directory. + 1997-10-11 SL Baur * prim/startup.el (set-default-load-path): Look for `packages' diff -r a15e4b3d59c6 -r 92f8ad5d0d3f lisp/prim/package-admin.el --- a/lisp/prim/package-admin.el Mon Aug 13 10:02:23 2007 +0200 +++ b/lisp/prim/package-admin.el Mon Aug 13 10:02:46 2007 +0200 @@ -63,7 +63,10 @@ "Install a pre-bytecompiled XEmacs package into package hierarchy." (interactive "fPackage tarball: ") (when (null pkg-dir) - (setq pkg-dir (cadr package-path))) + (when (or (not (listp package-path)) + (not package-path)) + (error "No package path")) + (setq pkg-dir (car (last package-path)))) (let ((buf (get-buffer-create package-admin-temp-buffer))) (call-process "add-big-package.sh" diff -r a15e4b3d59c6 -r 92f8ad5d0d3f src/ChangeLog --- a/src/ChangeLog Mon Aug 13 10:02:23 2007 +0200 +++ b/src/ChangeLog Mon Aug 13 10:02:46 2007 +0200 @@ -1,5 +1,25 @@ +1997-10-12 SL Baur + + * src/s/freebsd.h: Add X11 guard for building without X11. + From Hrvoje Niksic + +1997-10-12 Kyle Jones + + * src/doprnt.c (emacs_doprnt_1): if forwarded field width + is negative, set minus_flag and make the field width + positive. Makes (format "%*s" -10 "abc") work like + (format "%-*s" 10 "abc"). + +1997-10-12 SL Baur + + * unexsol2.c (unexec): CONST isn't defined here. + From Adrian Aichner + 1997-10-11 SL Baur + * realpath.c (realpath): CONST IS LOSING but removing it conflicts + with system headers. + * callproc.c: New variable infopath-internal. (complex_vars_of_callproc): Declare and initialized it. diff -r a15e4b3d59c6 -r 92f8ad5d0d3f src/doprnt.c --- a/src/doprnt.c Mon Aug 13 10:02:23 2007 +0200 +++ b/src/doprnt.c Mon Aug 13 10:02:46 2007 +0200 @@ -500,6 +500,11 @@ else { nextspec->minwidth = XINT (obj); + if (XINT(obj) < 0) + { + spec->minus_flag = 1; + nextspec->minwidth = - nextspec->minwidth; + } } nextspec->minus_flag = spec->minus_flag; nextspec->plus_flag = spec->plus_flag; diff -r a15e4b3d59c6 -r 92f8ad5d0d3f src/realpath.c --- a/src/realpath.c Mon Aug 13 10:02:23 2007 +0200 +++ b/src/realpath.c Mon Aug 13 10:02:46 2007 +0200 @@ -59,10 +59,10 @@ #define MAX_READLINKS 32 #ifdef __STDC__ -char *realpath(CONST char *path, char resolved_path []) +char *realpath(const char *path, char resolved_path []) #else char *realpath(path, resolved_path) -CONST char *path; +const char *path; char resolved_path []; #endif { diff -r a15e4b3d59c6 -r 92f8ad5d0d3f src/s/freebsd.h --- a/src/s/freebsd.h Mon Aug 13 10:02:23 2007 +0200 +++ b/src/s/freebsd.h Mon Aug 13 10:02:46 2007 +0200 @@ -35,11 +35,13 @@ /* Kludge to work around setlocale(LC_ALL,...) not working after 01/1997 */ #if __FreeBSD_version >= 199701 +#ifdef HAVE_X_WINDOWS #ifndef NOT_C_CODE #include #define setlocale(locale_category, locale_spec) setlocale(LC_CTYPE, locale_spec) #endif /* C code */ #endif +#endif #define LIBS_TERMCAP "-ltermcap" diff -r a15e4b3d59c6 -r 92f8ad5d0d3f src/unexsol2.c --- a/src/unexsol2.c Mon Aug 13 10:02:23 2007 +0200 +++ b/src/unexsol2.c Mon Aug 13 10:02:46 2007 +0200 @@ -20,7 +20,7 @@ /* Synched up with: Not in FSF. */ -/* #pragma ident "@(#) $Id: unexsol2.c,v 1.2 1997/10/12 01:40:18 steve Exp $" */ +/* #pragma ident "@(#) $Id: unexsol2.c,v 1.3 1997/10/13 03:35:33 steve Exp $" */ #include #include @@ -36,7 +36,7 @@ unsigned int bss_start, unsigned int entry_address) { void *handle; - void (*func)(CONST char *file); + void (*func)(const char *file); if ((handle = dlopen (DYNODUMP_SO, RTLD_LAZY)) == NULL) { @@ -45,7 +45,7 @@ exit (1); } - if ((func = (void (*)(CONST char *)) dlsym (handle, DYNODUMP_SYM)) == NULL) + if ((func = (void (*)(const char *)) dlsym (handle, DYNODUMP_SYM)) == NULL) { fprintf (stderr, "unexec(): dlsym(%s): %s \n", (char *) DYNODUMP_SYM, dlerror()); diff -r a15e4b3d59c6 -r 92f8ad5d0d3f version.sh --- a/version.sh Mon Aug 13 10:02:23 2007 +0200 +++ b/version.sh Mon Aug 13 10:02:46 2007 +0200 @@ -1,5 +1,5 @@ #!/bin/sh emacs_major_version=20 -emacs_minor_version=3 -emacs_beta_version=28 -xemacs_codename="Reykjavik" +emacs_minor_version=4 +emacs_beta_version=1 +xemacs_codename="Century"