2 new commits in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/b3a2bff825c8/
changeset: b3a2bff825c8
user: sperber
date: 2013-03-02 18:00:42
summary: Make f?boundp less necessary.
2013-03-02 Michael Sperber <mike(a)xemacs.org>
* bytecomp.el (byte-compile-if): Port this patch from GNU Emacs:
Author: Dave Love <fx(a)gnu.org>
Date: Thu Dec 12 20:27:43 2002 +0000
(byte-compile-if): Suppress warnings from
things protected by `(if (fboundp ...' or `(if (boundp ...'.
affected #: 2 files
diff -r fffa151380192308e890528ce556f70a19da6e93 -r
b3a2bff825c840944f997050fb558cb2d8ed8a43 lisp/ChangeLog
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-02 Michael Sperber <mike(a)xemacs.org>
+
+ * bytecomp.el (byte-compile-if): Port this patch from GNU Emacs:
+
+ Author: Dave Love <fx(a)gnu.org>
+ Date: Thu Dec 12 20:27:43 2002 +0000
+
+ (byte-compile-if): Suppress warnings from
+ things protected by `(if (fboundp ...' or `(if (boundp ...'.
+
2013-02-20 Michael Sperber <mike(a)xemacs.org>
* files.el (file-remote-p): Remove an ancient piece of obsolete
diff -r fffa151380192308e890528ce556f70a19da6e93 -r
b3a2bff825c840944f997050fb558cb2d8ed8a43 lisp/bytecomp.el
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -4160,19 +4160,53 @@
(defun byte-compile-if (form)
(byte-compile-form (car (cdr form)))
- (if (null (nthcdr 3 form))
- ;; No else-forms
- (let ((donetag (byte-compile-make-tag)))
- (byte-compile-goto-if nil for-effect donetag)
- (byte-compile-form (nth 2 form) for-effect)
- (byte-compile-out-tag donetag))
- (let ((donetag (byte-compile-make-tag)) (elsetag (byte-compile-make-tag)))
- (byte-compile-goto 'byte-goto-if-nil elsetag)
- (byte-compile-form (nth 2 form) for-effect)
- (byte-compile-goto 'byte-goto donetag)
- (byte-compile-out-tag elsetag)
- (byte-compile-body (cdr (cdr (cdr form))) for-effect)
- (byte-compile-out-tag donetag)))
+ ;; Check whether we have `(if (fboundp ...' or `(if (boundp ...'
+ ;; and avoid warnings about the relevent symbols in the consequent.
+ (let* ((clause (nth 1 form))
+ (fbound (if (eq 'fboundp (car-safe clause))
+ (and (eq 'quote (car-safe (nth 1 clause)))
+ ;; Ignore if the symbol is already on the
+ ;; unresolved list.
+ (not (assq
+ (nth 1 (nth 1 clause)) ; the relevant symbol
+ byte-compile-unresolved-functions))
+ (nth 1 (nth 1 clause)))))
+ (bound (if (eq 'boundp (car-safe clause))
+ (and (eq 'quote (car-safe (nth 1 clause)))
+ (nth 1 (nth 1 clause)))))
+ (donetag (byte-compile-make-tag)))
+ (if (null (nthcdr 3 form))
+ ;; No else-forms
+ (progn
+ (byte-compile-goto-if nil for-effect donetag)
+ ;; Maybe add to the bound list.
+ (let ((byte-compile-bound-variables
+ (if bound
+ (cons bound byte-compile-bound-variables)
+ byte-compile-bound-variables)))
+ (byte-compile-form (nth 2 form) for-effect))
+ ;; Maybe remove the function symbol from the unresolved list.
+ (if fbound
+ (setq byte-compile-unresolved-functions
+ (delq (assq fbound byte-compile-unresolved-functions)
+ byte-compile-unresolved-functions)))
+ (byte-compile-out-tag donetag))
+ (let ((elsetag (byte-compile-make-tag)))
+ (byte-compile-goto 'byte-goto-if-nil elsetag)
+ ;; As above for the first form.
+ (let ((byte-compile-bound-variables
+ (if bound
+ (cons bound byte-compile-bound-variables)
+ byte-compile-bound-variables)))
+ (byte-compile-form (nth 2 form) for-effect))
+ (if fbound
+ (setq byte-compile-unresolved-functions
+ (delq (assq fbound byte-compile-unresolved-functions)
+ byte-compile-unresolved-functions)))
+ (byte-compile-goto 'byte-goto donetag)
+ (byte-compile-out-tag elsetag)
+ (byte-compile-body (cdr (cdr (cdr form))) for-effect)
+ (byte-compile-out-tag donetag))))
(setq for-effect nil))
(defun byte-compile-cond (clauses)
https://bitbucket.org/xemacs/xemacs/commits/179f4a9201b5/
changeset: 179f4a9201b5
user: sperber
date: 2013-03-05 08:55:56
summary: Merge.
affected #: 5 files
diff -r b3a2bff825c840944f997050fb558cb2d8ed8a43 -r
179f4a9201b5e056371ea83f50879a2384d69157 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-03-04 Jerry James <james(a)xemacs.org>
+
+ * configure.ac: Complete removal of need_modules_common, forgotten
+ in the previous patch.
+
+2013-03-02 Jerry James <james(a)xemacs.org>
+
+ * configure.ac: Make symbolic links in src for module source files
+ if they are built into the executable, so they are built with the
+ same CFLAGS as the non-module source files.
+
2013-01-04 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.33 "horseradish" is released.
diff -r b3a2bff825c840944f997050fb558cb2d8ed8a43 -r
179f4a9201b5e056371ea83f50879a2384d69157 configure
--- a/configure
+++ b/configure
@@ -15216,10 +15216,14 @@
done
LIBS="$save_LIBS"
- MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test
"$verbose" = "yes"; then echo " Appending
\"modules/ldap\" to \$MAKE_SUBDIR"; fi
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test
"$verbose" = "yes"; then echo " Appending
\"modules/ldap\" to \$MAKE_SUBDIR"; fi
INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" &&
if test "$verbose" = "yes"; then echo " Appending
\"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ else
+ mkdir src
+ for fil in eldap.c eldap.h; do
+ ${LN_S} "$srcdir/modules/ldap/$fil" "src/$fil"
+ done
fi
fi
@@ -15388,10 +15392,14 @@
_ACEOF
postgresql_libs="$pq_libs $postgresql_libs" && if test
"$verbose" = "yes"; then echo " Prepending
\"$pq_libs\" to \$postgresql_libs"; fi
- MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test
"$verbose" = "yes"; then echo " Appending
\"modules/postgresql\" to \$MAKE_SUBDIR"; fi
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test
"$verbose" = "yes"; then echo " Appending
\"modules/postgresql\" to \$MAKE_SUBDIR"; fi
INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql"
&& if test "$verbose" = "yes"; then echo " Appending
\"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ else
+ mkdir src
+ for fil in postgresql.c postgresql.h; do
+ ${LN_S} "$srcdir/modules/postgresql/$fil" "src/$fil"
+ done
fi
elif test "$with_postgresql" = "yes"; then
{ echo "Error:" "Required PostgreSQL support cannot be provided.
Check --with-site-prefixes." >&2; exit 1; }
@@ -17431,10 +17439,12 @@
test -n "$canna_wchar_aware" && $as_echo "#define
CANNA_NEW_WCHAR_AWARE 1" >>confdefs.h
- MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test
"$verbose" = "yes"; then echo " Appending
\"modules/canna\" to \$MAKE_SUBDIR"; fi
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test
"$verbose" = "yes"; then echo " Appending
\"modules/canna\" to \$MAKE_SUBDIR"; fi
INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/canna"
&& if test "$verbose" = "yes"; then echo " Appending
\"modules/canna\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ else
+ mkdir src
+ ${LN_S} "$srcdir/modules/canna/canna_api.c" "src/canna_api.c"
fi
canna_libs="-lcanna -lRKC $canna_libs" && if test
"$verbose" = "yes"; then echo " Prepending \"-lcanna
-lRKC\" to \$canna_libs"; fi
elif test "$with_canna" != "no"; then
@@ -20727,7 +20737,7 @@
fi
done
-if test "$need_modules_common" = "yes"; then
+if test "$with_modules" = "yes"; then
for dir in modules/common; do
if test ! -d "$dir" ; then
echo Making symbolic link to "$srcdir/$dir"
diff -r b3a2bff825c840944f997050fb558cb2d8ed8a43 -r
179f4a9201b5e056371ea83f50879a2384d69157 configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3613,10 +3613,14 @@
save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
LIBS="$save_LIBS"
- XE_APPEND(modules/ldap, MAKE_SUBDIR)
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ XE_APPEND(modules/ldap, MAKE_SUBDIR)
XE_APPEND(modules/ldap, INSTALL_ARCH_DEP_SUBDIR)
+ else
+ mkdir src
+ for fil in eldap.c eldap.h; do
+ ${LN_S} "$srcdir/modules/ldap/$fil" "src/$fil"
+ done
fi
fi
AC_SUBST(ldap_libs)
@@ -3664,10 +3668,14 @@
AC_DEFINE(HAVE_POSTGRESQLV7)], [:], $extra_libs)
AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file")
XE_PREPEND([$pq_libs], postgresql_libs)
- XE_APPEND(modules/postgresql, MAKE_SUBDIR)
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ XE_APPEND(modules/postgresql, MAKE_SUBDIR)
XE_APPEND(modules/postgresql, INSTALL_ARCH_DEP_SUBDIR)
+ else
+ mkdir src
+ for fil in postgresql.c postgresql.h; do
+ ${LN_S} "$srcdir/modules/postgresql/$fil" "src/$fil"
+ done
fi
elif test "$with_postgresql" = "yes"; then
XE_DIE("Required PostgreSQL support cannot be provided. Check
--with-site-prefixes.")
@@ -4340,10 +4348,12 @@
if test "$have_canna" = "yes"; then
AC_DEFINE(HAVE_CANNA)
test -n "$canna_wchar_aware" && AC_DEFINE(CANNA_NEW_WCHAR_AWARE)
- XE_APPEND(modules/canna, MAKE_SUBDIR)
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ XE_APPEND(modules/canna, MAKE_SUBDIR)
XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR)
+ else
+ mkdir src
+ ${LN_S} "$srcdir/modules/canna/canna_api.c" "src/canna_api.c"
fi
XE_PREPEND(-lcanna -lRKC, canna_libs)
elif test "$with_canna" != "no"; then
@@ -5359,7 +5369,7 @@
done
dnl Also make modules/common link if needed for the module Makefiles.
-if test "$need_modules_common" = "yes"; then
+if test "$with_modules" = "yes"; then
for dir in modules/common; do
if test ! -d "$dir" ; then
echo Making symbolic link to "$srcdir/$dir"
diff -r b3a2bff825c840944f997050fb558cb2d8ed8a43 -r
179f4a9201b5e056371ea83f50879a2384d69157 src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-02 Jerry James <james(a)xemacs.org>
+
+ * Makefile.in.in: If modules are built into the executable, assume
+ that module source files are available in the current directory,
+ since configure now creates soft links for them.
+
2013-02-22 Michael Sperber <mike(a)xemacs.org>
* event-stream.c (post_command_hook): Don't complain about throws
diff -r b3a2bff825c840944f997050fb558cb2d8ed8a43 -r
179f4a9201b5e056371ea83f50879a2384d69157 src/Makefile.in.in
--- a/src/Makefile.in.in
+++ b/src/Makefile.in.in
@@ -192,7 +192,7 @@
#endif
#if defined(HAVE_LDAP) && !defined(HAVE_SHLIB)
-ldap_objs=$(BLDMODULES)/ldap/eldap.o
+ldap_objs=eldap.o
#endif
#ifdef MULE
@@ -200,7 +200,7 @@
#endif
#if defined(HAVE_CANNA) && !defined(HAVE_SHLIB)
-mule_canna_objs=$(BLDMODULES)/canna/canna_api.o
+mule_canna_objs=canna_api.o
#endif
#ifdef HAVE_WNN
@@ -215,7 +215,7 @@
#endif
#if defined(HAVE_POSTGRESQL) && !defined(HAVE_SHLIB)
-postgresql_objs=$(BLDMODULES)/postgresql/postgresql.o
+postgresql_objs=postgresql.o
#endif
#ifdef HAVE_WIN32_PROCESSES
Repository URL:
https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches