For more details, including developers involved and dates, see the
ChangeLogs, or use CVS diff to view the patches.
+to XEmacs 21.4.6 "Common Lisp"
+
+ - Changing coding system marks buffer as modified.
+ - More file/directory dialogs available on Windows.
+ - In replace-regexp, subexpression replacement supported.
+ - Motif bug causes intermittent crashes. Patch Motif: see PROBLEMS.
+ - Common subexpression optimization caused an illegal pointer
+ reference in regexp replace; fixed.
+ - Autosave files are now saved in current coding system (where file
+ coding supported). This resolves the "doubled escape" bug common
+ in Japanese mail files, but increases the chance that autosave
+ files will contain garbage (because the buffer contents cannot be
+ saved correctly in the current coding system).
+ - Failure to save certain customizations fixed.
+ - Ability to customize fonts improved, especially the "cannot
+ customize italic" bug
+ - Window loop now properly iterates over multiple devices; some
+ problems with wrong window being selected (eg, with gnuclient)
+ resolved.
+ - Certain infloops in password prompts, etc, fixed.
+ - Make space for symbols defined in modules in Lisp symbol tables
+ - Errors due to failure to conform to pop-up menu API in GTK fixed.
+ - Cygwin URL handling in shell calls fixed.
+ - Inability to select directories fixed.
+ - Initial VC.NET support.
+ - New node on "packaging" for library developers in Lispref.
+ - Fix incorrect ctime to Lisp conversion.
+ - HP-UX LDFLAGS fix.
+ - Many typo fixes and small documentation enhancements.
+ - New section of examples of glyph usage in Lispref.
+ - Make `truncate-partial-width-windows' effect buffer-local.
+ - Suppress bogus focus changes.
+ - Fix custom's handling of font size and family.
+ - Fix comboreloc crash (common on Linux when making first frame).
+ - Default --with-ipv6-cname=no.
+ - From 21.4.5 "Civil Service (Windows)":
+ - Fixed a scrollbar problem when selecting the frame with focus.
+ - Fixed `mswindows-shell-execute' under cygwin.
+ - Added a new function `mswindows-cygwin-to-win32-path' for JDE.
+ - Added support for dialog-based directory selection.
+ - The installer version has been updated to the 21.5 netinstaller. The
+ 21.5 installer now does proper dde file association and adds uninstall
+ capability.
+ - Handle leak fix from Mike Alexander.
+ - New release build script.
+
to XEmacs 21.4.5 "Civil Service"
- Now installs arch-specific files relative to $execdir, not $prefix.
* configure.in: Add new option `--with-utf-2000'; define `UTF2000'
if it is specified.
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-04 Jan Vroonhof <jan.vroonhof@ntlworld.com>
+
+ * etc/photos/jan.png: New photo.
+
+2001-11-21 Robert Pluim <rpluim@bigfoot.com>
+
+ * PROBLEMS (Sun/Solaris): Document fix for Motif related crashes
+
+2001-12-15 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * configure.in (Miscellaneous Flags): test for -z nocombreloc,
+ instead of -z combreloc, to avoid confusing Solaris.
+
+2001-11-24 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * configure.usage: Makefile.in -> Makefile.in.in.
+
+2001-11-21 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * Makefile.in.in: HP-UX needs LDFLAGS. From Lutz Jaenicke
+ <Lutz.Jaenicke@aet.TU-Cottbus.DE>.
+
+2001-11-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * configure.in: Fix typos in comments.
+ * (Miscellaneous flags): Use -z nocombreloc if supported and !pdump.
+ * (Installation): Suggest pdump instead of -z nocomboreloc.
+ * configure.usage: Document --quick-build.
+
+2001-10-30 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * configure.in: Typo in reference to with_ipv6_cname.
+
+2001-10-30 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * configure.in: Initialize with_ipv6_cname=no.
+ * configure.usage: Document it.
+
2001-10-23 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.4.5 "Civil Service" is released.
LN_S=@LN_S@
CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
+LDFLAGS=@LDFLAGS@
## These help us choose version- and architecture-specific directories
## to install files in.
** SunOS/Solaris
+*** Crashes when using Motif libraries, especially with multiple frames.
+
+Crashes that produce C-backtraces like this:
+
+#0 0xfec9a118 in _libc_kill () from /usr/lib/libc.so.1
+#1 0x77f48 in fatal_error_signal (sig=11)
+ at /codes/rpluim/xemacs-21.4/src/emacs.c:539
+#2 <signal handler called>
+#3 0xfee929f4 in XFindContext () from /usr/openwin/lib/libX11.so.4
+#4 0xfee92930 in XFindContext () from /usr/openwin/lib/libX11.so.4
+#5 0xff297e54 in DisplayDestroy () from /usr/dt/lib/libXm.so.4
+#6 0xfefbece0 in XtCallCallbackList () from /usr/openwin/lib/libXt.so.4
+#7 0xfefc486c in XtPhase2Destroy () from /usr/openwin/lib/libXt.so.4
+#8 0xfefc45d0 in _XtDoPhase2Destroy () from /usr/openwin/lib/libXt.so.4
+#9 0xfefc43b4 in XtDestroyWidget () from /usr/openwin/lib/libXt.so.4
+#10 0x15cf9c in x_delete_device (d=0x523f00)
+
+are caused by buggy Motif libraries. Installing the following patches
+has been reported to solve the problem on Solaris 2.7:
+
+107081-40 107656-07
+
+For information (although they have not been confirmed to work), the
+equivalent patches for Solaris 2.8 are:
+
+108940-33 108652-25
+
*** Dumping error when using GNU binutils / GNU ld on a Sun.
Errors similar to the following:
with_dnet=""
pdump="no"
with_dragndrop="no"
-with_ipv6_cname="yes"
+with_ipv6_cname="no"
c_switch_site="$c_switch_site -threads" ;;
esac
+
echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4984: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4985: checking whether the -xildoff compiler flag is required" >&5
if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
then echo "$ac_t""no" 1>&6;
if test "$opsys" = "sol2"; then
if test "$os_release" -ge 56; then
echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:4996: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4997: checking for \"-z ignore\" linker flag" >&5
case "`ld -h 2>&1`" in
*-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
fi
fi
+if test "$pdump" != "yes"; then
+ echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
+echo "configure:5008: checking for \"-z nocombreloc\" linker flag" >&5
+ case "`ld --help 2>&1`" in
+ *-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6
+ ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
+ *) echo "$ac_t""no" 1>&6 ;;
+ esac
+fi
+
echo "checking "for specified window system"" 1>&6
-echo "configure:5007: checking "for specified window system"" >&5
+echo "configure:5018: checking "for specified window system"" >&5
GNOME_CONFIG=no
if test "$with_gnome" != "no"; then
echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5015: checking for GNOME configuration script" >&5
+echo "configure:5026: checking for GNOME configuration script" >&5
for possible in gnome-config
do
possible_version=`${possible} --version 2> /dev/null`
if test "$with_gtk" != "no";then
echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5046: checking for GTK configuration script" >&5
+echo "configure:5057: checking for GTK configuration script" >&5
for possible in gtk12-config gtk14-config gtk-config
do
possible_version=`${possible} --version 2> /dev/null`
if test "${GTK_CONFIG}" != "no"; then
echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5068: checking gtk version" >&5
+echo "configure:5079: checking gtk version" >&5
GTK_VERSION=`${GTK_CONFIG} --version`
echo "$ac_t""${GTK_VERSION}" 1>&6
echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5073: checking gtk libs" >&5
+echo "configure:5084: checking gtk libs" >&5
GTK_LIBS=`${GTK_CONFIG} --libs`
libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
echo "$ac_t""${GTK_LIBS}" 1>&6
echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5079: checking gtk cflags" >&5
+echo "configure:5090: checking gtk cflags" >&5
GTK_CFLAGS=`${GTK_CONFIG} --cflags`
c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi
echo "$ac_t""${GTK_CFLAGS}" 1>&6
echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5086: checking for main in -lgdk_imlib" >&5
+echo "configure:5097: checking for main in -lgdk_imlib" >&5
ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdk_imlib "
cat > conftest.$ac_ext <<EOF
-#line 5091 "configure"
+#line 5102 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5120: checking for Imlib_init in -lImlib" >&5
+echo "configure:5131: checking for Imlib_init in -lImlib" >&5
ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -lImlib "
cat > conftest.$ac_ext <<EOF
-#line 5125 "configure"
+#line 5136 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
Imlib_init()
; return 0; }
EOF
-if { (eval echo configure:5136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in gdk_imlib_init
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5159: checking for $ac_func" >&5
+echo "configure:5170: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5162 "configure"
+#line 5173 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:5185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5264: checking for $ac_hdr" >&5
+echo "configure:5275: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5267 "configure"
+#line 5278 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5303: checking for main in -lxml" >&5
+echo "configure:5314: checking for main in -lxml" >&5
ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lxml "
cat > conftest.$ac_ext <<EOF
-#line 5308 "configure"
+#line 5319 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5337: checking for main in -lglade" >&5
+echo "configure:5348: checking for main in -lglade" >&5
ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lglade "
cat > conftest.$ac_ext <<EOF
-#line 5342 "configure"
+#line 5353 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5371: checking for main in -lglade-gnome" >&5
+echo "configure:5382: checking for main in -lglade-gnome" >&5
ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lglade-gnome "
cat > conftest.$ac_ext <<EOF
-#line 5376 "configure"
+#line 5387 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
cat > conftest.$ac_ext <<EOF
-#line 5404 "configure"
+#line 5415 "configure"
#include "confdefs.h"
#include <glade/glade-xml.h>
EOF
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:5463: checking for X" >&5
+echo "configure:5474: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 5523 "configure"
+#line 5534 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5597 "configure"
+#line 5608 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:5604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:5713: checking whether -R must be followed by a space" >&5
+echo "configure:5724: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 5716 "configure"
+#line 5727 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:5723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 5739 "configure"
+#line 5750 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
else
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5782: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5793: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldnet "
cat > conftest.$ac_ext <<EOF
-#line 5787 "configure"
+#line 5798 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:5798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:5822: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5833: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldnet_stub "
cat > conftest.$ac_ext <<EOF
-#line 5827 "configure"
+#line 5838 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:5838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:5867: checking for gethostbyname" >&5
+echo "configure:5878: checking for gethostbyname" >&5
cat > conftest.$ac_ext <<EOF
-#line 5870 "configure"
+#line 5881 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
; return 0; }
EOF
-if { (eval echo configure:5893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5914: checking for gethostbyname in -lnsl" >&5
+echo "configure:5925: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
xe_check_libs=" -lnsl "
cat > conftest.$ac_ext <<EOF
-#line 5919 "configure"
+#line 5930 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:5930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:5960: checking for connect" >&5
+echo "configure:5971: checking for connect" >&5
cat > conftest.$ac_ext <<EOF
-#line 5963 "configure"
+#line 5974 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
; return 0; }
EOF
-if { (eval echo configure:5986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
xe_msg_checking="for connect in -lsocket"
test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6009: checking "$xe_msg_checking"" >&5
+echo "configure:6020: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocket $X_EXTRA_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6014 "configure"
+#line 6025 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
connect()
; return 0; }
EOF
-if { (eval echo configure:6025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:6049: checking for remove" >&5
+echo "configure:6060: checking for remove" >&5
cat > conftest.$ac_ext <<EOF
-#line 6052 "configure"
+#line 6063 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
; return 0; }
EOF
-if { (eval echo configure:6075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6096: checking for remove in -lposix" >&5
+echo "configure:6107: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
xe_check_libs=" -lposix "
cat > conftest.$ac_ext <<EOF
-#line 6101 "configure"
+#line 6112 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
remove()
; return 0; }
EOF
-if { (eval echo configure:6112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6136: checking for shmat" >&5
+echo "configure:6147: checking for shmat" >&5
cat > conftest.$ac_ext <<EOF
-#line 6139 "configure"
+#line 6150 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
; return 0; }
EOF
-if { (eval echo configure:6162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6183: checking for shmat in -lipc" >&5
+echo "configure:6194: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
xe_check_libs=" -lipc "
cat > conftest.$ac_ext <<EOF
-#line 6188 "configure"
+#line 6199 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
shmat()
; return 0; }
EOF
-if { (eval echo configure:6199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
xe_msg_checking="for IceConnectionNumber in -lICE"
test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6235: checking "$xe_msg_checking"" >&5
+echo "configure:6246: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
xe_check_libs=" -lICE $X_EXTRA_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6240 "configure"
+#line 6251 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:6251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6418: checking for X defines extracted by xmkmf" >&5
+echo "configure:6429: checking for X defines extracted by xmkmf" >&5
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6467: checking for X11/Intrinsic.h" >&5
+echo "configure:6478: checking for X11/Intrinsic.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6470 "configure"
+#line 6481 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6499: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6510: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 6504 "configure"
+#line 6515 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:6515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
xe_msg_checking="for XGetFontProperty in -lX11"
test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6540: checking "$xe_msg_checking"" >&5
+echo "configure:6551: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 -b i486-linuxaout"
cat > conftest.$ac_ext <<EOF
-#line 6545 "configure"
+#line 6556 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XGetFontProperty()
; return 0; }
EOF
-if { (eval echo configure:6556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6583: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6594: checking for XShapeSelectInput in -lXext" >&5
ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXext "
cat > conftest.$ac_ext <<EOF
-#line 6588 "configure"
+#line 6599 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XShapeSelectInput()
; return 0; }
EOF
-if { (eval echo configure:6599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6622: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6633: checking for XtOpenDisplay in -lXt" >&5
ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXt "
cat > conftest.$ac_ext <<EOF
-#line 6627 "configure"
+#line 6638 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XtOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:6638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6661: checking the version of X11 being used" >&5
+echo "configure:6672: checking the version of X11 being used" >&5
cat > conftest.$ac_ext <<EOF
-#line 6663 "configure"
+#line 6674 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
EOF
-if { (eval echo configure:6668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest foobar; x11_release=$?
else
for ac_func in XConvertCase
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6699: checking for $ac_func" >&5
+echo "configure:6710: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 6702 "configure"
+#line 6713 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:6725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6757: checking for $ac_hdr" >&5
+echo "configure:6768: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6760 "configure"
+#line 6771 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
for ac_func in XRegisterIMInstantiateCallback
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6798: checking for $ac_func" >&5
+echo "configure:6809: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 6801 "configure"
+#line 6812 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:6824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
done
echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:6852: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:6863: checking for standard XRegisterIMInstantiateCallback prototype" >&5
cat > conftest.$ac_ext <<EOF
-#line 6854 "configure"
+#line 6865 "configure"
#include "confdefs.h"
#define NeedFunctionPrototypes 1
; return 0; }
EOF
-if { (eval echo configure:6866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
test -z "$with_xmu" && {
echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6887: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6898: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXmu "
cat > conftest.$ac_ext <<EOF
-#line 6892 "configure"
+#line 6903 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XmuReadBitmapDataFromFile()
; return 0; }
EOF
-if { (eval echo configure:6903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:6942: checking for main in -lXbsd" >&5
+echo "configure:6953: checking for main in -lXbsd" >&5
ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXbsd "
cat > conftest.$ac_ext <<EOF
-#line 6947 "configure"
+#line 6958 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
if test "$with_msw" != "no"; then
echo "checking for MS-Windows" 1>&6
-echo "configure:6991: checking for MS-Windows" >&5
+echo "configure:7002: checking for MS-Windows" >&5
echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:6994: checking for main in -lgdi32" >&5
+echo "configure:7005: checking for main in -lgdi32" >&5
ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdi32 "
cat > conftest.$ac_ext <<EOF
-#line 6999 "configure"
+#line 7010 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
fi
cat > conftest.$ac_ext <<EOF
-#line 7079 "configure"
+#line 7090 "configure"
#include "confdefs.h"
#include <fcntl.h>
int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
EOF
-if { (eval echo configure:7084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
need_event_unixoid=yes; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_MSG_SELECT
if test "$with_x11" = "yes"; then
ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7148: checking for X11/extensions/shape.h" >&5
+echo "configure:7159: checking for X11/extensions/shape.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7151 "configure"
+#line 7162 "configure"
#include "confdefs.h"
#include <X11/extensions/shape.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
esac
echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7208: checking for WM_COMMAND option" >&5;
+echo "configure:7219: checking for WM_COMMAND option" >&5;
if test "$with_wmcommand" != "no"; then
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_WMCOMMAND
test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:7223: checking for X11/Xauth.h" >&5
+echo "configure:7234: checking for X11/Xauth.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7226 "configure"
+#line 7237 "configure"
#include "confdefs.h"
#include <X11/Xauth.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_xauth" && {
echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7254: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7265: checking for XauGetAuthByAddr in -lXau" >&5
ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXau "
cat > conftest.$ac_ext <<EOF
-#line 7259 "configure"
+#line 7270 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XauGetAuthByAddr()
; return 0; }
EOF
-if { (eval echo configure:7270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for dir in "" "Tt/" "desktop/" ; do
ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:7315: checking for ${dir}tt_c.h" >&5
+echo "configure:7326: checking for ${dir}tt_c.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7318 "configure"
+#line 7329 "configure"
#include "confdefs.h"
#include <${dir}tt_c.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
xe_msg_checking="for tt_message_create in -ltt"
test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7359: checking "$xe_msg_checking"" >&5
+echo "configure:7370: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltt $extra_libs"
cat > conftest.$ac_ext <<EOF
-#line 7364 "configure"
+#line 7375 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
tt_message_create()
; return 0; }
EOF
-if { (eval echo configure:7375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:7432: checking for Dt/Dt.h" >&5
+echo "configure:7443: checking for Dt/Dt.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7435 "configure"
+#line 7446 "configure"
#include "confdefs.h"
#include <Dt/Dt.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_cde" && {
echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7463: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7474: checking for DtDndDragStart in -lDtSvc" >&5
ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
xe_check_libs=" -lDtSvc "
cat > conftest.$ac_ext <<EOF
-#line 7468 "configure"
+#line 7479 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
DtDndDragStart()
; return 0; }
EOF
-if { (eval echo configure:7479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_dragndrop" != "no" ; then
echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7552: checking if drag and drop API is needed" >&5
+echo "configure:7563: checking if drag and drop API is needed" >&5
if test -n "$dragndrop_proto" ; then
with_dragndrop=yes
echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
fi
echo "checking for LDAP" 1>&6
-echo "configure:7572: checking for LDAP" >&5
+echo "configure:7583: checking for LDAP" >&5
test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:7575: checking for ldap.h" >&5
+echo "configure:7586: checking for ldap.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7578 "configure"
+#line 7589 "configure"
#include "confdefs.h"
#include <ldap.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:7606: checking for lber.h" >&5
+echo "configure:7617: checking for lber.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7609 "configure"
+#line 7620 "configure"
#include "confdefs.h"
#include <lber.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test "$with_ldap" != "no"; then
echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7638: checking for ldap_search in -lldap" >&5
+echo "configure:7649: checking for ldap_search in -lldap" >&5
ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap "
cat > conftest.$ac_ext <<EOF
-#line 7643 "configure"
+#line 7654 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
ldap_search()
; return 0; }
EOF
-if { (eval echo configure:7654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7679: checking "$xe_msg_checking"" >&5
+echo "configure:7690: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber"
cat > conftest.$ac_ext <<EOF
-#line 7684 "configure"
+#line 7695 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:7695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7720: checking "$xe_msg_checking"" >&5
+echo "configure:7731: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber -lkrb"
cat > conftest.$ac_ext <<EOF
-#line 7725 "configure"
+#line 7736 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:7736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7761: checking "$xe_msg_checking"" >&5
+echo "configure:7772: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber -lkrb -ldes"
cat > conftest.$ac_ext <<EOF
-#line 7766 "configure"
+#line 7777 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:7777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7828: checking for $ac_func" >&5
+echo "configure:7839: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 7831 "configure"
+#line 7842 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:7854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
if test "$with_postgresql" != "no"; then
echo "checking for PostgreSQL" 1>&6
-echo "configure:7885: checking for PostgreSQL" >&5
+echo "configure:7896: checking for PostgreSQL" >&5
for header_dir in "" "pgsql/" "postgresql/"; do
ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:7890: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:7901: checking for ${header_dir}libpq-fe.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7893 "configure"
+#line 7904 "configure"
#include "confdefs.h"
#include <${header_dir}libpq-fe.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
test -n "$libpq_fe_h_file" && {
echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:7922: checking for PQconnectdb in -lpq" >&5
+echo "configure:7933: checking for PQconnectdb in -lpq" >&5
ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpq "
cat > conftest.$ac_ext <<EOF
-#line 7927 "configure"
+#line 7938 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
PQconnectdb()
; return 0; }
EOF
-if { (eval echo configure:7938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:7971: checking for PQconnectStart in -lpq" >&5
+echo "configure:7982: checking for PQconnectStart in -lpq" >&5
ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpq "
cat > conftest.$ac_ext <<EOF
-#line 7976 "configure"
+#line 7987 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
PQconnectStart()
; return 0; }
EOF
-if { (eval echo configure:7987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$window_system" != "none"; then
echo "checking for graphics libraries" 1>&6
-echo "configure:8035: checking for graphics libraries" >&5
+echo "configure:8046: checking for graphics libraries" >&5
libpath_xpm=
incpath_xpm=
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:8061: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8072: checking for Xpm - no older than 3.4f" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 8064 "configure"
+#line 8075 "configure"
#include "confdefs.h"
#define XPM_NUMBERS
#include <X11/xpm.h>
XpmIncludeVersion != XpmLibraryVersion() ? 1 :
XpmIncludeVersion < 30406 ? 2 : 0 ;}
EOF
-if { (eval echo configure:8073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest dummy_arg; xpm_status=$?;
if test "$xpm_status" = "0"; then
libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:8117: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8128: checking for \"FOR_MSW\" xpm" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 8120 "configure"
+#line 8131 "configure"
#include "confdefs.h"
int main() {
XpmCreatePixmapFromData()
; return 0; }
EOF
-if { (eval echo configure:8127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xpm_for_msw=no
else
test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:8153: checking for compface.h" >&5
+echo "configure:8164: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8156 "configure"
+#line 8167 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8184: checking for UnGenFace in -lcompface" >&5
+echo "configure:8195: checking for UnGenFace in -lcompface" >&5
ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcompface "
cat > conftest.$ac_ext <<EOF
-#line 8189 "configure"
+#line 8200 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:8200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_png $with_tiff" != "no no"; then
echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8252: checking for inflate in -lc" >&5
+echo "configure:8263: checking for inflate in -lc" >&5
ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lc "
cat > conftest.$ac_ext <<EOF
-#line 8257 "configure"
+#line 8268 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inflate()
; return 0; }
EOF
-if { (eval echo configure:8268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8287: checking for inflate in -lz" >&5
+echo "configure:8298: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lz "
cat > conftest.$ac_ext <<EOF
-#line 8292 "configure"
+#line 8303 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inflate()
; return 0; }
EOF
-if { (eval echo configure:8303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8322: checking for inflate in -lgz" >&5
+echo "configure:8333: checking for inflate in -lgz" >&5
ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgz "
cat > conftest.$ac_ext <<EOF
-#line 8327 "configure"
+#line 8338 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inflate()
; return 0; }
EOF
-if { (eval echo configure:8338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:8368: checking for jpeglib.h" >&5
+echo "configure:8379: checking for jpeglib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8371 "configure"
+#line 8382 "configure"
#include "confdefs.h"
#include <jpeglib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_jpeg" && {
echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8399: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8410: checking for jpeg_destroy_decompress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
xe_check_libs=" -ljpeg "
cat > conftest.$ac_ext <<EOF
-#line 8404 "configure"
+#line 8415 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jpeg_destroy_decompress()
; return 0; }
EOF
-if { (eval echo configure:8415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
png_problem=""
test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8451: checking for pow" >&5
+echo "configure:8462: checking for pow" >&5
cat > conftest.$ac_ext <<EOF
-#line 8454 "configure"
+#line 8465 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pow(); below. */
; return 0; }
EOF
-if { (eval echo configure:8477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pow=yes"
else
}
test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:8498: checking for png.h" >&5
+echo "configure:8509: checking for png.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8501 "configure"
+#line 8512 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_png" && {
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8529: checking for png_read_image in -lpng" >&5
+echo "configure:8540: checking for png_read_image in -lpng" >&5
ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpng "
cat > conftest.$ac_ext <<EOF
-#line 8534 "configure"
+#line 8545 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:8545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
}
if test -z "$with_png"; then
echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8568: checking for workable png version information" >&5
+echo "configure:8579: checking for workable png version information" >&5
xe_check_libs="-lpng -lz"
cat > conftest.$ac_ext <<EOF
-#line 8571 "configure"
+#line 8582 "configure"
#include "confdefs.h"
#include <png.h>
int main(int c, char **v) {
if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
EOF
-if { (eval echo configure:8579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest dummy_arg; png_status=$?;
if test "$png_status" = "0"; then
test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:8622: checking for tiffio.h" >&5
+echo "configure:8633: checking for tiffio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8625 "configure"
+#line 8636 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_tiff" && {
echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8653: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8664: checking for TIFFClientOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltiff "
cat > conftest.$ac_ext <<EOF
-#line 8658 "configure"
+#line 8669 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
TIFFClientOpen()
; return 0; }
EOF
-if { (eval echo configure:8669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_gtk" = "yes"; then
test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:8708: checking for compface.h" >&5
+echo "configure:8719: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8711 "configure"
+#line 8722 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8739: checking for UnGenFace in -lcompface" >&5
+echo "configure:8750: checking for UnGenFace in -lcompface" >&5
ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcompface "
cat > conftest.$ac_ext <<EOF
-#line 8744 "configure"
+#line 8755 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:8755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_x11" = "yes"; then
echo "checking for X11 graphics libraries" 1>&6
-echo "configure:8794: checking for X11 graphics libraries" >&5
+echo "configure:8805: checking for X11 graphics libraries" >&5
fi
if test "$with_x11" = "yes" -a "$with_widgets" = "athena"; then
echo "checking for the Athena widgets" 1>&6
-echo "configure:8799: checking for the Athena widgets" >&5
+echo "configure:8810: checking for the Athena widgets" >&5
case "$with_athena" in
"xaw" | "") athena_variant=Xaw athena_3d=no ;;
if test "$athena_3d" = "no"; then
echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8813: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:8824: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 8818 "configure"
+#line 8829 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XawScrollbarSetThumb()
; return 0; }
EOF
-if { (eval echo configure:8829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8845: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8856: checking for threeDClassRec in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 8850 "configure"
+#line 8861 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:8861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8892: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8903: checking for threeDClassRec in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 8897 "configure"
+#line 8908 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:8908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:8926: checking for threeDClassRec in -lXaw" >&5
+echo "configure:8937: checking for threeDClassRec in -lXaw" >&5
ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXaw "
cat > conftest.$ac_ext <<EOF
-#line 8931 "configure"
+#line 8942 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:8942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$athena_3d" = "no"; then
ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:8973: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8984: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8976 "configure"
+#line 8987 "configure"
#include "confdefs.h"
#include <X11/Xaw/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""no" 1>&6
ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:9001: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:9012: checking for X11/Xaw/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9004 "configure"
+#line 9015 "configure"
#include "confdefs.h"
#include <X11/Xaw/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
else
ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9035: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9046: checking for X11/$athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9038 "configure"
+#line 9049 "configure"
#include "confdefs.h"
#include <X11/$athena_variant/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9060: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9071: checking for X11/$athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9063 "configure"
+#line 9074 "configure"
#include "confdefs.h"
#include <X11/$athena_variant/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test -z "$athena_h_path"; then
ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9096: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9107: checking for $athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9099 "configure"
+#line 9110 "configure"
#include "confdefs.h"
#include <$athena_variant/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9121: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9132: checking for $athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9124 "configure"
+#line 9135 "configure"
#include "confdefs.h"
#include <$athena_variant/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9158: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9169: checking for X11/Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9161 "configure"
+#line 9172 "configure"
#include "confdefs.h"
#include <X11/Xaw3d/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9183: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9194: checking for X11/Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9186 "configure"
+#line 9197 "configure"
#include "confdefs.h"
#include <X11/Xaw3d/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9223: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9234: checking for Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9226 "configure"
+#line 9237 "configure"
#include "confdefs.h"
#include <Xaw3d/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9248: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9259: checking for Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9251 "configure"
+#line 9262 "configure"
#include "confdefs.h"
#include <Xaw3d/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test -z "$athena_h_path"; then
ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9288: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9299: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9291 "configure"
+#line 9302 "configure"
#include "confdefs.h"
#include <X11/Xaw/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test "$with_x11" = "yes"; then
ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:9335: checking for Xm/Xm.h" >&5
+echo "configure:9346: checking for Xm/Xm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9338 "configure"
+#line 9349 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:9360: checking for XmStringFree in -lXm" >&5
+echo "configure:9371: checking for XmStringFree in -lXm" >&5
ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 9365 "configure"
+#line 9376 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XmStringFree()
; return 0; }
EOF
-if { (eval echo configure:9376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$have_motif" = "yes"; then
echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9405: checking for Lesstif" >&5
+echo "configure:9416: checking for Lesstif" >&5
cat > conftest.$ac_ext <<EOF
-#line 9407 "configure"
+#line 9418 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
#ifdef LESSTIF_VERSION
if test "$with_mule" = "yes" ; then
echo "checking for Mule-related features" 1>&6
-echo "configure:9831: checking for Mule-related features" >&5
+echo "configure:9842: checking for Mule-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining MULE
EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9872: checking for $ac_hdr" >&5
+echo "configure:9883: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9875 "configure"
+#line 9886 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:9911: checking for strerror in -lintl" >&5
+echo "configure:9922: checking for strerror in -lintl" >&5
ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
xe_check_libs=" -lintl "
cat > conftest.$ac_ext <<EOF
-#line 9916 "configure"
+#line 9927 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
strerror()
; return 0; }
EOF
-if { (eval echo configure:9927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo "checking for Mule input methods" 1>&6
-echo "configure:9979: checking for Mule input methods" >&5
+echo "configure:9990: checking for Mule input methods" >&5
case "$with_xim" in "" | "yes" )
echo "checking for XIM" 1>&6
-echo "configure:9982: checking for XIM" >&5
+echo "configure:9993: checking for XIM" >&5
echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:9985: checking for XOpenIM in -lX11" >&5
+echo "configure:9996: checking for XOpenIM in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 9990 "configure"
+#line 10001 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XOpenIM()
; return 0; }
EOF
-if { (eval echo configure:10001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$have_motif $have_lesstif" = "yes no"; then
echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10025: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10036: checking for XmImMbLookupString in -lXm" >&5
ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 10030 "configure"
+#line 10041 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XmImMbLookupString()
; return 0; }
EOF
-if { (eval echo configure:10041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_xfs" = "yes" ; then
echo "checking for XFontSet" 1>&6
-echo "configure:10106: checking for XFontSet" >&5
+echo "configure:10117: checking for XFontSet" >&5
echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10109: checking for XmbDrawString in -lX11" >&5
+echo "configure:10120: checking for XmbDrawString in -lX11" >&5
ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 10114 "configure"
+#line 10125 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XmbDrawString()
; return 0; }
EOF
-if { (eval echo configure:10125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:10165: checking for wnn/jllib.h" >&5
+echo "configure:10176: checking for wnn/jllib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10168 "configure"
+#line 10179 "configure"
#include "confdefs.h"
#include <wnn/jllib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:10196: checking for wnn/commonhd.h" >&5
+echo "configure:10207: checking for wnn/commonhd.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10199 "configure"
+#line 10210 "configure"
#include "confdefs.h"
#include <wnn/commonhd.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
for ac_func in crypt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10229: checking for $ac_func" >&5
+echo "configure:10240: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 10232 "configure"
+#line 10243 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:10255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
test "$ac_cv_func_crypt" != "yes" && {
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10284: checking for crypt in -lcrypt" >&5
+echo "configure:10295: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcrypt "
cat > conftest.$ac_ext <<EOF
-#line 10289 "configure"
+#line 10300 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
crypt()
; return 0; }
EOF
-if { (eval echo configure:10300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:10335: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10346: checking for jl_dic_list_e in -lwnn" >&5
ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn "
cat > conftest.$ac_ext <<EOF
-#line 10340 "configure"
+#line 10351 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:10351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:10369: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10380: checking for jl_dic_list_e in -lwnn4" >&5
ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn4 "
cat > conftest.$ac_ext <<EOF
-#line 10374 "configure"
+#line 10385 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:10385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:10403: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10414: checking for jl_dic_list_e in -lwnn6" >&5
ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn6 "
cat > conftest.$ac_ext <<EOF
-#line 10408 "configure"
+#line 10419 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:10419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:10437: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10448: checking for dic_list_e in -lwnn6_fromsrc" >&5
ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn6_fromsrc "
cat > conftest.$ac_ext <<EOF
-#line 10442 "configure"
+#line 10453 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:10453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_wnn6" != "no"; then
echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:10501: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10512: checking for jl_fi_dic_list in -l$libwnn" >&5
ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$libwnn "
cat > conftest.$ac_ext <<EOF
-#line 10506 "configure"
+#line 10517 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jl_fi_dic_list()
; return 0; }
EOF
-if { (eval echo configure:10517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_canna" != "no"; then
ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10552: checking for canna/jrkanji.h" >&5
+echo "configure:10563: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10555 "configure"
+#line 10566 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
c_switch_site="$c_switch_site -I/usr/local/canna/include"
ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10587: checking for canna/jrkanji.h" >&5
+echo "configure:10598: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10590 "configure"
+#line 10601 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:10623: checking for canna/RK.h" >&5
+echo "configure:10634: checking for canna/RK.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10626 "configure"
+#line 10637 "configure"
#include "confdefs.h"
#include <canna/RK.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_canna" && {
echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:10654: checking for RkBgnBun in -lRKC" >&5
+echo "configure:10665: checking for RkBgnBun in -lRKC" >&5
ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
xe_check_libs=" -lRKC "
cat > conftest.$ac_ext <<EOF
-#line 10659 "configure"
+#line 10670 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
RkBgnBun()
; return 0; }
EOF
-if { (eval echo configure:10670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
}
test -z "$with_canna" && {
echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:10693: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:10704: checking for jrKanjiControl in -lcanna" >&5
ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcanna "
cat > conftest.$ac_ext <<EOF
-#line 10698 "configure"
+#line 10709 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jrKanjiControl()
; return 0; }
EOF
-if { (eval echo configure:10709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi
echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:10758: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:10769: checking for layout_object_getvalue in -li18n" >&5
ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
xe_check_libs=" -li18n "
cat > conftest.$ac_ext <<EOF
-#line 10763 "configure"
+#line 10774 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
layout_object_getvalue()
; return 0; }
EOF
-if { (eval echo configure:10774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10860: checking for $ac_func" >&5
+echo "configure:10871: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 10863 "configure"
+#line 10874 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:10886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10918: checking for $ac_func" >&5
+echo "configure:10929: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 10921 "configure"
+#line 10932 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:10944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:10973: checking for openpty" >&5
+echo "configure:10984: checking for openpty" >&5
cat > conftest.$ac_ext <<EOF
-#line 10976 "configure"
+#line 10987 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char openpty(); below. */
; return 0; }
EOF
-if { (eval echo configure:10999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_openpty=yes"
else
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:11018: checking for openpty in -lutil" >&5
+echo "configure:11029: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
xe_check_libs=" -lutil "
cat > conftest.$ac_ext <<EOF
-#line 11023 "configure"
+#line 11034 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
openpty()
; return 0; }
EOF
-if { (eval echo configure:11034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11069: checking for $ac_hdr" >&5
+echo "configure:11080: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11072 "configure"
+#line 11083 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11113: checking for $ac_hdr" >&5
+echo "configure:11124: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11116 "configure"
+#line 11127 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
for ac_func in isastream
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11154: checking for $ac_func" >&5
+echo "configure:11165: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 11157 "configure"
+#line 11168 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11211: checking for $ac_hdr" >&5
+echo "configure:11222: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11214 "configure"
+#line 11225 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
for ac_func in getloadavg
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11256: checking for $ac_func" >&5
+echo "configure:11267: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 11259 "configure"
+#line 11270 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11315: checking for $ac_hdr" >&5
+echo "configure:11326: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11318 "configure"
+#line 11329 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11359: checking for kstat_open in -lkstat" >&5
+echo "configure:11370: checking for kstat_open in -lkstat" >&5
ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lkstat "
cat > conftest.$ac_ext <<EOF
-#line 11364 "configure"
+#line 11375 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
kstat_open()
; return 0; }
EOF
-if { (eval echo configure:11375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11410: checking for $ac_hdr" >&5
+echo "configure:11421: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11413 "configure"
+#line 11424 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11450: checking for kvm_read in -lkvm" >&5
+echo "configure:11461: checking for kvm_read in -lkvm" >&5
ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
xe_check_libs=" -lkvm "
cat > conftest.$ac_ext <<EOF
-#line 11455 "configure"
+#line 11466 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
kvm_read()
; return 0; }
EOF
-if { (eval echo configure:11466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11500: checking whether netdb declares h_errno" >&5
+echo "configure:11511: checking whether netdb declares h_errno" >&5
cat > conftest.$ac_ext <<EOF
-#line 11502 "configure"
+#line 11513 "configure"
#include "confdefs.h"
#include <netdb.h>
int main() {
return h_errno;
; return 0; }
EOF
-if { (eval echo configure:11509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
rm -f conftest*
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11529: checking for sigsetjmp" >&5
+echo "configure:11540: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <<EOF
-#line 11531 "configure"
+#line 11542 "configure"
#include "confdefs.h"
#include <setjmp.h>
int main() {
sigjmp_buf bar; sigsetjmp (bar, 0);
; return 0; }
EOF
-if { (eval echo configure:11538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
rm -f conftest*
echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11558: checking whether localtime caches TZ" >&5
+echo "configure:11569: checking whether localtime caches TZ" >&5
if test "$ac_cv_func_tzset" = "yes"; then
cat > conftest.$ac_ext <<EOF
-#line 11562 "configure"
+#line 11573 "configure"
#include "confdefs.h"
#include <time.h>
#if STDC_HEADERS
exit (0);
}
EOF
-if { (eval echo configure:11597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
emacs_cv_localtime_cache=no
else
if test "$HAVE_TIMEVAL" = "yes"; then
echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:11627: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:11638: checking whether gettimeofday accepts one or two arguments" >&5
cat > conftest.$ac_ext <<EOF
-#line 11629 "configure"
+#line 11640 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
; return 0; }
EOF
-if { (eval echo configure:11650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""two" 1>&6
else
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11672: checking for inline" >&5
+echo "configure:11683: checking for inline" >&5
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 11677 "configure"
+#line 11688 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:11684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:11725: checking for working alloca.h" >&5
+echo "configure:11736: checking for working alloca.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11728 "configure"
+#line 11739 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:11735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:11759: checking for alloca" >&5
+echo "configure:11770: checking for alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 11762 "configure"
+#line 11773 "configure"
#include "confdefs.h"
#ifdef __GNUC__
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:11790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:11829: checking whether alloca needs Cray hooks" >&5
+echo "configure:11840: checking whether alloca needs Cray hooks" >&5
cat > conftest.$ac_ext <<EOF
-#line 11832 "configure"
+#line 11843 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11856: checking for $ac_func" >&5
+echo "configure:11867: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 11859 "configure"
+#line 11870 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:11912: checking stack direction for C alloca" >&5
+echo "configure:11923: checking stack direction for C alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 11915 "configure"
+#line 11926 "configure"
#include "confdefs.h"
find_stack_direction ()
{
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:11934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_c_stack_direction=1
else
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:11964: checking for vfork.h" >&5
+echo "configure:11975: checking for vfork.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11967 "configure"
+#line 11978 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:12000: checking for working vfork" >&5
+echo "configure:12011: checking for working vfork" >&5
cat > conftest.$ac_ext <<EOF
-#line 12003 "configure"
+#line 12014 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
}
}
EOF
-if { (eval echo configure:12098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_vfork_works=yes
else
echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12124: checking for working strcoll" >&5
+echo "configure:12135: checking for working strcoll" >&5
cat > conftest.$ac_ext <<EOF
-#line 12127 "configure"
+#line 12138 "configure"
#include "confdefs.h"
#include <string.h>
main ()
strcoll ("123", "456") >= 0);
}
EOF
-if { (eval echo configure:12137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_strcoll_works=yes
else
for ac_func in getpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12165: checking for $ac_func" >&5
+echo "configure:12176: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12168 "configure"
+#line 12179 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:12191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
done
echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12219: checking whether getpgrp takes no argument" >&5
+echo "configure:12230: checking whether getpgrp takes no argument" >&5
cat > conftest.$ac_ext <<EOF
-#line 12222 "configure"
+#line 12233 "configure"
#include "confdefs.h"
/*
}
EOF
-if { (eval echo configure:12277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_getpgrp_void=yes
else
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12304: checking for working mmap" >&5
+echo "configure:12315: checking for working mmap" >&5
case "$opsys" in ultrix* ) have_mmap=no ;; *)
cat > conftest.$ac_ext <<EOF
-#line 12307 "configure"
+#line 12318 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <unistd.h>
return 1;
}
EOF
-if { (eval echo configure:12340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
have_mmap=yes
else
if test "$rel_alloc $have_mmap" = "default yes"; then
if test "$doug_lea_malloc" = "yes"; then
echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:12369: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12380: checking for M_MMAP_THRESHOLD" >&5
cat > conftest.$ac_ext <<EOF
-#line 12371 "configure"
+#line 12382 "configure"
#include "confdefs.h"
#include <malloc.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:12383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
rel_alloc=no; echo "$ac_t""yes" 1>&6;
else
ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12408: checking for termios.h" >&5
+echo "configure:12419: checking for termios.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12411 "configure"
+#line 12422 "configure"
#include "confdefs.h"
#include <termios.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""no" 1>&6
ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:12459: checking for termio.h" >&5
+echo "configure:12470: checking for termio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12462 "configure"
+#line 12473 "configure"
#include "confdefs.h"
#include <termio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12499: checking for socket" >&5
+echo "configure:12510: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 12502 "configure"
+#line 12513 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
; return 0; }
EOF
-if { (eval echo configure:12525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
echo "$ac_t""yes" 1>&6
ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:12540: checking for netinet/in.h" >&5
+echo "configure:12551: checking for netinet/in.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12543 "configure"
+#line 12554 "configure"
#include "confdefs.h"
#include <netinet/in.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:12565: checking for arpa/inet.h" >&5
+echo "configure:12576: checking for arpa/inet.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12568 "configure"
+#line 12579 "configure"
#include "confdefs.h"
#include <arpa/inet.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:12598: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:12609: checking "for sun_len member in struct sockaddr_un"" >&5
cat > conftest.$ac_ext <<EOF
-#line 12600 "configure"
+#line 12611 "configure"
#include "confdefs.h"
#include <sys/types.h>
static struct sockaddr_un x; x.sun_len = 1;
; return 0; }
EOF
-if { (eval echo configure:12611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_SOCKADDR_SUN_LEN
fi
rm -f conftest*
echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12629: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:12640: checking "for ip_mreq struct in netinet/in.h"" >&5
cat > conftest.$ac_ext <<EOF
-#line 12631 "configure"
+#line 12642 "configure"
#include "confdefs.h"
#include <sys/types.h>
static struct ip_mreq x;
; return 0; }
EOF
-if { (eval echo configure:12641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_MULTICAST
echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12672: checking for msgget" >&5
+echo "configure:12683: checking for msgget" >&5
cat > conftest.$ac_ext <<EOF
-#line 12675 "configure"
+#line 12686 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char msgget(); below. */
; return 0; }
EOF
-if { (eval echo configure:12698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_msgget=yes"
else
echo "$ac_t""yes" 1>&6
ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:12713: checking for sys/ipc.h" >&5
+echo "configure:12724: checking for sys/ipc.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12716 "configure"
+#line 12727 "configure"
#include "confdefs.h"
#include <sys/ipc.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:12738: checking for sys/msg.h" >&5
+echo "configure:12749: checking for sys/msg.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12741 "configure"
+#line 12752 "configure"
#include "confdefs.h"
#include <sys/msg.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:12784: checking for dirent.h" >&5
+echo "configure:12795: checking for dirent.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12787 "configure"
+#line 12798 "configure"
#include "confdefs.h"
#include <dirent.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""no" 1>&6
ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:12819: checking for sys/dir.h" >&5
+echo "configure:12830: checking for sys/dir.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12822 "configure"
+#line 12833 "configure"
#include "confdefs.h"
#include <sys/dir.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:12860: checking for nlist.h" >&5
+echo "configure:12871: checking for nlist.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12863 "configure"
+#line 12874 "configure"
#include "confdefs.h"
#include <nlist.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "checking "for sound support"" 1>&6
-echo "configure:12898: checking "for sound support"" >&5
+echo "configure:12909: checking "for sound support"" >&5
test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
if test "$with_native_sound" != "no"; then
if test -n "$native_sound_lib"; then
ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:12905: checking for multimedia/audio_device.h" >&5
+echo "configure:12916: checking for multimedia/audio_device.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12908 "configure"
+#line 12919 "configure"
#include "confdefs.h"
#include <multimedia/audio_device.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test -z "$native_sound_lib"; then
echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:12961: checking for ALopenport in -laudio" >&5
+echo "configure:12972: checking for ALopenport in -laudio" >&5
ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
xe_check_libs=" -laudio "
cat > conftest.$ac_ext <<EOF
-#line 12966 "configure"
+#line 12977 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
ALopenport()
; return 0; }
EOF
-if { (eval echo configure:12977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test -z "$native_sound_lib"; then
echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:13008: checking for AOpenAudio in -lAlib" >&5
+echo "configure:13019: checking for AOpenAudio in -lAlib" >&5
ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
xe_check_libs=" -lAlib "
cat > conftest.$ac_ext <<EOF
-#line 13013 "configure"
+#line 13024 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
AOpenAudio()
; return 0; }
EOF
-if { (eval echo configure:13024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for dir in "machine" "sys" "linux"; do
ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:13069: checking for ${dir}/soundcard.h" >&5
+echo "configure:13080: checking for ${dir}/soundcard.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13072 "configure"
+#line 13083 "configure"
#include "confdefs.h"
#include <${dir}/soundcard.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test "$with_nas_sound" != "no"; then
ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:13131: checking for audio/audiolib.h" >&5
+echo "configure:13142: checking for audio/audiolib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13134 "configure"
+#line 13145 "configure"
#include "confdefs.h"
#include <audio/audiolib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13157: checking for AuOpenServer in -laudio" >&5
+echo "configure:13168: checking for AuOpenServer in -laudio" >&5
ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
xe_check_libs=" -laudio "
cat > conftest.$ac_ext <<EOF
-#line 13162 "configure"
+#line 13173 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
AuOpenServer()
; return 0; }
EOF
-if { (eval echo configure:13173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi
cat > conftest.$ac_ext <<EOF
-#line 13212 "configure"
+#line 13223 "configure"
#include "confdefs.h"
#include <audio/Xtutil.h>
EOF
# Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13243: checking for $ac_word" >&5
+echo "configure:13254: checking for $ac_word" >&5
if test -n "$have_esd_config"; then
ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi
echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:13272: checking for esd_play_stream" >&5
+echo "configure:13283: checking for esd_play_stream" >&5
cat > conftest.$ac_ext <<EOF
-#line 13275 "configure"
+#line 13286 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char esd_play_stream(); below. */
; return 0; }
EOF
-if { (eval echo configure:13298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_esd_play_stream=yes"
else
if test "$with_tty" = "yes" ; then
echo "checking for TTY-related features" 1>&6
-echo "configure:13349: checking for TTY-related features" >&5
+echo "configure:13360: checking for TTY-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_TTY
EOF
if test -z "$with_ncurses"; then
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13365: checking for tgetent in -lncurses" >&5
+echo "configure:13376: checking for tgetent in -lncurses" >&5
ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -lncurses "
cat > conftest.$ac_ext <<EOF
-#line 13370 "configure"
+#line 13381 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
tgetent()
; return 0; }
EOF
-if { (eval echo configure:13381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13414: checking for ncurses/curses.h" >&5
+echo "configure:13425: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13417 "configure"
+#line 13428 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:13444: checking for ncurses/term.h" >&5
+echo "configure:13455: checking for ncurses/term.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13447 "configure"
+#line 13458 "configure"
#include "confdefs.h"
#include <ncurses/term.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
c_switch_site="$c_switch_site -I/usr/include/ncurses"
ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13482: checking for ncurses/curses.h" >&5
+echo "configure:13493: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13485 "configure"
+#line 13496 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
for lib in curses termlib termcap; do
echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13525: checking for tgetent in -l$lib" >&5
+echo "configure:13536: checking for tgetent in -l$lib" >&5
ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$lib "
cat > conftest.$ac_ext <<EOF
-#line 13530 "configure"
+#line 13541 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
tgetent()
; return 0; }
EOF
-if { (eval echo configure:13541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:13572: checking for tgetent in -lcurses" >&5
+echo "configure:13583: checking for tgetent in -lcurses" >&5
ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcurses "
cat > conftest.$ac_ext <<EOF
-#line 13577 "configure"
+#line 13588 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
tgetent()
; return 0; }
EOF
-if { (eval echo configure:13588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:13606: checking for tgetent in -ltermcap" >&5
+echo "configure:13617: checking for tgetent in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltermcap "
cat > conftest.$ac_ext <<EOF
-#line 13611 "configure"
+#line 13622 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
tgetent()
; return 0; }
EOF
-if { (eval echo configure:13622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:13670: checking for gpm.h" >&5
+echo "configure:13681: checking for gpm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13673 "configure"
+#line 13684 "configure"
#include "confdefs.h"
#include <gpm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
}
test -z "$with_gpm" && {
echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:13701: checking for Gpm_Open in -lgpm" >&5
+echo "configure:13712: checking for Gpm_Open in -lgpm" >&5
ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgpm "
cat > conftest.$ac_ext <<EOF
-#line 13706 "configure"
+#line 13717 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
Gpm_Open()
; return 0; }
EOF
-if { (eval echo configure:13717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
!= "no no no" && echo "checking for database support" 1>&6
-echo "configure:13767: checking for database support" >&5
+echo "configure:13778: checking for database support" >&5
if test "$with_database_gdbm $with_database_dbm" != "no no"; then
ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:13772: checking for ndbm.h" >&5
+echo "configure:13783: checking for ndbm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13775 "configure"
+#line 13786 "configure"
#include "confdefs.h"
#include <ndbm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test "$with_database_gdbm" != "no"; then
echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:13810: checking for dbm_open in -lgdbm" >&5
+echo "configure:13821: checking for dbm_open in -lgdbm" >&5
ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdbm "
cat > conftest.$ac_ext <<EOF
-#line 13815 "configure"
+#line 13826 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:13826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_database_dbm" != "no"; then
echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:13854: checking for dbm_open" >&5
+echo "configure:13865: checking for dbm_open" >&5
cat > conftest.$ac_ext <<EOF
-#line 13857 "configure"
+#line 13868 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dbm_open(); below. */
; return 0; }
EOF
-if { (eval echo configure:13880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dbm_open=yes"
else
echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:13899: checking for dbm_open in -ldbm" >&5
+echo "configure:13910: checking for dbm_open in -ldbm" >&5
ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldbm "
cat > conftest.$ac_ext <<EOF
-#line 13904 "configure"
+#line 13915 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:13915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:13956: checking for Berkeley db.h" >&5
+echo "configure:13967: checking for Berkeley db.h" >&5
for header in "db/db.h" "db.h"; do
cat > conftest.$ac_ext <<EOF
-#line 13959 "configure"
+#line 13970 "configure"
#include "confdefs.h"
#include <stdlib.h>
; return 0; }
EOF
-if { (eval echo configure:13981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
db_h_file="$header"; break
else
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:13997: checking for Berkeley DB version" >&5
+echo "configure:14008: checking for Berkeley DB version" >&5
cat > conftest.$ac_ext <<EOF
-#line 13999 "configure"
+#line 14010 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 1
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 14011 "configure"
+#line 14022 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 2
rm -f conftest*
echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14038: checking for $dbfunc" >&5
+echo "configure:14049: checking for $dbfunc" >&5
cat > conftest.$ac_ext <<EOF
-#line 14041 "configure"
+#line 14052 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $dbfunc(); below. */
; return 0; }
EOF
-if { (eval echo configure:14064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$dbfunc=yes"
else
echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14083: checking for $dbfunc in -ldb" >&5
+echo "configure:14094: checking for $dbfunc in -ldb" >&5
ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldb "
cat > conftest.$ac_ext <<EOF
-#line 14088 "configure"
+#line 14099 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
$dbfunc()
; return 0; }
EOF
-if { (eval echo configure:14099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_socks" = "yes"; then
echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14173: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14184: checking for SOCKSinit in -lsocks" >&5
ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocks "
cat > conftest.$ac_ext <<EOF
-#line 14178 "configure"
+#line 14189 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
SOCKSinit()
; return 0; }
EOF
-if { (eval echo configure:14189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$with_modules" != "no"; then
echo "checking for module support" 1>&6
-echo "configure:14244: checking for module support" >&5
+echo "configure:14255: checking for module support" >&5
if test "$with_msw" = "yes"; then
have_dl=yes;
else
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14251: checking for dlfcn.h" >&5
+echo "configure:14262: checking for dlfcn.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14254 "configure"
+#line 14265 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:14276: checking for dlopen in -lc" >&5
+echo "configure:14287: checking for dlopen in -lc" >&5
cat > conftest.$ac_ext <<EOF
-#line 14278 "configure"
+#line 14289 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:14285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
rm -rf conftest*
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14294: checking for dlopen in -ldl" >&5
+echo "configure:14305: checking for dlopen in -ldl" >&5
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14298 "configure"
+#line 14309 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:14305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
else
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14334: checking for shl_load in -ldld" >&5
+echo "configure:14345: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldld "
cat > conftest.$ac_ext <<EOF
-#line 14339 "configure"
+#line 14350 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
shl_load()
; return 0; }
EOF
-if { (eval echo configure:14350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14377: checking for dld_init in -ldld" >&5
+echo "configure:14388: checking for dld_init in -ldld" >&5
ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldld "
cat > conftest.$ac_ext <<EOF
-#line 14382 "configure"
+#line 14393 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dld_init()
; return 0; }
EOF
-if { (eval echo configure:14393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
xealias=$internal_configuration
echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14438: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:14449: checking how to build dynamic libraries for ${xehost}" >&5
# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
case "$xehost" in
*-*-linux-gnu*) ;;
XEGCC=yes
else
echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:14466: checking checking whether we are using GNU C" >&5
+echo "configure:14477: checking checking whether we are using GNU C" >&5
cat > conftest.$ac_ext <<EOF
-#line 14468 "configure"
+#line 14479 "configure"
#include "confdefs.h"
#ifdef __GNUC__
fi
echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14490: checking how to produce PIC code" >&5
+echo "configure:14501: checking how to produce PIC code" >&5
wl=
can_build_shared=yes
# Check to make sure the dll_cflags actually works.
echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:14591: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:14602: checking if PIC flag ${dll_cflags} really works" >&5
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $dll_cflags -DPIC"
cat > conftest.$ac_ext <<EOF
-#line 14595 "configure"
+#line 14606 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:14602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
xldf=
xcldf=
echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:14633: checking if C compiler can produce shared libraries" >&5
+echo "configure:14644: checking if C compiler can produce shared libraries" >&5
if test "$XEGCC" = yes; then
xcldf="-shared"
xldf="-shared"
xe_libs=
ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
cat > conftest.$ac_ext <<EOF
-#line 14684 "configure"
+#line 14695 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:14691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cc_produces_so=yes
else
if test "$XEGCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:14716: checking for ld used by GCC" >&5
+echo "configure:14727: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
esac
else
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:14742: checking for GNU ld" >&5
+echo "configure:14753: checking for GNU ld" >&5
fi
if test -z "$LTLD"; then
# Check to see if it really is or isn't GNU ld.
echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:14780: checking if the linker is GNU ld" >&5
+echo "configure:14791: checking if the linker is GNU ld" >&5
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
xe_gnu_ld=yes
# OK - only NOW do we futz about with ld.
# See if the linker supports building shared libraries.
echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:14808: checking whether the linker supports shared libraries" >&5
+echo "configure:14819: checking whether the linker supports shared libraries" >&5
dll_ld=$CC
dll_ldflags=$LDFLAGS
ld_shlibs=yes
for ac_func in dlerror _dlerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15019: checking for $ac_func" >&5
+echo "configure:15030: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 15022 "configure"
+#line 15033 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:15045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
fi
cat > conftest.$ac_ext <<EOF
-#line 15084 "configure"
+#line 15095 "configure"
#include "confdefs.h"
int main(int c,char *v[]){return 0;}
EOF
-if { (eval echo configure:15088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
echo " Compiler: $CC $CFLAGS"
echo " Relocating allocator for buffers: $rel_alloc"
echo " GNU version of malloc: ${GNU_MALLOC}${GNU_MALLOC_reason}"
+case "$ld_switch_site" in
+ *nocombreloc*) echo " Linking with \`-z nocombreloc'.
+ - Consider configuring with --pdump." ;;
+esac
echo "
Window System:"
echo "
Other Features:"
-test "with_ipv6_cname" = no && echo " Inhibiting IPv6 canonicalization at startup."
+test "$with_ipv6_cname" = no && echo " Inhibiting IPv6 canonicalization at startup."
test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk."
test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop."
test "$with_socks" = yes && echo " Compiling in support for SOCKS."
dnl here is how XEmacs is different:
dnl - no cache file
dnl - non-standard options
-dnl - suport for extra-verbosity
+dnl - support for extra-verbosity
dnl - ordinary libs are handled separately from X libs (might be a mistake)
dnl - various random kludges (e.g. -with-dnet=no)
dnl redefine AC_CHECK_LIB in accordance with our own value of ac_link
dnl Add in extra kludgy check to support with_dnet=no
-dnl Add in extra LDFLAGS arg, which PRECEDE libs
+dnl Add in extra LDFLAGS arg, which PRECEDES libs
dnl Support --with-dnet=no
dnl AC_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
pdump="no"
dnl dragndrop is still experimental. When it is stable, comment out the following line:
with_dragndrop="no"
-dnl I think this is mandated by IPv6 standards.
-with_ipv6_cname="yes"
+dnl Too annoying, even if mandated by IPv6 (and I'm not even sure of that)
+with_ipv6_cname="no"
dnl ------------------
dnl Options Processing
dnl listed in /etc/ld.so.conf on some systems, and including them on
dnl the link path leads to linking in utterly broken libc's.
dnl There are many clever ways of approaching this problem,
-dnl but finding out that actually works...
+dnl but finding one that actually works...
dnl if test -z "$LD_RUN_PATH" -a -r "/etc/ld.so.conf"; then
dnl for dir in `cat /etc/ld.so.conf`; do
c_switch_site="$c_switch_site -threads" ;;
esac
+dnl ----------------------------------------------------------------
+dnl Miscellaneous flags
+dnl ----------------------------------------------------------------
+
AC_MSG_CHECKING(whether the -xildoff compiler flag is required)
if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
fi
fi
+dnl GNU ld now defaults to combreloc, which screws up unexec, but not pdump.
+dnl Note that it's OK if the GNU style long option causes non-GNU ld to barf
+dnl a usage message, that's often good enough. Please report it, though.
+dnl #### Should make this Solaris-friendly.
+dnl Link with -z nocombreloc for now.
+if test "$pdump" != "yes"; then
+ AC_MSG_CHECKING(for \"-z nocombreloc\" linker flag)
+ case "`ld --help 2>&1`" in
+ *-z\ nocombreloc* ) AC_MSG_RESULT(yes)
+ XE_PREPEND(-z nocombreloc, ld_switch_site) ;;
+ *) AC_MSG_RESULT(no) ;;
+ esac
+fi
+
dnl ----------------------
dnl Choose a window system
dnl ----------------------
echo " Compiler: $CC $CFLAGS"
echo " Relocating allocator for buffers: $rel_alloc"
echo " GNU version of malloc: ${GNU_MALLOC}${GNU_MALLOC_reason}"
+case "$ld_switch_site" in
+ *nocombreloc*) echo " Linking with \`-z nocombreloc'.
+ - Consider configuring with --pdump." ;;
+esac
echo "
Window System:"
echo "
Other Features:"
-test "with_ipv6_cname" = no && echo " Inhibiting IPv6 canonicalization at startup."
+test "$with_ipv6_cname" = no && echo " Inhibiting IPv6 canonicalization at startup."
test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk."
test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop."
test "$with_socks" = yes && echo " Compiling in support for SOCKS."
loaded libraries (Dynamic Shared Objects).
--with-netinstall Compile in support for installation over the internet.
Only functional on the MS Windows platforms.
---with-ipv6-cname=no Don't try to get IPv6 information when canonicalizing
- host names. This option has no effect unless system
+--with-ipv6-cname=yes Try IPv6 information first when canonicalizing host
+ names. This option has no effect unless system
supports getaddrinfo(3) and getnameinfo(3).
--with-site-lisp=yes Allow for a site-lisp directory in the XEmacs hierarchy
searched before the installation packages.
optionally including autodetection. Defaults to ON
on Windows, OFF on Unix.
+
Internationalization options:
--with-mule Compile with Mule (MUlti-Lingual Emacs) support,
--no-doc-file Don't rebuild the DOC file unless it's explicitly
deleted. Only use during development. (It speeds
up the compile-run-test cycle.)
+--quick-build Don't GC when dumping. Implies --no-doc-file.
--use-union-type Enable or disable use of a union, instead of an
int, for the fundamental Lisp_Object type; this
provides stricter type-checking. Only works with
--with-clash-detection Use lock files to detect multiple edits of the same
file. The default is to do clash detection.
-You may also specify any of the `path' variables found in Makefile.in,
+You may also specify any of the `path' variables found in Makefile.in.in,
including --bindir, --libdir, --docdir, --lispdir, --sitelispdir,
--datadir, --infodir, --mandir and so on. Note that we recommend
against explicitly setting any of these variables. See the INSTALL
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
;; Package Index file -- Do not edit manually.
;;;@@@
(package-get-update-base-entry (quote
-(lookup
- (standards-version 1.1
- version "1.03"
- author-version "1.0"
- date "1999-05-05"
- build-date "1999-07-30"
- maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
- distribution mule
- priority high
- category "mule"
+(clearcase
+ (standards-version 1.0
+ version "1.00"
+ author-version "21.5b3"
+ date "2001-12-09"
+ build-date "2001-12-10"
+ maintainer "Adrian Aichner <adrian@xemacs.org>"
+ distribution xemacs
+ priority low
+ category "standard"
dump nil
- description "Dictionary support"
- filename "lookup-1.03-pkg.tar.gz"
- md5sum "d99759b042f8bf401d487e4ea140450d"
- size 212861
- provides (lookup)
- requires (cookie lookup)
+ description "New Clearcase Version Control for XEmacs (UNIX, Windows)."
+ filename "clearcase-1.00-pkg.tar.gz"
+ md5sum "6ae8f1896b97f90a94a6391beeb6f018"
+ size 88185
+ provides (clearcase)
+ requires (dired fsf-compat mail-lib xemacs-base)
type regular
))
))
;;;@@@
(package-get-update-base-entry (quote
-(os-utils
+(tramp
(standards-version 1.1
- version "1.18"
- author-version "21.1"
- date "1999-07-20"
- build-date "1999-07-30"
+ version "1.00"
+ author-version "2.46"
+ date "2001-12-08"
+ build-date "2001-12-08"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
- priority medium
- category "os"
+ priority low
+ category "standard"
dump nil
- description "Miscellaneous O/S utilities."
- filename "os-utils-1.18-pkg.tar.gz"
- md5sum "bafbe5e2628fc678daad46b07ba7fef6"
- size 179680
- provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat tar-mode telnet terminal uncompress)
- requires (xemacs-base)
- type single
+ description "Remote shell-based file editing."
+ filename "tramp-1.00-pkg.tar.gz"
+ md5sum "31d4925445293ad091381218fc9e10fa"
+ size 130274
+ provides (tramp tramp-util tramp-vc trampcache)
+ requires (tramp xemacs-base vc fsf-compat efs dired mail-lib gnus)
+ type regular
))
))
;;;@@@
(package-get-update-base-entry (quote
-(ediff
+(dictionary
(standards-version 1.1
- version "1.22"
- author-version "2.72"
- date "1999-05-27"
- build-date "1999-07-30"
- maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
+ version "1.05"
+ author-version "1.7"
+ date "2001-12-15"
+ build-date "2001-12-16"
+ maintainer "Torsten Hilbrich <dictionary@myrkr.in-berlin.de>"
distribution xemacs
- priority medium
- category "prog"
+ priority low
+ category "standard"
dump nil
- description "Interface over GNU patch."
- filename "ediff-1.22-pkg.tar.gz"
- md5sum "a9ece02fc03ac74ee4501845dec88710"
- size 282084
- provides (ediff)
- requires (pcl-cvs elib dired xemacs-base)
+ description "Interface to RFC2229 dictionary servers."
+ filename "dictionary-1.05-pkg.tar.gz"
+ md5sum "17b8074cee3e85f26f939a26a3848daf"
+ size 37435
+ provides (dictionary connection link)
+ requires (xemacs-base)
type regular
))
))
;;;@@@
(package-get-update-base-entry (quote
-(hm--html-menus
+(build
(standards-version 1.0
- version "1.12"
- author-version "5.9"
- date "1999-02-05"
- build-date "1999-02-05"
- maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+ version "1.03"
+ author-version "21.5b3"
+ date "2001-12-02"
+ build-date "2001-12-03"
+ maintainer "Adrian Aichner <adrian@xemacs.org>"
distribution stable
priority low
- category "oa"
+ category "standard"
dump nil
- description "HTML editing."
- filename "hm--html-menus-1.12-pkg.tar.gz"
- md5sum "fc80ef260cc0682bde6e706cdc8ddae4"
- size 177442
- provides (adapt hm--date hm--html-configuration hm--html-drag-and-drop hm--html-indentation hm--html-keys hm--html-menu hm--html-mode hm--html-not-standard hm--html html-view tmpl-minor-mode)
- requires (dired xemacs-base)
+ description "Build XEmacs from within (UNIX, Windows)."
+ filename "build-1.03-pkg.tar.gz"
+ md5sum "beaa6b5e8731f13de47c4b5d5ef6fde4"
+ size 31341
+ provides (build)
+ requires (xemacs-base pcl-cvs dired w3 prog-modes)
type regular
))
))
;;;@@@
(package-get-update-base-entry (quote
-(jde
+(xslt-process
(standards-version 1.0
- version "1.14"
- author-version "2.14"
- date "1999-02-05"
- build-date "1999-02-05"
- maintainer "Andy Piper <andy@xemacs.org>"
- distribution stable
+ version "1.05"
+ author-version "1.2.1"
+ date "2001-08-25"
+ build-date "2001-08-27"
+ maintainer "Ovidiu Predescu <ovidiu@xemacs.org>"
+ distribution xemacs
priority medium
- category "prog"
+ category "standard"
dump nil
- description "Java language and development support."
- filename "jde-1.14-pkg.tar.gz"
- md5sum "1028c54ef317d8dd4d4c78e5b9c004e6"
- size 320702
- provides (jde)
- requires (cc-mode debug speedbar edit-utils mail-lib xemacs-base)
+ description "XSLT processing support."
+ filename "xslt-process-1.05-pkg.tar.gz"
+ md5sum "f38db5adcbff961d8b542fc5840cab22"
+ size 202235
+ provides (xslt-process)
+ requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base elib eieio sh-script)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(eieio
+ (standards-version 1.1
+ version "1.01"
+ author-version "0.16"
+ date "2001-02-20"
+ build-date "2001-02-20"
+ maintainer "Eric Ludlam <zappo@gnu.org>"
+ distribution xemacs
+ priority low
+ category "libs"
+ dump nil
+ description "Enhanced Implementation of Emacs Interpreted Objects"
+ filename "eieio-1.01-pkg.tar.gz"
+ md5sum "936e2330f1ac6e76f437154ad60f5b0f"
+ size 136677
+ provides (eieio chart tree)
+ requires (eieio speedbar xemacs-base )
type regular
))
))
(package-get-update-base-entry (quote
(skk
(standards-version 1.1
- version "1.14"
- author-version "10.38"
- date "1999-05-18"
- build-date "1999-07-30"
- maintainer "SL Baur <steve@xemacs.org>"
+ version "1.19"
+ author-version "10.62a"
+ date "2001-06-18"
+ build-date "2001-07-02"
+ maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution mule
priority medium
category "mule"
dump nil
- description "Japanese Language Input Method."
- filename "skk-1.14-pkg.tar.gz"
- md5sum "b8c89832f314570cb251147ced107c49"
- size 1514095
+ description "MULE: Japanese Language Input Method."
+ filename "skk-1.19-pkg.tar.gz"
+ md5sum "1655024ec7091ec05558062e7344a93f"
+ size 1505369
provides (skk skk-tut)
- requires (viper mule-base elib xemacs-base)
+ requires (viper mule-base elib xemacs-base apel)
type regular
))
))
(package-get-update-base-entry (quote
(egg-its
(standards-version 1.1
- version "1.19"
- author-version "21.1"
- date "1999-07-26"
- build-date "1999-07-30"
+ version "1.26"
+ author-version "21.5b1"
+ date "2001-05-07"
+ build-date "2001-05-10"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution mule
priority high
category "mule"
dump nil
- description "Wnn (4.2 and 6) support. SJ3 support."
- filename "egg-its-1.19-pkg.tar.gz"
- md5sum "121037363bae6925fd4933f861cbdabb"
- size 261537
+ description "MULE: Wnn (4.2 and 6) support. SJ3 support."
+ filename "egg-its-1.26-pkg.tar.gz"
+ md5sum "a69b09fedc9aee8422ed7ed35b6649eb"
+ size 260749
provides (egg-cnpinyin egg-cnzhuyin egg-cwnn-leim egg-jisx0201 egg-jsymbol egg-kwnn-leim egg-leim egg-sj3-client egg-sj3-leim egg-sj3 egg-wnn egg)
requires (leim mule-base fsf-compat xemacs-base)
type regular
(package-get-update-base-entry (quote
(edict
(standards-version 1.1
- version "1.08"
+ version "1.12"
author-version "0.9.8"
- date "1998-07-23"
- build-date "1999-07-30"
+ date "2000-11-08"
+ build-date "2001-01-15"
maintainer "Stephen J. Turnbull <turnbull@sk.tsukuba.ac.jp>"
distribution mule
priority high
category "mule"
dump nil
- description "Lisp Interface to EDICT, Kanji Dictionary"
- filename "edict-1.08-pkg.tar.gz"
- md5sum "f339e93a2cb02d9224e4bf9f313b0b62"
- size 71621
+ description "MULE: Lisp Interface to EDICT, Kanji Dictionary"
+ filename "edict-1.12-pkg.tar.gz"
+ md5sum "ac774d2ae02fe32de755e758af5dac11"
+ size 71792
provides (dui-registry dui edict-edit edict-english edict-japanese edict-morphology edict-test edict ts-mode)
requires (mule-base xemacs-base)
type regular
))
;;;@@@
(package-get-update-base-entry (quote
+(lookup
+ (standards-version 1.1
+ version "1.08"
+ author-version "1.0"
+ date "2001-01-14"
+ build-date "2001-07-02"
+ maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+ distribution mule
+ priority high
+ category "mule"
+ dump nil
+ description "MULE: Dictionary support"
+ filename "lookup-1.08-pkg.tar.gz"
+ md5sum "49e7d04e5a9f85f060365433cd45f31d"
+ size 214238
+ provides (lookup)
+ requires (mule-base cookie lookup)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
(leim
(standards-version 1.1
- version "1.13"
+ version "1.17"
author-version "21.1"
- date "1999-06-29"
- build-date "1999-07-30"
+ date "2000-11-08"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution mule
priority medium
category "mule"
dump nil
- description "Quail. All non-English and non-Japanese language support."
- filename "leim-1.13-pkg.tar.gz"
- md5sum "9cd059afefa3aff94fd1802c8db6c39a"
- size 1702922
+ description "MULE: Quail. All non-English and non-Japanese language support."
+ filename "leim-1.17-pkg.tar.gz"
+ md5sum "61d39ee096e39219651b01648a37ef2e"
+ size 1708067
provides ()
requires (mule-base fsf-compat xemacs-base)
type regular
(package-get-update-base-entry (quote
(locale
(standards-version 1.1
- version "1.14"
+ version "1.18"
author-version "21.1"
- date "1999-05-11"
- build-date "1999-07-30"
+ date "2000-11-08"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution mule
priority high
category "mule"
dump nil
- description "Localized menubars and localized splash screens."
- filename "locale-1.14-pkg.tar.gz"
- md5sum "5a5c7e878596a1009e97a8c4f491826c"
- size 35744
+ description "MULE: Localized menubars and localized splash screens."
+ filename "locale-1.18-pkg.tar.gz"
+ md5sum "dbc3b123a7f12804fb81643b40fe766a"
+ size 38660
provides ()
requires (mule-base)
type regular
(package-get-update-base-entry (quote
(mule-base
(standards-version 1.1
- version "1.32"
- author-version "21.1"
- date "1999-06-30"
- build-date "1999-07-30"
- maintainer "SL Baur <steve@xemacs.org>"
+ version "1.39"
+ author-version "21.5b1"
+ date "2001-05-23"
+ build-date "2001-06-14"
+ maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution mule
priority high
category "mule"
dump nil
- description "Basic Mule support, required for building with Mule."
- filename "mule-base-1.32-pkg.tar.gz"
- md5sum "40950af24540e6cfc6875a9ddc7bab5d"
- size 453902
+ description "MULE: Basic Mule support, required for building with Mule."
+ filename "mule-base-1.39-pkg.tar.gz"
+ md5sum "5686febbb08c950ead2b4d0b1707c09e"
+ size 443543
provides (canna-leim canna char-table china-util cyril-util isearch-ext japan-util ccl can-n-egg mule-help)
requires (fsf-compat xemacs-base apel)
type regular
(package-get-update-base-entry (quote
(strokes
(standards-version 1.1
- version "1.05"
+ version "1.08"
author-version "21.1"
- date "1998-01-25"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority medium
category "oa"
dump nil
description "Mouse enhancement utility."
- filename "strokes-1.05-pkg.tar.gz"
- md5sum "42b991c28dc393a78f9da792f15e53d3"
- size 43480
+ filename "strokes-1.08-pkg.tar.gz"
+ md5sum "c5ab0860ceb23b40798b11a1fa4c0240"
+ size 43486
provides (strokes)
requires (text-modes edit-utils mail-lib xemacs-base)
type regular
(package-get-update-base-entry (quote
(time
(standards-version 1.1
- version "1.08"
+ version "1.11"
author-version "1.17"
- date "1998-04-24"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority medium
category "oa"
dump nil
description "Display time & date on the modeline."
- filename "time-1.08-pkg.tar.gz"
- md5sum "c67d7143de5694ec4a7e17023ceab902"
- size 19994
+ filename "time-1.11-pkg.tar.gz"
+ md5sum "93ca34fe3275dc3ef5b8fd4c6824551d"
+ size 19983
provides (time)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(text-modes
(standards-version 1.1
- version "1.21"
- author-version "21.1"
- date "1999-07-06"
- build-date "1999-07-30"
+ version "1.32"
+ author-version "21.5b1"
+ date "2001-07-18"
+ build-date "2001-07-21"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
- category "oa"
+ category "standard"
dump nil
description "Miscellaneous support for editing text files."
- filename "text-modes-1.21-pkg.tar.gz"
- md5sum "d9d9505dfbe52854b3337eddfce093d1"
- size 207873
+ filename "text-modes-1.32-pkg.tar.gz"
+ md5sum "6af333dc07f90ef72f735ae5a53da5f3"
+ size 225512
provides (autoinsert crontab-edit filladapt fold-isearch folding image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed swedish tabify whitespace-mode winmgr-mode xpm-mode xrdb-mode)
requires (ispell fsf-compat xemacs-base)
type regular
(package-get-update-base-entry (quote
(slider
(standards-version 1.1
- version "1.10"
+ version "1.13"
author-version "0.3x1"
- date "1998-08-13"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "oa"
dump nil
description "User interface tool."
- filename "slider-1.10-pkg.tar.gz"
- md5sum "a67e165592a2921ff0978a69befa0d6d"
- size 12000
+ filename "slider-1.13-pkg.tar.gz"
+ md5sum "3fbc16b2caeef30e87969e19efa40f32"
+ size 12021
provides (slider color-selector)
requires ()
type regular
(package-get-update-base-entry (quote
(sgml
(standards-version 1.1
- version "1.05"
+ version "1.08"
author-version "21.1"
- date "1998-01-25"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "oa"
dump nil
description "SGML/Linuxdoc-SGML editing."
- filename "sgml-1.05-pkg.tar.gz"
- md5sum "ead5d1671dfebf394be76166c786b0c2"
- size 26937
+ filename "sgml-1.08-pkg.tar.gz"
+ md5sum "bdadf462489fa1540cc56d1c561aaa54"
+ size 26964
provides (sgml linuxdoc-sgml)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(psgml
(standards-version 1.1
- version "1.14"
- author-version "1.01"
- date "1999-06-13"
- build-date "1999-07-30"
+ version "1.23"
+ author-version "1.22"
+ date "2001-02-18"
+ build-date "2001-02-28"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority medium
category "oa"
dump nil
description "Validated HTML/SGML editing."
- filename "psgml-1.14-pkg.tar.gz"
- md5sum "44102484c3e5588bab21005cec1a46e1"
- size 425227
+ filename "psgml-1.23-pkg.tar.gz"
+ md5sum "de5bcf5e4ab559cc239ec060c0db0710"
+ size 650527
provides (psgml sgml)
- requires (edit-utils)
+ requires (xemacs-base edit-utils edebug xemacs-devel mail-lib)
type regular
))
))
(package-get-update-base-entry (quote
(pc
(standards-version 1.1
- version "1.16"
- author-version "21.1"
- date "1999-04-13"
- build-date "1999-07-30"
+ version "1.20"
+ author-version "21.5b1"
+ date "2000-02-12"
+ build-date "2001-05-10"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "oa"
dump nil
description "PC style interface emulation."
- filename "pc-1.16-pkg.tar.gz"
- md5sum "d721157770274b9fee0b16933764c636"
- size 16324
+ filename "pc-1.20-pkg.tar.gz"
+ md5sum "ceab8a41e2992aebfa6efe247c6c851c"
+ size 16703
provides (delbs fusion pc-select pending-del s-region)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(ispell
(standards-version 1.1
- version "1.16"
+ version "1.23"
author-version "3.2"
- date "1999-07-22"
- build-date "1999-07-30"
+ date "2001-08-02"
+ build-date "2001-08-07"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "oa"
+ category "standard"
dump nil
description "Spell-checking with GNU ispell."
- filename "ispell-1.16-pkg.tar.gz"
- md5sum "a3140984afc8a9d5aa0d0116625b2d07"
- size 68157
+ filename "ispell-1.23-pkg.tar.gz"
+ md5sum "d6313eaf9fd77554cd4ee2fc42b898e9"
+ size 72495
provides (ispell)
requires ()
type regular
))
;;;@@@
(package-get-update-base-entry (quote
+(hm--html-menus
+ (standards-version 1.1
+ version "1.16"
+ author-version "5.9"
+ date "2000-10-05"
+ build-date "2001-01-15"
+ maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+ distribution xemacs
+ priority low
+ category "oa"
+ dump nil
+ description "HTML editing."
+ filename "hm--html-menus-1.16-pkg.tar.gz"
+ md5sum "defc795c8c783b13599927399df7bf18"
+ size 178704
+ provides (adapt hm--date hm--html-configuration hm--html-drag-and-drop hm--html-indentation hm--html-keys hm--html-menu hm--html-mode hm--html-not-standard hm--html html-view tmpl-minor-mode)
+ requires (dired xemacs-base)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
(frame-icon
(standards-version 1.1
- version "1.07"
+ version "1.09"
author-version "21.1"
date "1998-07-14"
- build-date "1999-07-30"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "oa"
dump nil
description "Set up mode-specific icons for each frame under XEmacs"
- filename "frame-icon-1.07-pkg.tar.gz"
- md5sum "320909b8d8caa9754c08963878acbb8b"
- size 33434
+ filename "frame-icon-1.09-pkg.tar.gz"
+ md5sum "91922e43447422f175065428367fb00b"
+ size 33436
provides (forms forms-mode)
requires ()
type regular
(package-get-update-base-entry (quote
(forms
(standards-version 1.1
- version "1.11"
+ version "1.13"
author-version "2.37"
- date "1999-05-11"
- build-date "1999-07-30"
+ date "1999-10-07"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "oa"
dump nil
description "Forms editing support (obsolete, use Widget instead)."
- filename "forms-1.11-pkg.tar.gz"
- md5sum "36604485f4a1031d28968fe2c8534a6d"
- size 48263
+ filename "forms-1.13-pkg.tar.gz"
+ md5sum "f18fd40a2068b851890ca59d3f1845a7"
+ size 48380
provides (forms forms-mode)
requires ()
type regular
(package-get-update-base-entry (quote
(calendar
(standards-version 1.1
- version "1.12"
- author-version "21.1"
- date "1999-06-24"
- build-date "1999-07-30"
+ version "1.17"
+ author-version "21.5b3"
+ date "2001-12-10"
+ build-date "2001-12-10"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "oa"
+ category "standard"
dump nil
description "Calendar and diary support."
- filename "calendar-1.12-pkg.tar.gz"
- md5sum "d6ad2b3a3477d04ca3b669a67eecc8bc"
- size 250669
+ filename "calendar-1.17-pkg.tar.gz"
+ md5sum "8821f0209b1ecf2bdb24cddb5b480956"
+ size 252183
provides (appt cal-dst cal-french cal-mayan cal-x cal-xemacs calendar diary-ins diary-lib holidays lunar solar)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(calc
(standards-version 1.1
- version "1.11"
+ version "1.17"
author-version "2.02fX3"
- date "1998-07-25"
- build-date "1999-07-30"
+ date "2001-07-30"
+ build-date "2001-07-31"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "oa"
+ category "standard"
dump nil
description "Emacs calculator"
- filename "calc-1.11-pkg.tar.gz"
- md5sum "7a0cce9d75b5c70f02db67f18eb6a97d"
- size 1616700
+ filename "calc-1.17-pkg.tar.gz"
+ md5sum "96d9973ad70e2d7b8a8b9682188335ef"
+ size 1614612
provides (calc)
requires ()
type regular
(package-get-update-base-entry (quote
(speedbar
(standards-version 1.1
- version "1.13"
- author-version "0.6.2x"
- date "1999-07-15"
- build-date "1999-07-30"
- maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+ version "1.21"
+ author-version "0.13"
+ date "2001-07-26"
+ build-date "2001-07-28"
+ maintainer "Eric M. Ludlam <zappo@gnu.org>"
distribution xemacs
priority low
- category "oa"
+ category "standard"
dump nil
- description "Provides a seperate frame with convenient references."
- filename "speedbar-1.13-pkg.tar.gz"
- md5sum "0a2352aa6866888fc8ecdc7ec8d86516"
- size 64955
+ description "Provides a separate frame with convenient references."
+ filename "speedbar-1.21-pkg.tar.gz"
+ md5sum "0cc730cc05aebd7ab14ad60d5cd53065"
+ size 136610
provides (speedbar)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(edit-utils
(standards-version 1.1
- version "1.41"
- author-version "21.1"
- date "1999-07-07"
- build-date "1999-07-30"
+ version "1.73"
+ author-version "21.5b3"
+ date "2001-12-13"
+ build-date "2001-12-13"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
- category "oa"
+ category "standard"
dump nil
description "Miscellaneous editor extensions, you probably need this."
- filename "edit-utils-1.41-pkg.tar.gz"
- md5sum "a3d5116811348bde6d56976ce94a991a"
- size 579673
+ filename "edit-utils-1.73-pkg.tar.gz"
+ md5sum "508d8b321a81bfc69b2ddc3ae3f49174"
+ size 697616
provides (abbrevlist atomic-extents avoid backup-dir balloon-help big-menubar blink-cursor blink-paren bookmark compare-w completion dabbrev desktop detached-minibuf edit-toolbar fast-lock file-part floating-toolbar flow-ctrl foldout func-menu hippie-exp icomplete id-select info-look iswitchb lazy-lock lazy-shot live-icon man mic-paren paren popper mode-motion+ outl-mouse page-ext blink-paren paren permanent-buffers recent-files redo reportmail rsz-minibuf saveconfsavehist saveplace scroll-in-place tempo toolbar-utils tree-menu uniquify where-was-i-db)
- requires (xemacs-base)
+ requires (xemacs-base fsf-compat)
type single
))
))
;;;@@@
(package-get-update-base-entry (quote
+(pcomplete
+ (standards-version 1.1
+ version "1.01"
+ author-version "1.1.6"
+ date "2000-03-06"
+ build-date "2001-01-15"
+ maintainer "John Wiegley <johnw@gnu.org>"
+ distribution xemacs
+ priority medium
+ category "os"
+ dump nil
+ description "Provides programmatic completion."
+ filename "pcomplete-1.01-pkg.tar.gz"
+ md5sum "ee42f90e2a4bb878bd5768ba49ed96ba"
+ size 37289
+ provides (pcomplete)
+ requires (sh-script)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(eshell
+ (standards-version 1.1
+ version "1.01"
+ author-version "2.4.1"
+ date "2000-12-20"
+ build-date "2001-01-15"
+ maintainer "John Wiegley <johnw@gnu.org>"
+ distribution xemacs
+ priority medium
+ category "os"
+ dump nil
+ description "Command shell implemented entirely in Emacs Lisp"
+ filename "eshell-1.01-pkg.tar.gz"
+ md5sum "71d400303baad4de19334b4693b443da"
+ size 231267
+ provides (eshell)
+ requires (xemacs-base eterm)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
(view-process
(standards-version 1.1
- version "1.07"
+ version "1.11"
author-version "2.4"
- date "1998-01-24"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "os"
dump nil
description "A Unix process browsing tool."
- filename "view-process-1.07-pkg.tar.gz"
- md5sum "47a82bb6569dd9d9bed03a57c9391538"
- size 59953
+ filename "view-process-1.11-pkg.tar.gz"
+ md5sum "8273fcfd035804c4b376786629c7b205"
+ size 60260
provides (view-process-mode)
requires (xemacs-base)
type regular
))
;;;@@@
(package-get-update-base-entry (quote
+(ps-print-nomule
+ (standards-version 1.1
+ version "1.05"
+ author-version "3.05x1"
+ date "2000-10-28"
+ build-date "2001-01-15"
+ maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+ distribution xemacs
+ priority medium
+ category "os"
+ dump nil
+ description "Old, but no-Mule safe ps-print"
+ filename "ps-print-nomule-1.05-pkg.tar.gz"
+ md5sum "c071d71ac89d9a540c0799fb33f40c3a"
+ size 52879
+ provides (ps-print)
+ requires (xemacs-base)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
(os-utils
- (standards-version 1.0
- version "1.15"
- author-version "21.0"
- date "1999-03-19"
- build-date "1999-05-13"
+ (standards-version 1.1
+ version "1.25"
+ author-version "21.1"
+ date "2000-11-09"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
- distribution stable
+ distribution xemacs
priority medium
category "os"
dump nil
description "Miscellaneous O/S utilities."
- filename "os-utils-1.15-pkg.tar.gz"
- md5sum "92a3d72b0df1fb79fef2aee88a4d4f50"
- size 228261
- provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat ps-print tar-mode telnet terminal uncompress)
+ filename "os-utils-1.25-pkg.tar.gz"
+ md5sum "e71b109e0fb81032fa664768c98b6bcc"
+ size 202651
+ provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat tar-mode telnet terminal uncompress)
requires (xemacs-base)
type single
))
(package-get-update-base-entry (quote
(ilisp
(standards-version 1.1
- version "1.08"
- author-version "5.8"
- date "1998-01-24"
- build-date "1999-07-30"
- maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+ version "1.19"
+ author-version "5.11.1"
+ date "2001-07-05"
+ build-date "2001-07-05"
+ maintainer "ilisp Maintainers <ilisp@cons.org>"
distribution xemacs
priority low
- category "os"
+ category "standard"
dump nil
description "Front-end for Inferior Lisp."
- filename "ilisp-1.08-pkg.tar.gz"
- md5sum "12041533cb292d9d58a55278c8882c70"
- size 262171
+ filename "ilisp-1.19-pkg.tar.gz"
+ md5sum "c4379cdfd02c0d578e8877191d3658ff"
+ size 335570
provides (ilisp completer)
- requires (xemacs-base)
+ requires (xemacs-base mail-lib fsf-compat eterm)
type regular
))
))
(package-get-update-base-entry (quote
(igrep
(standards-version 1.1
- version "1.06"
+ version "1.08"
author-version "2.83"
date "1998-08-11"
- build-date "1999-07-30"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "os"
dump nil
description "Enhanced front-end for Grep."
- filename "igrep-1.06-pkg.tar.gz"
- md5sum "9a61dc2c81e909993e14254f30df3ee7"
- size 14927
+ filename "igrep-1.08-pkg.tar.gz"
+ md5sum "bc3e4d7a897edb164f93ef49eeff87d3"
+ size 15184
provides (igrep)
requires (dired xemacs-base)
type regular
(package-get-update-base-entry (quote
(eterm
(standards-version 1.1
- version "1.09"
+ version "1.13"
author-version "21.1"
- date "1999-07-07"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority medium
category "os"
dump nil
description "Terminal emulation."
- filename "eterm-1.09-pkg.tar.gz"
- md5sum "9cdab77e28dc87a79db4c503c961b37a"
- size 109066
+ filename "eterm-1.13-pkg.tar.gz"
+ md5sum "ebd64834d12a2a3fc04bbb6f4dd836fa"
+ size 109184
provides (eterm)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(viper
(standards-version 1.1
- version "1.17"
- author-version "3.061"
- date "1999-05-27"
- build-date "1999-07-30"
+ version "1.29"
+ author-version "3.09"
+ date "2001-10-13"
+ build-date "2001-11-26"
maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
distribution xemacs
priority low
- category "wp"
+ category "standard"
dump nil
description "VI emulation support."
- filename "viper-1.17-pkg.tar.gz"
- md5sum "89285f1297d73552d43602cf1288aefd"
- size 317943
+ filename "viper-1.29-pkg.tar.gz"
+ md5sum "aa4126c14967ab99fe5584ff8d1d7365"
+ size 327443
provides (viper)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(tpu
(standards-version 1.1
- version "1.09"
+ version "1.12"
author-version "4.2X"
- date "1998-07-23"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "Kevin Oberman <oberman@es.net>"
distribution xemacs
priority medium
category "wp"
dump nil
description "DEC EDIT/TPU support."
- filename "tpu-1.09-pkg.tar.gz"
- md5sum "9a467bd306599d97f0f5be0266850d79"
- size 58814
+ filename "tpu-1.12-pkg.tar.gz"
+ md5sum "8ee6ca98afc9c18a1df013065c430f5e"
+ size 58850
provides (tpu)
requires ()
type regular
(package-get-update-base-entry (quote
(textools
(standards-version 1.1
- version "1.09"
+ version "1.12"
author-version "21.1"
- date "1998-04-29"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority medium
category "wp"
dump nil
description "Miscellaneous TeX support."
- filename "textools-1.09-pkg.tar.gz"
- md5sum "d0e16392dfdcd9ec8eab4ebc8da9948e"
- size 79187
+ filename "textools-1.12-pkg.tar.gz"
+ md5sum "2ce1dc6eb29773d2ab6ce2e04463e54f"
+ size 79212
provides (bib-mode bibtex refer-to-bibtex)
requires (xemacs-base)
type single
(package-get-update-base-entry (quote
(texinfo
(standards-version 1.1
- version "1.15"
+ version "1.20"
author-version "21.1"
- date "1998-07-20"
- build-date "1999-07-30"
+ date "2000-03-18"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
category "wp"
dump nil
description "XEmacs TeXinfo support."
- filename "texinfo-1.15-pkg.tar.gz"
- md5sum "3c0ba97404953b4383d06f0a88a3a6cd"
- size 127873
+ filename "texinfo-1.20-pkg.tar.gz"
+ md5sum "25a3261b1700f4b83d229dc1dcf633ae"
+ size 133067
provides (makeinfo tex-mode texinfmt texinfo texnfo-tex texnfo-upd)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(reftex
(standards-version 1.1
- version "1.14"
- author-version "3.43"
- date "1999-04-06"
- build-date "1999-07-30"
- maintainer "Carsten Dominik <dominik@strw.LeidenUniv.nl>"
+ version "1.23"
+ author-version "4.16"
+ date "artin@xema"
+ build-date "2001-06-14"
+ maintainer "Carsten Dominik <dominik@astro.uva.nl>"
distribution xemacs
priority medium
category "wp"
dump nil
description "Emacs support for LaTeX cross-references, citations.."
- filename "reftex-1.14-pkg.tar.gz"
- md5sum "e56e631f54e895ed95377be6e882bed5"
- size 215968
+ filename "reftex-1.23-pkg.tar.gz"
+ md5sum "418d13bcf80e929e27be7c68bf718e3c"
+ size 330411
provides (reftex)
requires (fsf-compat xemacs-base)
type regular
(package-get-update-base-entry (quote
(edt
(standards-version 1.1
- version "1.08"
- author-version "21.1"
- date "1998-04-07"
- build-date "1999-07-30"
+ version "1.12"
+ author-version "21.5b1"
+ date "2001-07-14"
+ build-date "2001-07-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "wp"
+ category "standard"
dump nil
description "DEC EDIT/EDT emulation."
- filename "edt-1.08-pkg.tar.gz"
- md5sum "bade43d3b5c90a4b9c969a1f85ef606e"
- size 46128
+ filename "edt-1.12-pkg.tar.gz"
+ md5sum "0d7649d0f65d9de732918d756f5cf48b"
+ size 62441
provides (edt)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(crisp
(standards-version 1.1
- version "1.10"
+ version "1.12"
author-version "1.34"
date "1998-08-18"
- build-date "1999-07-30"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "wp"
dump nil
description "Crisp/Brief emulation."
- filename "crisp-1.10-pkg.tar.gz"
- md5sum "82fcef8e2a2c6e0d40c68f6142c6a780"
- size 10065
+ filename "crisp-1.12-pkg.tar.gz"
+ md5sum "30308c6e5fb14f621d53046894c8c180"
+ size 10075
provides (crisp scroll-lock)
requires ()
type regular
(package-get-update-base-entry (quote
(auctex
(standards-version 1.1
- version "1.17"
- author-version "9.7p"
- date "1998-09-30"
- build-date "1999-07-30"
+ version "1.28"
+ author-version "10.0g"
+ date "2001-12-13"
+ build-date "2001-12-13"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority medium
- category "wp"
+ category "standard"
dump nil
description "Basic TeX/LaTeX support."
- filename "auctex-1.17-pkg.tar.gz"
- md5sum "be1dc85bba341dba02ec13ce06bf9609"
- size 365053
+ filename "auctex-1.28-pkg.tar.gz"
+ md5sum "a159936d264c746b33776ca9ec078ee8"
+ size 385145
provides (auc-old bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-site tex)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(vhdl
(standards-version 1.1
- version "1.08"
- author-version "2.74"
- date "1998-01-24"
- build-date "1999-07-30"
+ version "1.13"
+ author-version "3.31.20"
+ date "2001-02-16"
+ build-date "2001-02-18"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "prog"
dump nil
description "Support for VHDL."
- filename "vhdl-1.08-pkg.tar.gz"
- md5sum "8d3422f8b6ba5584dbf89d3ef6759594"
- size 65948
+ filename "vhdl-1.13-pkg.tar.gz"
+ md5sum "76ef5bea9a7f1c5fb899306089efd0d8"
+ size 272552
provides (vhdl-mode)
- requires ()
+ requires (xemacs-base edit-utils c-support speedbar ps-print-nomule os-utils)
type regular
))
))
(package-get-update-base-entry (quote
(vc
(standards-version 1.1
- version "1.19"
- author-version "21.1"
- date "1999-06-07"
- build-date "1999-07-30"
+ version "1.29"
+ author-version "21.5b3"
+ date "2001-12-03"
+ build-date "2001-12-03"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "prog"
+ category "standard"
dump nil
description "Version Control for Free systems."
- filename "vc-1.19-pkg.tar.gz"
- md5sum "2794428c1167de3f1db8e9928041b065"
- size 84689
+ filename "vc-1.29-pkg.tar.gz"
+ md5sum "2c183467360502ae808424ecb179d178"
+ size 91255
provides (vc)
- requires (dired xemacs-base)
+ requires (dired xemacs-base vc mail-lib ediff)
type regular
))
))
(package-get-update-base-entry (quote
(vc-cc
(standards-version 1.1
- version "1.12"
- author-version "21.1"
- date "1998-12-09"
- build-date "1999-07-30"
+ version "1.18"
+ author-version "21.5b3"
+ date "2001-12-10"
+ build-date "2001-12-10"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "prog"
+ category "standard"
dump nil
description "Version Control for ClearCase (UnFree) systems."
- filename "vc-cc-1.12-pkg.tar.gz"
- md5sum "db978159bf5d1d194782b79961d003d1"
- size 96520
+ filename "vc-cc-1.18-pkg.tar.gz"
+ md5sum "6885bb091d1fd108a7ec4353a96016ec"
+ size 94520
provides (vc)
requires (dired xemacs-base)
type regular
(package-get-update-base-entry (quote
(sh-script
(standards-version 1.1
- version "1.10"
+ version "1.13"
author-version "2.0e"
- date "1999-05-31"
- build-date "1999-07-30"
+ date "2000-07-11"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "prog"
dump nil
description "Support for editing shell scripts."
- filename "sh-script-1.10-pkg.tar.gz"
- md5sum "003e39a5e97acce6f9b751a1fec5e398"
- size 33987
+ filename "sh-script-1.13-pkg.tar.gz"
+ md5sum "d9fa57da5e44091bf31282886de25687"
+ size 35304
provides (sh-script executable)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(scheme
(standards-version 1.1
- version "1.09"
+ version "1.11"
author-version "21.1"
date "1999-06-15"
- build-date "1999-07-30"
+ build-date "2001-01-15"
maintainer "Karl M. Hegbloom <karlheg@bittersweet.inetarena.com>"
distribution xemacs
priority low
category "prog"
dump nil
description "Front-end support for Inferior Scheme."
- filename "scheme-1.09-pkg.tar.gz"
- md5sum "a4542795594e46af3b803d44ed3d7c8d"
- size 36505
+ filename "scheme-1.11-pkg.tar.gz"
+ md5sum "8994fb43b37a55d4b9ad763af67a45ba"
+ size 36497
provides (scheme xscheme cmuscheme cmuscheme48)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(prog-modes
(standards-version 1.1
- version "1.21"
- author-version "21.1"
- date "1999-07-15"
- build-date "1999-07-30"
+ version "1.44"
+ author-version "21.5b3"
+ date "2001-12-05"
+ build-date "2001-12-10"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority medium
- category "prog"
+ category "standard"
dump nil
description "Support for various programming languages."
- filename "prog-modes-1.21-pkg.tar.gz"
- md5sum "e83aff3ead4ab018d07b9b22e9ba301d"
- size 601321
+ filename "prog-modes-1.44-pkg.tar.gz"
+ md5sum "dbe40bbe4ec194c5ed777b0c5f1548ea"
+ size 720453
provides (autoconf-mode cperl-mode eiffel3 f90 fortran ksh-mode m4-mode makefile perl-mode postscript python-mode rexx-mode simula-mode tcl teco verilog-mod)
- requires (mail-lib xemacs-devel xemacs-base)
+ requires (mail-lib xemacs-devel xemacs-base cc-mode ps-print-nomule fsf-compat edit-utils ediff emerge efs)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(jde
+ (standards-version 1.1
+ version "1.31"
+ author-version "2.2.8"
+ date "2001-10-14"
+ build-date "2001-11-26"
+ maintainer "Paul Kinnucan <paulk@mathworks.com>"
+ distribution xemacs
+ priority medium
+ category "standard"
+ dump nil
+ description "Java language and development support."
+ filename "jde-1.31-pkg.tar.gz"
+ md5sum "1013e43ea81d2cc354da2bb19f44b205"
+ size 1620042
+ provides (jde)
+ requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base xemacs-devel eieio elib sh-script)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(idlwave
+ (standards-version 1.1
+ version "1.23"
+ author-version "4.7"
+ date "2000-12-08"
+ build-date "2001-01-15"
+ maintainer "Carsten Dominik <dominik@astro.uva.nl>"
+ distribution xemacs
+ priority medium
+ category "prog"
+ dump nil
+ description "Editing and Shell mode for the Interactive Data Language"
+ filename "idlwave-1.23-pkg.tar.gz"
+ md5sum "71163a118316b2da6cff6371455dad4c"
+ size 345555
+ provides (idlwave)
+ requires (fsf-compat xemacs-base)
type regular
))
))
(package-get-update-base-entry (quote
(emerge
(standards-version 1.1
- version "1.06"
+ version "1.09"
author-version "21.1"
- date "1998-04-07"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "prog"
dump nil
description "Another interface over GNU patch."
- filename "emerge-1.06-pkg.tar.gz"
- md5sum "1f4c3003975e8c540742c37cd398dd4b"
- size 61012
+ filename "emerge-1.09-pkg.tar.gz"
+ md5sum "231c8120d60da2c9ddd856510da2491c"
+ size 61043
provides (emerge)
requires ()
type regular
))
;;;@@@
(package-get-update-base-entry (quote
+(ediff
+ (standards-version 1.1
+ version "1.33"
+ author-version "2.75"
+ date "2001-09-27"
+ build-date "2001-09-29"
+ maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
+ distribution xemacs
+ priority medium
+ category "standard"
+ dump nil
+ description "Interface over GNU patch."
+ filename "ediff-1.33-pkg.tar.gz"
+ md5sum "8a5b50752086adb44f7d2ec99e10d2eb"
+ size 295809
+ provides (ediff)
+ requires (pcl-cvs elib dired xemacs-base edebug prog-modes)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
(debug
(standards-version 1.1
- version "1.10"
- author-version "21.1"
- date "1999-05-12"
- build-date "1999-07-30"
+ version "1.14"
+ author-version "21.2b42"
+ date "2000-11-07"
+ build-date "2001-01-27"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "prog"
dump nil
description "GUD, gdb, dbx debugging support."
- filename "debug-1.10-pkg.tar.gz"
- md5sum "81fab3bf4b08036d122f1e6abb7ffc74"
- size 103093
+ filename "debug-1.14-pkg.tar.gz"
+ md5sum "20312f80900f1c99f3eeecddf75026ca"
+ size 103296
provides (dbx gdb-highlight gdb gdbsrc gud history)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(c-support
(standards-version 1.1
- version "1.13"
+ version "1.16"
author-version "21.1"
- date "1999-03-02"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "prog"
dump nil
description "Basic single-file add-ons for editing C code."
- filename "c-support-1.13-pkg.tar.gz"
- md5sum "d4568a0fd8c0ea31917ad37e190e443b"
- size 69931
+ filename "c-support-1.16-pkg.tar.gz"
+ md5sum "047accf51457a041bf920c9563de1bf6"
+ size 70393
provides (c-comment-edit cmacexp ctypes hideif hideshow)
requires (cc-mode xemacs-base)
type regular
(package-get-update-base-entry (quote
(ada
(standards-version 1.1
- version "1.07"
+ version "1.10"
author-version "2.27"
- date "1998-01-24"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "prog"
dump nil
description "Ada language support."
- filename "ada-1.07-pkg.tar.gz"
- md5sum "f12fe7c6ac8ed3bcfeb761ffd9e60661"
- size 54369
+ filename "ada-1.10-pkg.tar.gz"
+ md5sum "6ba6ca52a345831e8fafa241119db39f"
+ size 54387
provides (ada-mode ada-stmt)
requires ()
type regular
(package-get-update-base-entry (quote
(pcl-cvs
(standards-version 1.1
- version "1.40"
- author-version "R-2_0-Beta_2"
- date "1999-06-16"
- build-date "1999-07-30"
+ version "1.55"
+ author-version "R-2_9_9"
+ date "2001-06-06"
+ build-date "2001-07-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "prog"
+ category "standard"
dump nil
description "CVS frontend."
- filename "pcl-cvs-1.40-pkg.tar.gz"
- md5sum "2ad22b28bb14a7bade0b2fad0723d35f"
- size 163639
+ filename "pcl-cvs-1.55-pkg.tar.gz"
+ md5sum "d4f7b40492290a31139f2233b035d3d7"
+ size 160861
provides (pcl-cvs generic-sc)
- requires (xemacs-base elib dired)
+ requires (xemacs-base elib vc dired edebug ediff edit-utils mail-lib prog-modes)
type regular
))
))
(package-get-update-base-entry (quote
(cc-mode
(standards-version 1.1
- version "1.16"
- author-version "5.25"
- date "1998-12-30"
- build-date "1999-07-30"
- maintainer "Barry Warsaw <bug-cc-mode@gnu.org>"
+ version "1.26"
+ author-version "5.28"
+ date "2001-08-13"
+ build-date "2001-08-14"
+ maintainer "Martin Stjernholm <bug-cc-mode@gnu.org>"
distribution xemacs
priority medium
- category "prog"
+ category "standard"
dump nil
description "C, C++ and Java language support."
- filename "cc-mode-1.16-pkg.tar.gz"
- md5sum "9f8c53d9abca09982e739344c733c7c3"
- size 212664
+ filename "cc-mode-1.26-pkg.tar.gz"
+ md5sum "206a11ebe3e1e4639e9e3cbf681d9096"
+ size 262806
provides (cc-mode)
- requires (xemacs-base)
+ requires (xemacs-base mail-lib)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(semantic
+ (standards-version 1.1
+ version "1.10"
+ author-version "1.4beta8"
+ date "2001-08-16"
+ build-date "2001-08-16"
+ maintainer "Eric M. Ludlam <zappo@gnu.org>"
+ distribution xemacs
+ priority low
+ category "standard"
+ dump nil
+ description "Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator."
+ filename "semantic-1.10-pkg.tar.gz"
+ md5sum "a3806bbbd6d4cd1ebb11ed969ccc37ec"
+ size 281656
+ provides (semantic senator)
+ requires (eieio xemacs-base xemacs-devel edit-utils speedbar texinfo)
type regular
))
))
(package-get-update-base-entry (quote
(misc-games
(standards-version 1.1
- version "1.12"
+ version "1.15"
author-version "21.1"
- date "1999-03-05"
- build-date "1999-07-30"
+ date "2000-11-18"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "games"
dump nil
description "Other amusements and diversions."
- filename "misc-games-1.12-pkg.tar.gz"
- md5sum "74c3421bdfdfe77989741389f0e1330a"
- size 166163
+ filename "misc-games-1.15-pkg.tar.gz"
+ md5sum "a77db688d2d276aaca5840a7c16615f0"
+ size 166336
provides (decipher gomoku hanoi life morse rot13)
requires (xemacs-base)
type single
(package-get-update-base-entry (quote
(mine
(standards-version 1.1
- version "1.11"
+ version "1.14"
author-version "1.9"
- date "1998-05-09"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "games"
dump nil
description "Minehunt Game."
- filename "mine-1.11-pkg.tar.gz"
- md5sum "fad5f9d385ac22c2cf446db18e57300e"
- size 66703
+ filename "mine-1.14-pkg.tar.gz"
+ md5sum "ebe471b68642906786db139d402002c7"
+ size 66727
provides (xmine)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(games
(standards-version 1.1
- version "1.10"
+ version "1.13"
author-version "1.04"
- date "1998-06-04"
- build-date "1999-07-30"
+ date "2000-03-23"
+ build-date "2001-01-15"
maintainer "Glynn Clements <glynn@sensei.co.uk>"
distribution xemacs
priority low
category "games"
dump nil
description "Tetris, Sokoban, and Snake."
- filename "games-1.10-pkg.tar.gz"
- md5sum "e43de212a7ceb56cbaad7e40eb775dd2"
- size 32184
+ filename "games-1.13-pkg.tar.gz"
+ md5sum "4138cc59fd6a9316adbb14e7468af593"
+ size 32438
provides (gamegrid snake tetris sokoban)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(cookie
(standards-version 1.1
- version "1.11"
+ version "1.13"
author-version "21.1"
date "1998-04-07"
- build-date "1999-07-30"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "games"
dump nil
description "Spook and Yow (Zippy quotes)."
- filename "cookie-1.11-pkg.tar.gz"
- md5sum "291ea47a1e71de661de365aea0addb60"
- size 34221
+ filename "cookie-1.13-pkg.tar.gz"
+ md5sum "9aeaa055b157c6fa50991758851ec16d"
+ size 34192
provides (cookie1 yow)
requires (xemacs-base)
type regular
))
;;;@@@
(package-get-update-base-entry (quote
+(eicq
+ (standards-version 1.1
+ version "1.05"
+ author-version "0.2.14"
+ date "2001-06-06"
+ build-date "2001-07-02"
+ maintainer "Steve Youngs <youngs@xemacs.org>"
+ distribution xemacs
+ priority low
+ category "standard"
+ dump nil
+ description "ICQ Client developed and tested on Linux x86; only supported on that platform"
+ filename "eicq-1.05-pkg.tar.gz"
+ md5sum "09c41ae8e50c418bc73029a05c0694f3"
+ size 299679
+ provides (eicq eicq-toolbar eicq-report)
+ requires (xemacs-base mail-lib eicq gnus fsf-compat cookie)
+ type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
(bbdb
(standards-version 1.1
- version "1.08"
- author-version "2.00.06"
- date "1999-01-24"
- build-date "1999-07-30"
- maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+ version "1.16"
+ author-version "2.32"
+ date "2001-08-29"
+ build-date "2001-09-01"
+ maintainer "Ronan Waide <waider@waider.ie>"
distribution xemacs
priority medium
- category "comm"
+ category "standard"
dump nil
description "The Big Brother Data Base"
- filename "bbdb-1.08-pkg.tar.gz"
- md5sum "c95ed737fab5b59e88d9acc33703697b"
- size 282061
+ filename "bbdb-1.16-pkg.tar.gz"
+ md5sum "076538ab2bf64b6bfbe0ce02edf51eac"
+ size 338066
provides (bbdb)
- requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base)
+ requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base w3)
type regular
))
))
(package-get-update-base-entry (quote
(zenirc
(standards-version 1.1
- version "1.06"
+ version "1.11"
author-version "2.112"
- date "1998-08-15"
- build-date "1999-07-30"
+ date "2001-06-16"
+ build-date "2001-07-28"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority medium
- category "comm"
+ category "standard"
dump nil
description "ZENIRC IRC Client."
- filename "zenirc-1.06-pkg.tar.gz"
- md5sum "7b701d195193ad6b0bf8e2067e17e372"
- size 276012
+ filename "zenirc-1.11-pkg.tar.gz"
+ md5sum "ef56684bdf71cae7e15f58c3819a7ee9"
+ size 276478
provides (zenirc)
requires (zenirc)
type regular
(package-get-update-base-entry (quote
(mew
(standards-version 1.1
- version "1.08"
- author-version "1.93b38x1"
- date "1998-12-09"
- build-date "1999-07-30"
+ version "1.14"
+ author-version "1.94.2"
+ date "2001-02-05"
+ build-date "2001-02-05"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "comm"
dump nil
description "Messaging in an Emacs World."
- filename "mew-1.08-pkg.tar.gz"
- md5sum "47ff3e8966c6a198cbae3a413139f4b7"
- size 518502
+ filename "mew-1.14-pkg.tar.gz"
+ md5sum "c46627866de19034116a0c739be8e1eb"
+ size 655083
provides (mew)
- requires (mew)
+ requires (mew w3 efs mail-lib xemacs-base fsf-compat)
type regular
))
))
(package-get-update-base-entry (quote
(tm
(standards-version 1.1
- version "1.20"
- author-version "21.1"
- date "1999-02-06"
- build-date "1999-07-30"
+ version "1.29"
+ author-version "21.5b2"
+ date "2001-07-31"
+ build-date "2001-07-31"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "comm"
+ category "standard"
dump nil
- description "Emacs MIME support."
- filename "tm-1.20-pkg.tar.gz"
- md5sum "d602235f7efdcdd37e7758101e3c162d"
- size 329547
+ description "Emacs MIME support. Not needed for gnus >= 5.8.0"
+ filename "tm-1.29-pkg.tar.gz"
+ md5sum "ae9c106bafbfb471ceaaaf16b7acb8ac"
+ size 332928
provides (tm tm-edit tm-view mime-setup)
- requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base)
+ requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base fsf-compat)
type regular
))
))
(package-get-update-base-entry (quote
(gnus
(standards-version 1.1
- version "1.42"
- author-version "5.6.45x1"
- date "1999-03-12"
- build-date "1999-07-30"
+ version "1.57"
+ author-version "5.8.8"
+ date "2001-08-29"
+ build-date "2001-09-01"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority medium
- category "comm"
+ category "standard"
dump nil
description "The Gnus Newsreader and Mailreader."
- filename "gnus-1.42-pkg.tar.gz"
- md5sum "f076c9ae4ca6ab468454d8036a178501"
- size 1872714
+ filename "gnus-1.57-pkg.tar.gz"
+ md5sum "e0d0ffe9792aad3c28af0077b5809c07"
+ size 2350636
provides (gnus message)
- requires (gnus tm apel w3 mh-e mailcrypt rmail mail-lib xemacs-base)
+ requires (gnus w3 mh-e mailcrypt rmail eterm mail-lib xemacs-base fsf-compat)
type regular
))
))
(package-get-update-base-entry (quote
(rmail
(standards-version 1.1
- version "1.10"
+ version "1.12"
author-version "21.1"
date "1998-06-28"
- build-date "1999-07-30"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "comm"
dump nil
description "An obsolete Emacs mailer."
- filename "rmail-1.10-pkg.tar.gz"
- md5sum "4a8b8e1d7b68957ab357d8f86f232fac"
- size 96442
+ filename "rmail-1.12-pkg.tar.gz"
+ md5sum "ef29f27bfb5b7af89ae57be18b94da6f"
+ size 96401
provides (rmail rmailsum)
requires (tm apel mail-lib xemacs-base)
type regular
(package-get-update-base-entry (quote
(mailcrypt
(standards-version 1.1
- version "2.01"
- author-version "3.5.3"
- date "1999-03-12"
- build-date "1999-07-30"
+ version "2.09"
+ author-version "3.5.6"
+ date "2001-07-01"
+ build-date "2001-07-02"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "comm"
+ category "standard"
dump nil
description "Support for messaging encryption with PGP."
- filename "mailcrypt-2.01-pkg.tar.gz"
- md5sum "1225a54298f26e6a06749dfb0665b658"
- size 134061
+ filename "mailcrypt-2.09-pkg.tar.gz"
+ md5sum "34b06d81b131c89d83b1c9387e23975a"
+ size 141199
provides (mailcrypt)
- requires (mail-lib fsf-compat xemacs-base)
+ requires (mail-lib fsf-compat xemacs-base cookie gnus mh-e rmail vm)
type regular
))
))
(package-get-update-base-entry (quote
(supercite
(standards-version 1.1
- version "1.13"
+ version "1.18"
author-version "3.55x3"
- date "1999-04-06"
- build-date "1999-07-30"
+ date "2001-08-06"
+ build-date "2001-08-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "comm"
+ category "standard"
dump nil
description "An Emacs citation tool for News & Mail messages."
- filename "supercite-1.13-pkg.tar.gz"
- md5sum "7f599f29f111dca3e62c3baeec2b2d91"
- size 99547
+ filename "supercite-1.18-pkg.tar.gz"
+ md5sum "e19c81599495ff2a010e81f4b175b9fd"
+ size 100848
provides (supercite)
requires (mail-lib xemacs-base)
type regular
(package-get-update-base-entry (quote
(mh-e
(standards-version 1.1
- version "1.10"
+ version "1.13"
author-version "21.1"
- date "1998-07-12"
- build-date "1999-07-30"
+ date "2000-05-08"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "comm"
dump nil
description "Front end support for MH."
- filename "mh-e-1.10-pkg.tar.gz"
- md5sum "e04e85a9ff62282a18a06872c840e22f"
- size 176436
+ filename "mh-e-1.13-pkg.tar.gz"
+ md5sum "213d2484432c141ba2017d437922076b"
+ size 176657
provides (mh-e)
requires (mail-lib xemacs-base)
type regular
(package-get-update-base-entry (quote
(gnats
(standards-version 1.1
- version "1.09"
+ version "1.12"
author-version "3.101"
- date "1998-08-01"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
category "comm"
dump nil
description "XEmacs bug reports."
- filename "gnats-1.09-pkg.tar.gz"
- md5sum "0893c6cad7179a2be79744bdfc0c6932"
- size 189250
+ filename "gnats-1.12-pkg.tar.gz"
+ md5sum "8487d89459c7be544547558d39f42945"
+ size 189342
provides (gnats gnats-admin send-pr)
requires (mail-lib xemacs-base)
type regular
(package-get-update-base-entry (quote
(footnote
(standards-version 1.1
- version "1.11"
+ version "1.13"
author-version "0.18x"
- date "1999-03-11"
- build-date "1999-07-30"
+ date "2000-01-22"
+ build-date "2001-01-15"
maintainer "SL Baur <steve@xemacs.org>"
distribution xemacs
priority low
category "comm"
dump nil
description "Footnoting in mail message editing modes."
- filename "footnote-1.11-pkg.tar.gz"
- md5sum "7aa931c602913134e5e716de752439db"
- size 18364
+ filename "footnote-1.13-pkg.tar.gz"
+ md5sum "23aa290969664f5edb96c79ae322759b"
+ size 21084
provides (footnote)
requires (mail-lib xemacs-base)
type regular
(package-get-update-base-entry (quote
(eudc
(standards-version 1.1
- version "1.29"
- author-version "1.29"
- date "1999-07-21"
- build-date "1999-07-30"
+ version "1.34"
+ author-version "1.32"
+ date "2001-07-28"
+ build-date "2001-08-20"
maintainer "Oscar Figueiredo <oscar@xemacs.org>"
distribution xemacs
priority low
- category "comm"
+ category "standard"
dump nil
description "Emacs Unified Directory Client (LDAP, PH)."
- filename "eudc-1.29-pkg.tar.gz"
- md5sum "23f490bd6771d873c1869fa1ac56a3a8"
- size 71390
- provides (eudc eudc-ldap eudc-ph eudc-bbdb)
+ filename "eudc-1.34-pkg.tar.gz"
+ md5sum "31aaecdc3bbf2660999ad8b668eb6d9d"
+ size 78955
+ provides (eudc eudc-vars eudc-hotlist eudc-export eudc-bob eudcb-ldap eudcb-ph eudcb-bbdb)
requires (fsf-compat xemacs-base bbdb)
type regular
))
(package-get-update-base-entry (quote
(net-utils
(standards-version 1.1
- version "1.12"
- author-version "21.1"
- date "1998-07-01"
- build-date "1999-07-30"
+ version "1.23"
+ author-version "21.5b3"
+ date "2001-09-28"
+ build-date "2001-09-29"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "comm"
+ category "standard"
dump nil
description "Miscellaneous Networking Utilities."
- filename "net-utils-1.12-pkg.tar.gz"
- md5sum "49b7e1d0f2f97519eca07d3562f6a00d"
- size 107202
+ filename "net-utils-1.23-pkg.tar.gz"
+ md5sum "3677407752d20aa6f72be5d497eae0c8"
+ size 119855
provides (ilisp-browse-cltl2 emacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www)
requires (w3 efs mail-lib xemacs-base)
type single
(package-get-update-base-entry (quote
(w3
(standards-version 1.1
- version "1.14"
- author-version "4.0pre39x1"
- date "1999-03-02"
- build-date "1999-07-30"
+ version "1.20"
+ author-version "4.0pre46"
+ date "2001-06-18"
+ build-date "2001-07-03"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
- category "comm"
+ category "standard"
dump nil
description "A Web browser."
- filename "w3-1.14-pkg.tar.gz"
- md5sum "693692928758ea53e9fa76527893a483"
- size 680740
+ filename "w3-1.20-pkg.tar.gz"
+ md5sum "d2887a223788fec1deb43ba7489cf603"
+ size 689279
provides (w3 url)
requires (w3 mail-lib xemacs-base)
type regular
(package-get-update-base-entry (quote
(vm
(standards-version 1.1
- version "1.21"
- author-version "6.72"
- date "1999-05-13"
- build-date "1999-07-30"
- maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+ version "7.00"
+ author-version "7.00"
+ date "2001-12-09"
+ build-date "2001-12-09"
+ maintainer "Kyle Jones <kyle_jones@wonderworks.com>"
distribution xemacs
priority medium
- category "comm"
+ category "standard"
dump nil
description "An Emacs mailer."
- filename "vm-1.21-pkg.tar.gz"
- md5sum "1110173b0759dbed61e9b1690d32d984"
- size 619207
+ filename "vm-7.00-pkg.tar.gz"
+ md5sum "5cda132d6599eab758ff8623f93bad40"
+ size 699259
provides (vm)
requires (mail-lib xemacs-base)
type regular
(package-get-update-base-entry (quote
(sounds-wav
(standards-version 1.1
- version "1.08"
+ version "1.10"
author-version "21.1"
- date "1999-02-02"
- build-date "1999-07-30"
+ date "2000-05-23"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
category "libs"
dump nil
description "XEmacs Microsoft sound files."
- filename "sounds-wav-1.08-pkg.tar.gz"
- md5sum "8d34b4f2a6cb90f3d86c94d018cc3912"
- size 149046
+ filename "sounds-wav-1.10-pkg.tar.gz"
+ md5sum "89dff9f3b8e1aaaa19f000035e3aa199"
+ size 149162
provides ()
requires ()
type regular
(package-get-update-base-entry (quote
(sounds-au
(standards-version 1.1
- version "1.08"
+ version "1.10"
author-version "21.1"
- date "1999-02-02"
- build-date "1999-07-30"
+ date "2000-05-23"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
category "libs"
dump nil
description "XEmacs Sun sound files."
- filename "sounds-au-1.08-pkg.tar.gz"
- md5sum "8344fa28ad13a14e67accf72168ac91a"
- size 126196
+ filename "sounds-au-1.10-pkg.tar.gz"
+ md5sum "256e09c0570a19ae545350681bacaf3e"
+ size 126306
provides ()
requires ()
type regular
(package-get-update-base-entry (quote
(xemacs-devel
(standards-version 1.1
- version "1.23"
- author-version "21.1"
- date "1999-05-28"
- build-date "1999-07-30"
+ version "1.38"
+ author-version "21.5b3"
+ date "2001-09-08"
+ build-date "2001-09-11"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority medium
- category "libs"
+ category "standard"
dump nil
description "Emacs Lisp developer support."
- filename "xemacs-devel-1.23-pkg.tar.gz"
- md5sum "f0f629aed67569b793347ca9713fc836"
- size 83642
+ filename "xemacs-devel-1.38-pkg.tar.gz"
+ md5sum "ba233ed84cb2f6bb41813297b7adc988"
+ size 156662
provides (docref eldoc elp find-func hide-copyleft ielm regexp-opt trace)
- requires (xemacs-base)
+ requires (xemacs-base ispell mail-lib)
type single
))
))
(package-get-update-base-entry (quote
(tooltalk
(standards-version 1.1
- version "1.10"
+ version "1.13"
author-version "21.1"
- date "1998-07-25"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "libs"
dump nil
description "Support for building with Tooltalk."
- filename "tooltalk-1.10-pkg.tar.gz"
- md5sum "6e73fe7a0ef9d9511e885999b806f914"
- size 9279
+ filename "tooltalk-1.13-pkg.tar.gz"
+ md5sum "3f01dab216a3bc318d11f362d22ea89c"
+ size 9301
provides ()
requires ()
type regular
(package-get-update-base-entry (quote
(elib
(standards-version 1.1
- version "1.05"
+ version "1.08"
author-version "1.0"
- date "1998-10-01"
- build-date "1999-07-30"
+ date "2000-10-05"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
category "libs"
dump nil
description "Portable Emacs Lisp utilities library."
- filename "elib-1.05-pkg.tar.gz"
- md5sum "b9f0d18ae78f70a65a341c515aae2095"
- size 72809
+ filename "elib-1.08-pkg.tar.gz"
+ md5sum "dd8c626d4a2b967febe68bcaa1cd1b96"
+ size 72867
provides (avltree bintree cookie dll elib-node queue-f queue-m read stack-f stack-m string)
requires ()
type single
(package-get-update-base-entry (quote
(edebug
(standards-version 1.1
- version "1.08"
- author-version "21.1"
- date "1998-03-12"
- build-date "1999-07-30"
+ version "1.14"
+ author-version "21.5b1"
+ date "2001-07-16"
+ build-date "2001-07-21"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
- category "libs"
+ category "standard"
dump nil
description "An Emacs Lisp debugger."
- filename "edebug-1.08-pkg.tar.gz"
- md5sum "366450f91a308c84471f7cdb98fd907c"
- size 112428
+ filename "edebug-1.14-pkg.tar.gz"
+ md5sum "8cac8a4c9e7f01bc3199f395fc9d975b"
+ size 112374
provides (edebug cl-read cust-print eval-reg cl-specs)
requires (xemacs-base)
type regular
(package-get-update-base-entry (quote
(Sun
(standards-version 1.1
- version "1.11"
+ version "1.13"
author-version "21.1"
date "1998-07-25"
- build-date "1999-07-30"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority low
category "libs"
dump nil
description "Support for Sparcworks."
- filename "Sun-1.11-pkg.tar.gz"
- md5sum "8920cd925c5bff8b9d4a353d08c1f7ff"
- size 63685
+ filename "Sun-1.13-pkg.tar.gz"
+ md5sum "455b7e1c3564563687e36ab53352ba76"
+ size 63836
provides (sccs eos-browser eos-common eos-debugger eos-debugger eos-editor eos-init eos-load eos-menubar eos-toolbar sunpro)
requires (cc-mode xemacs-base)
type regular
(package-get-update-base-entry (quote
(apel
(standards-version 1.1
- version "1.15"
- author-version "9.20"
- date "1999-07-26"
- build-date "1999-07-30"
+ version "1.20"
+ author-version "10.2"
+ date "2000-11-14"
+ build-date "2001-01-15"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
category "libs"
dump nil
description "A Portable Emacs Library. Used by XEmacs MIME support."
- filename "apel-1.15-pkg.tar.gz"
- md5sum "503832a7c28fe700afc35dbaf7fdeb01"
- size 79178
+ filename "apel-1.20-pkg.tar.gz"
+ md5sum "0d3ac6c109783e1cc48cc4608843d6c3"
+ size 107611
provides (atype emu-20 emu-e19 emu-x20 emu-xemacs emu file-detect filename install mule-caesar path-util richtext std11-parse std11 tinyrich)
requires (fsf-compat xemacs-base)
type regular
;;;@@@
(package-get-update-base-entry (quote
(efs
- (standards-version 1.1
- version "1.15"
- author-version "1.18"
- date "1999-01-03"
- build-date "1999-07-30"
+ (standards-version 1.0
+ version "1.26"
+ author-version "1.20pre2"
+ date "2001-06-09"
+ build-date "2001-06-14"
maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
- distribution xemacs
+ distribution stable
priority medium
- category "libs"
+ category "standard"
dump nil
description "Treat files on remote systems the same as local files."
- filename "efs-1.15-pkg.tar.gz"
- md5sum "4c88a1915bace153310c681f24deb14d"
- size 369713
+ filename "efs-1.26-pkg.tar.gz"
+ md5sum "cecc2e953d90dd3fc3938d26fce4f0f7"
+ size 369938
provides (efs)
- requires (xemacs-base vm dired)
+ requires (xemacs-base dired)
type regular
))
))
;;;@@@
(package-get-update-base-entry (quote
(dired
- (standards-version 1.1
- version "1.06"
- author-version "7.9"
- date "1998-12-09"
- build-date "1999-07-30"
+ (standards-version 1.0
+ version "1.11"
+ author-version "7.10"
+ date "2001-06-03"
+ build-date "2001-06-14"
maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
- distribution xemacs
+ distribution stable
priority medium
- category "libs"
+ category "standard"
dump nil
description "Manage file systems."
- filename "dired-1.06-pkg.tar.gz"
- md5sum "9c857aa147bf53d972ad6ac30ce34bd4"
- size 187691
+ filename "dired-1.11-pkg.tar.gz"
+ md5sum "0b44f0635a1d08189db83e8558cfe8e0"
+ size 193695
provides (diff dired)
- requires (xemacs-base)
+ requires (xemacs-base prog-modes)
type regular
))
))
(package-get-update-base-entry (quote
(mail-lib
(standards-version 1.1
- version "1.24"
- author-version "21.1"
- date "1999-04-13"
- build-date "1999-07-30"
- maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+ version "1.40"
+ author-version "21.5b3"
+ date "2001-11-27"
+ build-date "2001-11-28"
+ maintainer "Simon Josefsson <simon@josefsson.org>"
distribution xemacs
priority medium
- category "libs"
+ category "standard"
dump nil
description "Fundamental lisp files for providing email support."
- filename "mail-lib-1.24-pkg.tar.gz"
- md5sum "9428816ccc49d99be80dcbfc34d7917f"
- size 131977
+ filename "mail-lib-1.40-pkg.tar.gz"
+ md5sum "9bac3da5281026155fd6fadb93efb938"
+ size 177170
provides (browse-url highlight-headers mail-abbrevs mail-extr mail-utils reporter rfc822 rmail-mini rmailout sendmail smtpmail)
- requires (xemacs-base)
+ requires (eterm xemacs-base)
type regular
))
))
(package-get-update-base-entry (quote
(fsf-compat
(standards-version 1.1
- version "1.06"
- author-version "21.1"
- date "1998-09-12"
- build-date "1999-07-30"
+ version "1.09"
+ author-version "21.4"
+ date "2001-04-28"
+ build-date "2001-04-28"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
category "libs"
dump nil
description "FSF Emacs compatibility files."
- filename "fsf-compat-1.06-pkg.tar.gz"
- md5sum "b167c9b6e4b6ff464d34143782d6c633"
- size 17356
+ filename "fsf-compat-1.09-pkg.tar.gz"
+ md5sum "b0f33bb047d8c64020b1fa0bf35eb12e"
+ size 21096
provides (overlay thingatpt timer x-popup-menu)
- requires ()
+ requires (xemacs-base)
type single
))
))
(package-get-update-base-entry (quote
(xemacs-base
(standards-version 1.1
- version "1.32"
- author-version "21.1"
- date "1999-07-22"
- build-date "1999-07-30"
+ version "1.56"
+ author-version "21.5b3"
+ date "2001-12-10"
+ build-date "2001-12-10"
maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
distribution xemacs
priority high
- category "libs"
+ category "standard"
dump nil
description "Fundamental XEmacs support, you almost certainly need this."
- filename "xemacs-base-1.32-pkg.tar.gz"
- md5sum "ae699a67f9922ad330fc1e5d45d3ff87"
- size 430787
- provides (add-log advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu ffap helper imenu iso-syntax macros novice outline overlay passwd pp regi ring shell skeleton sort thing time-stamp timezone xbm-button xpm-button)
+ filename "xemacs-base-1.56-pkg.tar.gz"
+ md5sum "c619c482b36b55468f4e29d775b2f12f"
+ size 454879
+ provides (add-log advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu ffap helper imenu iso-syntax macros novice outline overlay passwd pp regi ring shell skeleton sort thing time-stamp timezone xbm-button xpm-button tq)
requires ()
type regular
))
))
;;;@@@
;; Package Index file ends here
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v0.9.8 (SunOS)
-Comment: For info see http://www.gnupg.org
-
-iEYEARECAAYFAjehBIcACgkQEng2Tdz4C2tvvQCbBYGskNM16GwRfw/DjTS4byZN
-6CIAnRGmsWGM/07NNA6mEyejc3SDD7/3
-=NjSE
------END PGP SIGNATURE-----
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
2001-10-23 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.4.5 "Civil Service" is released.
* files.el (insert-file-contents-literally): Treat file as binary;
call file-name-handlers. [sync with Emacs 20.3.10]
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-11-21 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * package-net.el: Inadvertant synch with Windows branch. From
+ Andy's log:
+ (package-net-kit-version): new variable.
+ (package-net-generate-bin-ini): use it. Remove unwanted functions.
+
+2001-11-28 Steve Youngs <youngs@xemacs.org>
+
+ * package-get.el (package-get-locate-index-file): Also search the
+ core etc/ directory for the package index file if it can't be
+ found in ~/.xemacs/.
+
+2001-12-13 William Perry <wmperry@gnu.org>
+
+ * dialog-gtk.el (popup-builtin-question-dialog):
+ Conform to API in gui.c.
+
+2001-11-12 Andy Piper <andy@xemacs.org>
+
+ * cus-edit.el (custom-save-face-internal): make sure we save
+ non-themed faces.
+ (custom-save-variables): ditto variables.
+
+2001-11-20 Stephen J. Turnbull <stephen@xemacs.og>
+
+ * faces.el (make-face-family):
+ (make-face-size):
+ New face-modifying functions per Jan Vroonhof.
+
+ cus-face.el (custom-set-face-font-family):
+ (custom-set-face-font-size):
+ Use them.
+
+ * font.el (font-window-system-mappings): More precise docstring.
+
+ (font-create-name):
+ (font-create-object):
+ (tty-font-create-object):
+ (tty-font-create-plist):
+ (x-font-create-object):
+ (x-font-create-name):
+ (ns-font-create-name):
+ (mswindows-font-create-object):
+ (mswindows-font-create-name):
+ Add doctrings.
+
+2001-11-14 John Paul Wallington <jpw@shootybangbang.com>
+
+ * gtk-faces.el (gtk-init-device-faces): removed spurious
+ quote before let* expression.
+
+2001-10-29 Andy Piper <andy@xemacs.org>
+
+ * code-files.el (toggle-buffer-file-coding-system): mark buffer as
+ modified when changing coding system.
+
+ * toolbar-items.el (toolbar-dired): Use interactive "D" spec so
+ that we invoke the GUI directory selector.
+
+2001-10-25 Andy Piper <andy@xemacs.org>
+
+ * dialog.el (make-dialog-box): use new directory dialog support.
+ * minibuf.el (read-file-name-1): ditto.
+ (read-file-name): ditto.
+ (read-directory-name): ditto.
+
2001-10-23 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.4.5 "Civil Service" is released.
(coding-system-base buffer-file-coding-system)
(cond ((eq eol-type 'lf) 'crlf)
((eq eol-type 'crlf) 'lf)
- ((eq eol-type 'cr) 'lf))))))
+ ((eq eol-type 'cr) 'lf))))
+ (set-buffer-modified-p t)))
(define-obsolete-function-alias
'set-file-coding-system
(princ "\n"))
(princ "(custom-set-variables")
(mapatoms (lambda (symbol)
- (let ((spec (car-safe (get symbol 'theme-value)))
+ (let ((spec (car-safe (get symbol 'theme-value)))
(requests (get symbol 'custom-requests))
(now (not (or (get symbol 'standard-value)
(and (not (boundp symbol))
(not (eq (get symbol 'force-value)
'rogue))))))
(comment (get symbol 'saved-variable-comment)))
- (when (or (and spec (eq (car spec) 'user)
- (eq (second spec) 'set)) comment)
+ (when (or (and spec
+ (eq (car spec) 'user)
+ (eq (second spec) 'set))
+ comment
+ ;; support non-themed vars
+ (and (null spec) (get symbol 'saved-value)))
(princ "\n '(")
(prin1 symbol)
(princ " ")
(and (not (find-face symbol))
(not (eq (get symbol 'force-face) 'rogue)))))))
(when (or (and (not (memq symbol custom-save-face-ignoring))
- ;; Don't print default face here.
- theme-spec
- (eq (car theme-spec) 'user)
- (eq (second theme-spec) 'set)) comment)
+ ;; Don't print default face here.
+ (or (and theme-spec
+ (eq (car theme-spec) 'user)
+ (eq (second theme-spec) 'set))
+ ;; cope with non-themed faces
+ (and (null theme-spec)
+ (get symbol 'saved-face))))
+ comment)
(princ "\n '(")
(prin1 symbol)
(princ " ")
(and image
(image-instance-file-name image))))
+;; This consistently fails to dtrt
+;;(defun custom-set-face-font-size (face size &optional locale tags)
+;; "Set the font of FACE to SIZE."
+;; ;; #### should this call have tags in it?
+;; (let* ((font (apply 'face-font-name face (list locale)))
+;; ;; Gag
+;; (fontobj (font-create-object font)))
+;; (set-font-size fontobj size)
+;; (apply 'font-set-face-font face fontobj locale tags)))
+
+;; From Jan Vroonhof -- see faces.el
(defun custom-set-face-font-size (face size &optional locale tags)
"Set the font of FACE to SIZE."
- ;; #### should this call have tags in it?
- (let* ((font (apply 'face-font-name face (list locale)))
- ;; Gag
- (fontobj (font-create-object font)))
- (set-font-size fontobj size)
- (apply 'font-set-face-font face fontobj locale tags)))
+ (make-face-size face size locale tags))
(defun custom-face-font-size (face &rest args)
"Return the size of the font of FACE as a string."
(fontobj (font-create-object font)))
(format "%s" (font-size fontobj))))
+;; Jan suggests this may not dtrt
+;;(defun custom-set-face-font-family (face family &optional locale tags)
+;; "Set the font of FACE to FAMILY."
+;; ;; #### should this call have tags in it?
+;; (let* ((font (apply 'face-font-name face (list locale)))
+;; ;; Gag
+;; (fontobj (font-create-object font)))
+;; (set-font-family fontobj family)
+;; (apply 'font-set-face-font face fontobj locale tags)))
+
+;; From Jan Vroonhof -- see faces.el
(defun custom-set-face-font-family (face family &optional locale tags)
"Set the font of FACE to FAMILY."
- ;; #### should this call have tags in it?
- (let* ((font (apply 'face-font-name face (list locale)))
- ;; Gag
- (fontobj (font-create-object font)))
- (set-font-family fontobj family)
- (apply 'font-set-face-font face fontobj locale tags)))
+ (make-face-family face family locale tags))
(defun custom-face-font-family (face &rest args)
"Return the name of the font family of FACE."
(dialog nil) ; GtkDialog
(buttons nil) ; List of GtkButton objects
(activep t)
+ (callback nil)
(flushrightp nil)
+ (length nil)
(errp t))
(if (not buttons-descr)
(error 'syntax-error
(if (not (vectorp button))
(error "Button descriptor is not a vector: %S" button))
- (if (< (length button) 3)
- (error "Button descriptor is too small: %S" button))
+ (setq length (length button))
+
+ (cond
+ ((= length 1) ; [ "name" ]
+ (setq callback nil
+ activep nil))
+ ((= length 2) ; [ "name" callback ]
+ (setq callback (aref button 1)
+ activep t))
+ ((and (or (= length 3) (= length 4))
+ (not (keywordp (aref button 2))))
+ ;; [ "name" callback active-p ] or
+ ;; [ "name" callback active-p suffix ]
+ ;; We ignore the 'suffix' entry, because that is
+ ;; what the X code does.
+ (setq callback (aref button 1)
+ activep (aref button 2)))
+ (t ; 100% keyword specification
+ (let ((plist (cdr (mapcar 'identity button))))
+ (setq activep (plist-get plist :active)
+ callback (plist-get plist :callback)))))
(push (gtk-button-new-with-label (aref button 0)) buttons)
-
- ;; Need to detect what flavor of descriptor it is.
- (if (not (keywordp (aref button 2)))
- ;; Simple style... just [ name callback activep ]
- ;; We ignore the 'suffix' entry, because that is what
- ;; the X code does.
- (setq activep (aref button 2))
- (let ((ctr 2)
- (len (length button)))
- (if (logand len 1)
- (error
- "Button descriptor has an odd number of keywords and values: %S"
- button))
- (while (< ctr len)
- (if (eq (aref button ctr) :active)
- (setq activep (aref button (1+ ctr))
- ctr len))
- (setq ctr (+ ctr 2)))))
(gtk-widget-set-sensitive (car buttons) (eval activep))
;; Apply the callback
unread-command-events)
(gtk-main-quit)
t)
- (cons (aref button 1) dialog))
+ (cons callback dialog))
(gtk-widget-show (car buttons))
(funcall (if flushrightp 'gtk-box-pack-end 'gtk-box-pack-start)
---------------------------------------------------------------------------
+For type `directory':
+
+The keywords allowed are
+
+:initial-directory
+ The initial directory to be selected in the dialog box (defaults to the
+ current buffer's `default-directory).
+:title
+ The title of the dialog box (defaults to \"Open\").
+
+---------------------------------------------------------------------------
+
For type `print':
This invokes the Windows standard Print dialog.
(face-property-instance unfrobbed-face 'font domain))
(set-face-property face 'font (vector frobbed-face) the-locale tags)))))))
+;; WE DEMAND FOUNDRY FROBBING!
+
+;; Family frobbing
+;; Thx Jan Vroonhof, Ref xemacs-beta <87oflypbum.fsf@petteflet.ntlworld.com>
+;; Brainlessly derived from make-face-size by Stephen; don't blame Jan.
+;; I'm long since flown to Rio, it does you little good to blame me, either.
+(defun make-face-family (face family &optional locale tags)
+ "Set FACE's family to FAMILY in LOCALE, if possible.
+
+Add/replace settings specified by TAGS only."
+ (frob-face-property face 'font
+ ;; uses dynamic scope of family
+ #'(lambda (f d)
+ ;; keep the dependency on font.el for now
+ (let ((fo (font-create-object (font-instance-name f)
+ d)))
+ (set-font-family fo family)
+ (font-create-name fo d)))
+ nil locale tags))
+
+;; Style (ie, typographical face) frobbing
(defun make-face-bold (face &optional locale tags)
"Make FACE bold in LOCALE, if possible.
This will attempt to make the font bold for X/MSW locales and will set the
([bold-italic] . [bold]))))
+;; Size frobbing
+;; Thx Jan Vroonhof, Ref xemacs-beta <87oflypbum.fsf@petteflet.ntlworld.com>
+;; Jan had a separate helper function
+(defun make-face-size (face size &optional locale tags)
+ "Adjust FACE to SIZE in LOCALE, if possible.
+
+Add/replace settings specified by TAGS only."
+ (frob-face-property face 'font
+ ;; uses dynamic scope of size
+ #'(lambda (f d)
+ ;; keep the dependency on font.el for now
+ (let ((fo (font-create-object (font-instance-name f)
+ d)))
+ (set-font-size fo size)
+ (font-create-name fo d)))
+ nil locale tags))
+
;; Why do the following two functions lose so badly in so many
;; circumstances?
(mswindows . (mswindows-font-create-name mswindows-font-create-object))
(pm . (x-font-create-name x-font-create-object)) ; Change? FIXME
(tty . (tty-font-create-plist tty-font-create-object)))
- "An assoc list mapping device types to the function used to create
-a font name from a font structure.")
+ "An assoc list mapping device types to a list of translations.
+
+The first function creates a font name from a font descriptor object.
+The second performs the reverse translation.")
(defconst ns-font-weight-mappings
'((:extra-light . "extralight")
(defvar font-maximum-slippage "1pt"
"How much a font is allowed to vary from the desired size.")
+;; Canonical (internal) sizes are in points.
+;; Registry
(define-font-keywords :family :style :size :registry :encoding)
(define-font-keywords
w2))))
(defun font-spatial-to-canonical (spec &optional device)
- "Convert SPEC (in inches, millimeters, points, or picas) into points."
- ;; 1 in = 6 pa = 25.4 mm = 72 pt
+ "Convert SPEC (in inches, millimeters, points, picas, or pixels) into points.
+
+Canonical sizes are in points. If SPEC is null, nil is returned. If SPEC is
+a number, it is interpreted as the desired point size and returned unchanged.
+Otherwise SPEC must be a string consisting of a number and an optional type.
+The type may be the strings \"px\", \"pix\", or \"pixel\" (pixels), \"pt\" or
+\"point\" (points), \"pa\" or \"pica\" (picas), \"in\" or \"inch\" (inches), \"cm\"
+(centimeters), or \"mm\" (millimeters).
+
+1 in = 2.54 cm = 6 pa = 25.4 mm = 72 pt. Pixel size is device-dependent."
(cond
((numberp spec)
spec)
(mm-width (float (or (device-mm-width device) 293)))
(retval nil))
(cond
+ ;; the following string-match is broken, there will never be a
+ ;; left operand detected
((string-match "^ *\\([-+*/]\\) *" spec) ; math! whee!
(let ((math-func (intern (match-string 1 spec)))
(other (font-spatial-to-canonical
(plist-get args :encoding)))
(defun font-create-name (fontobj &optional device)
+ "Return a font name constructed from FONTOBJ, appropriate for DEVICE."
(let* ((type (device-type device))
(func (car (cdr-safe (assq type font-window-system-mappings)))))
(and func (fboundp func) (funcall func fontobj device))))
;;;###autoload
(defun font-create-object (fontname &optional device)
+ "Return a font descriptor object for FONTNAME, appropriate for DEVICE."
(let* ((type (device-type device))
(func (car (cdr (cdr-safe (assq type font-window-system-mappings))))))
(and func (fboundp func) (funcall func fontname device))))
;;; The window-system dependent code (TTY-style)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun tty-font-create-object (fontname &optional device)
+ "Return a font descriptor object for FONTNAME, appropriate for TTY devices."
(make-font :size "12pt"))
(defun tty-font-create-plist (fontobj &optional device)
+ "Return a font name constructed from FONTOBJ, appropriate for TTY devices."
(list
(cons 'underline (font-underline-p fontobj))
(cons 'highlight (if (or (font-bold-p fontobj)
"A list of font family mappings on X devices.")
(defun x-font-create-object (fontname &optional device)
+ "Return a font descriptor object for FONTNAME, appropriate for X devices."
(let ((case-fold-search t))
(if (or (not (stringp fontname))
(not (string-match font-x-font-regexp fontname)))
(font-size (font-default-object-for-device (or device (selected-device)))))
(defun x-font-create-name (fontobj &optional device)
+ "Return a font name constructed from FONTOBJ, appropriate for X devices."
(if (and (not (or (font-family fontobj)
(font-weight fontobj)
(font-size fontobj)
(sort (font-unique (nconc scaled normal)) 'string-lessp))))))
(defun ns-font-create-name (fontobj &optional device)
+ "Return a font name constructed from FONTOBJ, appropriate for NextSTEP devices."
(let ((family (or (font-family fontobj)
(ns-font-families-for-device device)))
(weight (or (font-weight fontobj) :medium))
"A list of font family mappings on mswindows devices.")
(defun mswindows-font-create-object (fontname &optional device)
+ "Return a font descriptor object for FONTNAME, appropriate for MS Windows devices."
(let ((case-fold-search t)
(font (mswindows-font-canonicalize-name fontname)))
(if (or (not (stringp font))
retval))))
(defun mswindows-font-create-name (fontobj &optional device)
+ "Return a font name constructed from FONTOBJ, appropriate for MS Windows devices."
(if (and (not (or (font-family fontobj)
(font-weight fontobj)
(font-size fontobj)
(if (not (eq (device-type device) 'gtk))
nil
(gtk-init-pointers)
- '(let* ((style (gtk-style-info device))
+ (let* ((style (gtk-style-info device))
;;(normal 0) ; GTK_STATE_NORMAL
;;(active 1) ; GTK_STATE_ACTIVE
(prelight 2) ; GTK_STATE_PRELIGHT
:activate-callback 'read-file-name-activate-callback)
(goto-char (point-min) completion-buf)))))
-(defun read-file-name-1 (history prompt dir default
- must-match initial-contents
- completer)
+(defun read-file-name-1 (type history prompt dir default
+ must-match initial-contents
+ completer)
(if (should-use-dialog-box-p)
(condition-case nil
(let ((file
(apply #'make-dialog-box
- 'file `(:title ,(capitalize-string-as-title
- ;; Kludge: Delete ": " off the end.
- (replace-in-string prompt ": $" ""))
- ,@(and dir (list :initial-directory
- dir))
- :file-must-exist ,must-match
- ,@(and initial-contents
- (list :initial-filename
- initial-contents))))))
+ type `(:title ,(capitalize-string-as-title
+ ;; Kludge: Delete ": " off the end.
+ (replace-in-string prompt ": $" ""))
+ ,@(and dir (list :initial-directory
+ dir))
+ :file-must-exist ,must-match
+ ,@(and initial-contents
+ (list :initial-filename
+ initial-contents))))))
;; hack -- until we implement reading a directory properly,
;; allow a file as indicating the directory it's in
(if (and (eq completer 'read-directory-name-internal)
Sixth arg HISTORY specifies the history list to use. Default is
`file-name-history'.
DIR defaults to current buffer's directory default."
- (read-file-name-1
- (or history 'file-name-history)
+ (read-file-name-1
+ 'file (or history 'file-name-history)
prompt dir (or default
(and initial-contents
(abbreviate-file-name (expand-file-name
`file-name-history'.
DIR defaults to current buffer's directory default."
(read-file-name-1
- (or history 'file-name-history)
- prompt dir (or default default-directory) must-match initial-contents
- 'read-directory-name-internal))
+ 'directory (or history 'file-name-history)
+ prompt dir (or default default-directory) must-match initial-contents
+ 'read-directory-name-internal))
;; Environment-variable and ~username completion hack
is non-nil."
(or (package-get-locate-file package-get-base-filename t no-remote)
(if (file-exists-p package-get-user-index-filename)
- package-get-user-index-filename)))
+ package-get-user-index-filename)
+ (locate-data-file package-get-base-filename)
+ (error "Can't locate a package index file.")))
(defun package-get-maybe-save-index (filename)
"Offer to save the current buffer as the local package index file,
;;
;; 3. For package releases that's all you need to do. For binary
;; releases you need to build both cygwin and win32 binaries and put
-;; them in appropriate tarballs:
+;; them in appropriate tarballs: This can be achieved by running
+;; build-msw-release.sh
;;
-;; For cygwin, configure, make and install and then do (this is for
-;; 21.1.13):
-;;
-;; cd <install dir>
-;; tar cvzf xemacs-i686-pc-cygwin32-21.1.13.tar.gz \
-;; ./bin/i686-pc-cygwin32 ./lib/xemacs-21.1.13 \
-;; ./lib/xemacs/lock ./man/man1/xemacs.1 \
-;; ./man/man1/ctags.1 ./man/man1/gnu*.1'
-;;
-;; Note that the naming of the package is important. Don't be tempted
-;; to change the order in any way.
-;;
-;; For win32 build and install the release and then (again for
-;; 21.1.13):
-;;
-;; cd <install dir>
-;; tar cvzf xemacs-i386-pc-win32-21.1.13.tar.gz ./XEmacs-21.1.13
-;;
-;; The binaries should be uploaded to
-;; `ftp://ftp.xemacs.org/pub/xemacs/binaries/cygwin32' and
-;; `ftp://ftp.xemacs.org/pub/xemacs/binaries/win32' respectively. Take
-;; a note of their sizes and set `package-net-cygwin32-binary-size'
-;; and `package-net-win32-binary-size' appropriately in this file and
-;; then follow step 2.
(require 'package-admin)
(require 'package-get)
;;
;; 2. Generating setup.ini should be more automatic.
-(defvar package-net-cygwin32-binary-size 7559692
+(defvar package-net-cygwin32-binary-size 0
"The size in bytes of the cygwin32 binary distribution.")
-(defvar package-net-win32-binary-size 7421788
+(defvar package-net-win32-binary-size 0
"The size in bytes of the win32 binary distribution.")
+(defvar package-net-setup-version "1.0"
+ "The version string of setup.")
+
;;;###autoload
(defun package-net-setup-directory ()
(file-truename (concat data-directory "../../" (if (eq system-type 'cygwin32)
(write-region (point-min) (point-max) (concat destdir "setup.ini")))
(kill-buffer buf))))
-(defun package-net-generate-bin-ini (&optional destdir version)
- "Convert the package index to ini file format in DESTDIR.
-DESTDIR defaults to the value of `data-directory'."
-
- (setq destdir (file-name-as-directory (or destdir data-directory)))
+(defun package-net-generate-bin-ini (&optional version)
+ "Convert the package index to ini file format in the current directory."
(let ((buf (get-buffer-create "*setup-bin.ini*")))
(unwind-protect
(save-excursion
(+ (* (car (current-time)) 65536) (car (cdr (current-time))))))
(insert (format "setup-version: %s\n\n" (or version "1.0")))
;; Native version
- (insert (format "@ %s\n" "xemacs-i386-pc-win32"))
+ (insert (format "@ %s\n" "xemacs-i586-pc-win32"))
(insert (format "version: %s\n" emacs-program-version))
(insert "type: native\n")
(insert (format "install: win32/%s %d\n\n"
emacs-program-version ".tar.gz")
package-net-cygwin32-binary-size))
(insert "# setup.ini file ends here\n")
- (write-region (point-min) (point-max) (concat destdir "setup-bin.ini")))
- (kill-buffer buf))))
+ (write-region (point-min) (point-max) "setup-bin.ini")))
+ (kill-buffer buf)))
(defun package-net-batch-generate-bin-ini ()
"Convert the package index to ini file format."
(unless noninteractive
(error "`package-net-batch-generate-bin-ini' is to be used only with -batch"))
- (let ((dir (car command-line-args-left))
- (version (car (cdr command-line-args-left))))
- (package-net-generate-bin-ini dir version)))
+ (package-net-generate-bin-ini package-net-setup-version))
;;;###autoload
(defun package-net-update-installed-db (&optional destdir)
(function :tag "Other"))
:group 'toolbar)
-(defun toolbar-dired ()
- (interactive)
- (call-interactively toolbar-dired-function))
+(defun toolbar-dired (dir)
+ (interactive "DDired directory: ")
+ (funcall toolbar-dired-function dir))
(defcustom toolbar-save-function 'save-buffer
"*Function to call when the save icon is selected."
+2002-09-05 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * Ideograph-R119-Rice.el, Ideograph-R117-Stand.el,
+ Ideograph-R118-Bamboo.el, Ideograph-R116-Cave.el: Add some missing
+ mappings to CHINA3-JEF code points.
+
+ * README.en (Character Reference): Add `jikai'.
+
+2002-09-03 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * Ideograph-R114-Track.el, Ideograph-R115-Grain.el,
+ Ideograph-R113-Spirit.el: Add some missing mappings to CHINA3-JEF
+ code points.
+
+2002-09-02 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * Ideograph-R111-Arrow.el, Ideograph-R112-Stone.el,
+ Ideograph-R037-Big.el: Add some missing mappings to CHINA3-JEF
+ code points.
+
2002-08-30 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
* Ideograph-R083-Clan.el, Ideograph-R084-Steam.el,
(ucs . #x216A0) ; ð¡š
))
(define-char
- '((ideographic-radical . 37) ; ⼤
+ '((=>ucs . #x5972) ; 奲
+ (ideographic-radical . 37) ; ⼤
+ (ideographic-strokes . 21)
+ (total-strokes . 24)
+ (japanese-jisx0212 . #x3922) ; ø»‹‡¡
+ (ideograph-daikanwa . 06034) ; ø¸ž’
+ (china3-jef . #x48E8) ; øº„£¨
+ ))
+(define-char
+ '((morohashi-daikanwa 6034 0 2)
+ (ideographic-radical . 37) ; ⼤
(ideographic-strokes . 20)
- (kangxi-strokes . 21)
(total-strokes . 23)
- (japanese-jisx0212 . #x3922) ; ø»‹‡¡
(chinese-cns11643-2 . #x6F23) ; ø»”¿†
(chinese-big5 . #xF7D4) ; ý¢€Ÿ”
- (ideograph-daikanwa . 06034) ; ø¸ž’
(ucs . #x5972) ; 奲
))
(define-char
(ideographic-strokes . 3)
(total-strokes . 8)
(japanese-jisx0212 . #x4F45) ; ø»‹¨˜
- (chinese-cns11643-4 . #x2752) ; ø»—ª
(japanese-jisx0213-2 . #x7235) ; ø»¦”’
(ideograph-daikanwa . 23934) ; ø¸…µ¾
+ (china3-jef . #x5BEA) ; øº…¯ª
(ucs . #x77E4) ; 矤
))
(define-char
+ '((=>ucs . #x77E4) ; 矤
+ (morohashi-daikanwa 23934 0 0)
+ (ideographic-radical . 111) ; â½®
+ (ideographic-strokes . 3)
+ (total-strokes . 8)
+ (chinese-cns11643-4 . #x2752) ; ø»—ª
+ ))
+(define-char
'((ideographic-radical . 111) ; â½®
(ideographic-strokes . 3)
(total-strokes . 8)
(ideographic-strokes . 4)
(total-strokes . 9)
(japanese-jisx0212 . #x4F46) ; ø»‹¨™
- (chinese-cns11643-3 . #x2E36) ; ø»•©¿
(japanese-jisx0213-2 . #x7236) ; ø»¦”“
(ideograph-daikanwa . 23937) ; ø¸…¶
+ (china3-jef . #x5BE9) ; øº…¯©
(ucs . #x77E6) ; 矦
))
(define-char
+ '((=>ucs . #x77E6) ; 矦
+ (morohashi-daikanwa 23937 0 0)
+ (ideographic-radical . 111) ; â½®
+ (ideographic-strokes . 4)
+ (total-strokes . 9)
+ (chinese-cns11643-3 . #x2E36) ; ø»•©¿
+ ))
+(define-char
'((ideographic-radical . 111) ; â½®
(ideographic-strokes . 4)
(total-strokes . 9)
(korean-ksc5601 . #x4F3B) ; ø»‰žŠ
(chinese-isoir165 . #x3E58) ; ø»™±
(japanese-jisx0208-1990 . #x366B) ; ø½Š•¼
+ (china3-jef . #x5BEC) ; øº…¯¬
(ucs . #x77E9) ; 矩
))
(define-char
(chinese-cns11643-6 . #x4C2B) ; ø»œ´„
(japanese-jisx0213-2 . #x7239) ; ø»¦”–
(ideograph-daikanwa . 23979) ; ø¸…¶«
+ (china3-jef . #x5BEB) ; øº…¯«
(ucs . #x4093) ; ä‚“
))
(define-char
(chinese-cns11643-3 . #x267B) ; ø»•Ÿ”
(japanese-jisx0213-2 . #x723B) ; ø»¦”˜
(ideograph-daikanwa . 24029) ; ø¸…·
+ (china3-jef . #x5BF6) ; øº…¯¶
(ucs . #x77F4) ; 矴
))
(define-char
(chinese-isoir165 . #x6D37) ; ø»Žž’
(chinese-cns11643-2 . #x283C) ; ø»“—
(ideograph-daikanwa . 24038) ; ø¸…·¦
+ (china3-jef . #x5BF7) ; øº…¯·
(ucs . #x77F8) ; 矸
))
(define-char
(chinese-cns11643-2 . #x283F) ; ø»“—
(japanese-jisx0213-2 . #x723C) ; ø»¦”™
(ideograph-daikanwa . 24043) ; ø¸…·«
+ (china3-jef . #x5BF8) ; øº…¯¸
(ucs . #x77FB) ; 矻
))
(define-char
(chinese-cns11643-2 . #x2C4C) ; ø»“•
(japanese-jisx0213-2 . #x723F) ; ø»¦”œ
(ideograph-daikanwa . 24052) ; ø¸…·´
+ (china3-jef . #x5BF9) ; øº…¯¹
(ucs . #x7806) ; ç †
))
(define-char
(total-strokes . 9)
(chinese-cns11643-3 . #x2E3A) ; ø»•ªƒ
(ideograph-daikanwa . 24061) ; ø¸…·½
+ (china3-jef . #x5BFA) ; øº…¯º
(ucs . #x780B) ; ç ‹
))
(define-char
(chinese-cns11643-1 . #x5268) ; ø»’‹¡
(japanese-jisx0213-2 . #x7241) ; ø»¦”ž
(ideograph-daikanwa . 24063) ; ø¸…·¿
+ (china3-jef . #x98DE) ; øº‰£ž
(ucs . #x780D) ; ç
))
(define-char
'((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 4)
(total-strokes . 9)
+ (<-vulgar-ideograph
+ (:sources (morohashi-daikanwa)
+ :char ((ideograph-daikanwa . 24177) ; ø¸…¹±
+ )
+ ))
(shinjigen-2 . 5407)
(japanese-jisx0208-1978 . #x3826) ; ø»‚·
(chinese-gb2312 . #x5150) ; ø»…“
(chinese-isoir165 . #x6D40) ; ø»Žž›
(chinese-cns11643-1 . #x5721) ; ø»’‘°
(ideograph-daikanwa . 24081) ; ø¸…¸‘
+ (china3-jef . #x92BF) ; øº‰Š¿
(ucs . #x781D) ; ç
))
(define-char
(chinese-cns11643-2 . #x3144) ; ø»“¤£
(japanese-jisx0213-2 . #x7243) ; ø»¦”
(ideograph-daikanwa . 24087) ; ø¸…¸—
+ (china3-jef . #x5BFC) ; øº…¯¼
(ucs . #x7821) ; ç ¡
))
(define-char
(chinese-isoir165 . #x7D41) ; ø»Žµ¼
(chinese-cns11643-2 . #x313E) ; ø»“¤
(ideograph-daikanwa . 24088) ; ø¸…¸˜
+ (china3-jef . #x5BFD) ; øº…¯½
(ucs . #x7822) ; ç ¢
))
(define-char
(chinese-cns11643-4 . #x2E5C) ; ø»—´©
))
(define-char
- '((ideographic-radical . 112) ; ⽯
+ '((=>ucs . #x7823) ; ç £
+ (ideographic-radical . 112) ; ⽯
(ideographic-strokes . 5)
(total-strokes . 10)
- (chinese-gb2312 . #x6D48) ; ø»…¶“
(japanese-jisx0212 . #x4F57) ; ø»‹¨ª
+ (ideograph-daikanwa . 24091) ; ø¸…¸›
+ (china3-jef . #x5BFE) ; øº…¯¾
+ ))
+(define-char
+ '((morohashi-daikanwa 24091 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (chinese-gb2312 . #x6D48) ; ø»…¶“
(chinese-isoir165 . #x6D48) ; ø»Žž£
(chinese-cns11643-2 . #x313C) ; ø»“¤›
- (ideograph-daikanwa . 24091) ; ø¸…¸›
(ucs . #x7823) ; ç £
))
(define-char
(ucs . #x782B) ; ç «
))
(define-char
- '((ideographic-radical . 112) ; ⽯
+ '((=>ucs . #x782C) ; ç ¬
+ (ideographic-radical . 112) ; ⽯
(ideographic-strokes . 5)
(total-strokes . 10)
- (chinese-gb2312 . #x6D47) ; ø»…¶’
(korean-ksc5601 . #x577E) ; ø»‰ª½
- (chinese-isoir165 . #x6D47) ; ø»Žž¢
- (chinese-cns11643-2 . #x313D) ; ø»“¤œ
(japanese-jisx0213-2 . #x7244) ; ø»¦”¡
(ideograph-daikanwa . 24108) ; ø¸…¸¬
- (ucs . #x782C) ; ç ¬
+ (china3-jef . #x8CC2) ; øºˆ³‚
))
(define-char
- '((ideographic-radical . 112) ; ⽯
+ '((morohashi-daikanwa 24108 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (chinese-gb2312 . #x6D47) ; ø»…¶’
+ (chinese-isoir165 . #x6D47) ; ø»Žž¢
+ (chinese-cns11643-2 . #x313D) ; ø»“¤œ
+ (ucs . #x782C) ; ç ¬
+ ))
+(define-char
+ '((=>ucs . #x782D) ; ç
+ (ideographic-radical . 112) ; ⽯
(ideographic-strokes . 5)
(japanese-strokes . 4)
(total-strokes . 10)
- (chinese-gb2312 . #x6D3E) ; ø»…¶‰
(japanese-jisx0212 . #x4F58) ; ø»‹¨«
- (chinese-isoir165 . #x6D3E) ; ø»Žž™
- (chinese-cns11643-1 . #x5725) ; ø»’‘´
(japanese-jisx0213-1 . #x787D) ; ø»¤”Š
(ideograph-daikanwa . 24110) ; ø¸…¸®
- (ucs . #x782D) ; ç
+ (china3-jef . #x5CA2) ; øº…²¢
+ ))
+(define-char
+ '((morohashi-daikanwa 24110 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 5)
+ (japanese-strokes . 4)
+ (total-strokes . 10)
+ (chinese-gb2312 . #x6D3E) ; ø»…¶‰
+ (chinese-isoir165 . #x6D3E) ; ø»Žž™
+ (chinese-cns11643-1 . #x5725) ; ø»’‘´
+ (ucs . #x782D) ; ç
))
(define-char
'((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 5)
(total-strokes . 10)
(japanese-jisx0212 . #x4F59) ; ø»‹¨¬
- (chinese-cns11643-2 . #x3142) ; ø»“¤¡
(ideograph-daikanwa . 24111) ; ø¸…¸¯
+ (china3-jef . #x5BF0) ; øº…¯°
(ucs . #x782E) ; ç ®
))
(define-char
+ '((=>ucs . #x782E) ; ç ®
+ (morohashi-daikanwa 24111 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (chinese-cns11643-2 . #x3142) ; ø»“¤¡
+ ))
+(define-char
'((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 5)
(total-strokes . 10)
(korean-ksc5601 . #x785F) ; ø»Šš¼
(chinese-cns11643-1 . #x5728) ; ø»’‘·
(ideograph-daikanwa . 24120) ; ø¸…¸¸
+ (china3-jef . #x5CA3) ; øº…²£
(ucs . #x7832) ; ç ²
))
(define-char
(japanese-jisx0212 . #x4F5B) ; ø»‹¨®
(chinese-cns11643-2 . #x313F) ; ø»“¤ž
(ideograph-daikanwa . 24133) ; ø¸…¹…
+ (china3-jef . #x5CA4) ; øº…²¤
(ucs . #x7835) ; ç µ
))
(define-char
(chinese-isoir165 . #x4969) ; ø»ªŒ
(chinese-cns11643-1 . #x5723) ; ø»’‘²
(ideograph-daikanwa . 24139) ; ø¸…¹‹
+ (china3-jef . #x93E2) ; øº‰¢
(ucs . #x7837) ; ç ·
))
(define-char
(japanese-jisx0213-1 . #x7921) ; ø»¤”Œ
(chinese-gb12345 . #x7927) ; 硃
(ideograph-daikanwa . 24147) ; ø¸…¹“
+ (china3-jef . #x5BFB) ; øº…¯»
(ucs . #x7843) ; 硃
))
(define-char
(japanese-jisx0212 . #x4F5E) ; ø»‹¨±
(chinese-cns11643-4 . #x335D) ; ø»—¼€
(ideograph-daikanwa . 24149) ; ø¸…¹•
+ (china3-jef . #x5CA5) ; øº…²¥
(ucs . #x7844) ; ç¡„
))
(define-char
'((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 6)
(total-strokes . 11)
- (chinese-cns11643-3 . #x375C) ; ø»•·³
(ideograph-daikanwa . 24157) ; ø¸…¹
(ucs . #x40AB) ; ä‚«
))
(define-char
+ '((=>ucs . #x40AB) ; ä‚«
+ (morohashi-daikanwa 24157 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 6)
+ (total-strokes . 11)
+ (chinese-cns11643-3 . #x375C) ; ø»•·³
+ ))
+(define-char
+ '((=>ucs . #x40AB) ; ä‚«
+ (morohashi-daikanwa 24157 0 1)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 7)
+ (total-strokes . 12)
+ (china3-jef . #x98E0) ; øº‰£
+ ))
+(define-char
'((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 6)
(total-strokes . 11)
(japanese-jisx0212 . #x4F60) ; ø»‹¨³
(chinese-cns11643-2 . #x3756) ; ø»“©
(ideograph-daikanwa . 24165) ; ø¸…¹¥
+ (china3-jef . #x5CA6) ; øº…²¦
(ucs . #x7848) ; 硈
))
(define-char
(chinese-cns11643-1 . #x5C3F) ; ø»’™¤
(japanese-jisx0213-1 . #x7922) ; ø»¤”
(ideograph-daikanwa . 24175) ; ø¸…¹¯
+ (china3-jef . #x5CA7) ; øº…²§
(ucs . #x784E) ; ç¡Ž
))
(define-char
(korean-ksc5601 . #x665A) ; ø»Š€›
(japanese-jisx0213-1 . #x7923) ; ø»¤”Ž
(ideograph-daikanwa . 24177) ; ø¸…¹±
+ (china3-jef . #x5CA8) ; øº…²¨
))
(define-char
'((morohashi-daikanwa 24177 0 0)
(chinese-cns11643-3 . #x3760) ; ø»•··
(japanese-jisx0213-1 . #x7924) ; ø»¤”
(ideograph-daikanwa . 24182) ; ø¸…¹¶
+ (china3-jef . #x5CA9) ; øº…²©
(ucs . #x7851) ; ç¡‘
))
(define-char
(define-char
'((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 6)
+ (china3-jef . #x8FC3) ; øºˆ¿ƒ
(ucs . #x7858) ; 硘
))
(define-char
(japanese-jisx0212 . #x4F64) ; ø»‹¨·
(chinese-cns11643-2 . #x3E4C) ; ø»“·±
(ideograph-daikanwa . 24200) ; ø¸…ºˆ
+ (china3-jef . #x5CAA) ; øº…²ª
(ucs . #x785C) ; 硜
))
(define-char
(total-strokes . 12)
(korean-ksc5601 . #x7526) ; ø»Š•©
(ideograph-daikanwa . 24201) ; ø¸…º‰
+ (china3-jef . #x5CAB) ; øº…²«
))
(define-char
'((morohashi-daikanwa 24201 1)
(chinese-cns11643-3 . #x3D5C) ; ø»–€§
))
(define-char
- '((ideographic-radical . 112) ; ⽯
+ '((=>ucs . #x7860) ; ç¡
+ (ideographic-radical . 112) ; ⽯
(ideographic-strokes . 7)
(total-strokes . 12)
(japanese-jisx0212 . #x4F66) ; ø»‹¨¹
- (chinese-cns11643-2 . #x3E49) ; ø»“·®
(ideograph-daikanwa . 24207) ; ø¸…º
+ (china3-jef . #x5CAC) ; øº…²¬
+ ))
+(define-char
+ '((morohashi-daikanwa 24207 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 7)
+ (total-strokes . 12)
+ (chinese-cns11643-2 . #x3E49) ; ø»“·®
(ucs . #x7860) ; ç¡
))
(define-char
(japanese-jisx0212 . #x4F68) ; ø»‹¨»
(chinese-cns11643-3 . #x3D59) ; ø»–€¤
(ideograph-daikanwa . 24214) ; ø¸…º–
+ (china3-jef . #x5CAD) ; øº…²
(ucs . #x7863) ; ç¡£
))
(define-char
(japanese-jisx0213-2 . #x7246) ; ø»¦”£
(chinese-gb12345 . #x6D4C) ; 硤
(ideograph-daikanwa . 24216) ; ø¸…º˜
+ (china3-jef . #x5CAE) ; øº…²®
(ucs . #x7864) ; 硤
))
(define-char
(japanese-jisx0213-1 . #x7925) ; ø»¤”
(chinese-gb12345 . #x6D3A) ; 硨
(ideograph-daikanwa . 24226) ; ø¸…º¢
+ (china3-jef . #x5CAF) ; øº…²¯
(ucs . #x7868) ; 硨
))
(define-char
(japanese-jisx0208 . #x3945) ; ø»†³¼
(korean-ksc5601 . #x4C63) ; ø»‰š˜
(ideograph-daikanwa . 24230) ; ø¸…º¦
+ (china3-jef . #x5CB0) ; øº…²°
))
(define-char
'((morohashi-daikanwa 24230 0 0)
(chinese-cns11643-2 . #x3E50) ; ø»“·µ
(japanese-jisx0213-1 . #x7926) ; ø»¤”‘
(ideograph-daikanwa . 24232) ; ø¸…º¨
+ (china3-jef . #x5CB1) ; øº…²±
))
(define-char
'((morohashi-daikanwa 24232 0 4)
(japanese-jisx0212 . #x4F6D) ; ø»‹©€
(chinese-cns11643-3 . #x432D) ; ø»–ˆ¬
(ideograph-daikanwa . 24249) ; ø¸…º¹
+ (china3-jef . #x5CB2) ; øº…²²
(ucs . #x787A) ; 硺
))
(define-char
(total-strokes . 13)
(chinese-cns11643-2 . #x4558) ; ø»”‚
(ideograph-daikanwa . 24251) ; ø¸…º»
+ (china3-jef . #x5BF1) ; øº…¯±
(ucs . #x787B) ; ç¡»
))
(define-char
(chinese-isoir165 . #x4570) ; ø»¤›
(chinese-cns11643-1 . #x6555) ; ø»’§ˆ
(japanese-jisx0208-1990 . #x626F) ; ø½‹–¨
+ (china3-jef . #x5CCD) ; øº…³
(ucs . #x787C) ; 硼
))
(define-char
(chinese-cns11643-1 . #x6556) ; ø»’§‰
(japanese-jisx0213-1 . #x7927) ; ø»¤”’
(ideograph-daikanwa . 24289) ; ø¸…»¡
+ (china3-jef . #x5CB3) ; øº…²³
(ucs . #x7891) ; 碑
))
(define-char
(total-strokes . 13)
(chinese-cns11643-3 . #x4336) ; ø»–ˆµ
(ideograph-daikanwa . 24292) ; ø¸…»¤
+ (china3-jef . #x5CB4) ; øº…²´
(ucs . #x7892) ; 碒
))
(define-char
(total-strokes . 13)
(japanese-jisx0212 . #x4F73) ; ø»‹©†
(ideograph-daikanwa . 24311) ; ø¸…»·
+ (china3-jef . #x92C0) ; øº‰‹€
))
(define-char
'((=>ucs . #x78A1) ; 碡
(chinese-cns11643-2 . #x4C3A) ; ø»”Œƒ
(japanese-jisx0213-2 . #x724D) ; ø»¦”ª
(ideograph-daikanwa . 24315) ; ø¸…»»
+ (china3-jef . #x5BF2) ; øº…¯²
(ucs . #x789E) ; 碞
))
(define-char
(ideographic-radical . 112) ; ⽯
(ideographic-strokes . 9)
(total-strokes . 14)
- (chinese-cns11643-2 . #x4C3F) ; ø»”Œˆ
(ideograph-daikanwa . 24328) ; ø¸…¼ˆ
))
(define-char
+ '((=>ucs . #x78A4) ; 碤
+ (morohashi-daikanwa 24328 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 9)
+ (total-strokes . 14)
+ (chinese-cns11643-2 . #x4C3F) ; ø»”Œˆ
+ ))
+(define-char
'((morohashi-daikanwa 24328 0 1)
(ideographic-radical . 112) ; ⽯
(ideographic-strokes . 8)
(total-strokes . 13)
(japanese-jisx0212 . #x4F77) ; ø»‹©Š
(japanese-jisx0213-2 . #x724B) ; ø»¦”¨
+ (china3-jef . #x5CB5) ; øº…²µ
(ucs . #x78A4) ; 碤
))
(define-char
(japanese-jisx0212 . #x4F79) ; ø»‹©Œ
(chinese-cns11643-2 . #x4C3D) ; ø»”Œ†
(ideograph-daikanwa . 24341) ; ø¸…¼•
+ (china3-jef . #x5CB6) ; øº…²¶
(ucs . #x78AC) ; 碬
))
(define-char
(japanese-jisx0213-1 . #x792A) ; ø»¤”•
(chinese-gb12345 . #x6D38) ; ç¢
(ideograph-daikanwa . 24342) ; ø¸…¼–
+ (china3-jef . #x5CB7) ; øº…²·
(ucs . #x78AD) ; ç¢
))
(define-char
(chinese-gb2312 . #x4576) ; ø»„¼‘
(chinese-isoir165 . #x4576) ; ø»¤¡
(chinese-cns11643-1 . #x6550) ; ø»’§ƒ
+ (china3-jef . #x9CC9) ; øº‰³‰
(ucs . #x78B0) ; 碰
))
(define-char
(chinese-isoir165 . #x3C6E) ; ø»—‹
(chinese-cns11643-3 . #x4844) ; ø»–™
(ideograph-daikanwa . 24361) ; ø¸…¼©
+ (china3-jef . #x93E4) ; øº‰¤
(ucs . #x78B1) ; 碱
))
(define-char
(chinese-gb2312 . #x4C3C) ; ø»……©
(japanese-jisx0212 . #x4F7E) ; ø»‹©‘
(chinese-isoir165 . #x4C3C) ; ø»¹
- (chinese-cns11643-1 . #x6979) ; ø»’¤
(ideograph-daikanwa . 24363) ; ø¸…¼«
+ (china3-jef . #x93E5) ; øº‰¥
(ucs . #x78B3) ; 碳
))
(define-char
+ '((=>ucs . #x78B3) ; 碳
+ (morohashi-daikanwa 24363 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 9)
+ (total-strokes . 14)
+ (chinese-cns11643-1 . #x6979) ; ø»’¤
+ ))
+(define-char
'((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 9)
(total-strokes . 14)
(ucs . #x78C7) ; 磇
))
(define-char
- '((ideographic-radical . 112) ; ⽯
+ '((=>ucs . #x78C8) ; 磈
+ (ideographic-radical . 112) ; ⽯
(ideographic-strokes . 10)
(total-strokes . 15)
(japanese-jisx0212 . #x5025) ; ø»‹©–
(chinese-cns11643-2 . #x524F) ; ø»”•Œ
(japanese-jisx0213-2 . #x7250) ; ø»¦”
(ideograph-daikanwa . 24392) ; ø¸…½ˆ
- (ucs . #x78C8) ; 磈
+ (china3-jef . #x5CB8) ; øº…²¸
+ ))
+(define-char
+ '((morohashi-daikanwa 24392 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 9)
+ (total-strokes . 14)
+ (ucs . #x78C8) ; 磈
))
(define-char
'((ideographic-radical . 112) ; ⽯
(chinese-gb2312 . #x6D5F) ; ø»…¶ª
(japanese-jisx0212 . #x5026) ; ø»‹©—
(chinese-isoir165 . #x6D5F) ; ø»Žžº
- (chinese-cns11643-2 . #x5252) ; ø»”•
(ideograph-daikanwa . 24393) ; ø¸…½‰
+ (china3-jef . #x8CE7) ; øºˆ³§
(ucs . #x78C9) ; 磉
))
(define-char
+ '((=>ucs . #x78C9) ; 磉
+ (morohashi-daikanwa 24393 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 10)
+ (total-strokes . 15)
+ (chinese-cns11643-2 . #x5252) ; ø»”•
+ ))
+(define-char
'((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 10)
(total-strokes . 15)
(japanese-jisx0212 . #x5028) ; ø»‹©™
(japanese-jisx0213-2 . #x7252) ; ø»¦”¯
(ideograph-daikanwa . 24399) ; ø¸…½
+ (china3-jef . #x5CBA) ; øº…²º
))
(define-char
'((morohashi-daikanwa 24399 0 2)
(japanese-jisx0212 . #x502E) ; ø»‹©Ÿ
(chinese-cns11643-2 . #x5872) ; ø»”ž£
(ideograph-daikanwa . 24419) ; ø¸…½£
+ (china3-jef . #x5BF3) ; øº…¯³
(ucs . #x78DB) ; 磛
))
(define-char
(total-strokes . 16)
(japanese-jisx0212 . #x502F) ; ø»‹©
(ideograph-daikanwa . 24429) ; ø¸…½
+ (china3-jef . #x5CBB) ; øº…²»
))
(define-char
'((morohashi-daikanwa 24429 0 2)
(chinese-cns11643-2 . #x5877) ; ø»”ž¨
(japanese-jisx0213-2 . #x7254) ; ø»¦”±
(ideograph-daikanwa . 24431) ; ø¸…½¯
+ (china3-jef . #x5CBC) ; øº…²¼
(ucs . #x78E0) ; ç£
))
(define-char
(ucs . #x25553) ; 𥕓
))
(define-char
- '((ideographic-radical . 112) ; ⽯
+ '((=>ucs . #x78E1) ; 磡
+ (ideographic-radical . 112) ; ⽯
(ideographic-strokes . 11)
(total-strokes . 16)
(japanese-jisx0212 . #x5031) ; ø»‹©¢
- (chinese-isoir165 . #x7D47) ; ø»Ž¶‚
- (chinese-cns11643-2 . #x5873) ; ø»”ž¤
(japanese-jisx0213-2 . #x7255) ; ø»¦”²
(ideograph-daikanwa . 24436) ; ø¸…½´
- (ucs . #x78E1) ; 磡
+ (china3-jef . #x5CBD) ; øº…²½
+ ))
+(define-char
+ '((=>ucs . #x78E1) ; 磡
+ (morohashi-daikanwa 24436 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 11)
+ (total-strokes . 16)
+ (chinese-cns11643-2 . #x5873) ; ø»”ž¤
+ ))
+(define-char
+ '((morohashi-daikanwa 24436 0 1)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 11)
+ (total-strokes . 16)
+ (chinese-isoir165 . #x7D47) ; ø»Ž¶‚
+ (ucs . #x78E1) ; 磡
))
(define-char
'((ideographic-radical . 112) ; ⽯
(ucs . #x25557) ; 𥕗
))
(define-char
- '((ideographic-radical . 112) ; ⽯
+ '((=>ucs . #x78E6) ; 磦
+ (ideographic-radical . 112) ; ⽯
(ideographic-strokes . 11)
(total-strokes . 16)
- (japanese-jisx0212 . #x5032) ; ø»‹©£
- (japanese-jisx0213-2 . #x7256) ; ø»¦”³
- (ideograph-daikanwa . 24446) ; ø¸…½¾
- (ucs . #x78E6) ; 磦
+ (chinese-cns11643-4 . #x516E) ; ø»˜¨•
+ (ideograph-daikanwa . 24446) ; ø¸…½¾
))
(define-char
- '((=>ucs . #x78E6) ; 磦
- (morohashi-daikanwa 24446 0 0)
+ '((morohashi-daikanwa 24446 0 0)
(ideographic-radical . 112) ; ⽯
(ideographic-strokes . 11)
(total-strokes . 16)
- (chinese-cns11643-4 . #x516E) ; ø»˜¨•
+ (japanese-jisx0212 . #x5032) ; ø»‹©£
+ (japanese-jisx0213-2 . #x7256) ; ø»¦”³
+ (china3-jef . #x5CBE) ; øº…²¾
+ (ucs . #x78E6) ; 磦
))
(define-char
'((=>ucs . #x40DD) ; äƒ
(ideographic-strokes . 11)
(total-strokes . 16)
(ideograph-daikanwa . 24447) ; ø¸…½¿
+ (china3-jef . #x5CBF) ; øº…²¿
))
(define-char
'((morohashi-daikanwa 24447 0 5)
(ideographic-strokes . 11)
(total-strokes . 16)
(korean-ksc5601 . #x5828) ; ø»‰«…
- (chinese-cns11643-1 . #x7153) ; ø»’¸®
(ideograph-daikanwa . 24449) ; ø¸…¾
))
(define-char
- '((morohashi-daikanwa 24449 1)
+ '((=>ucs . #x78E8) ; 磨
+ (morohashi-daikanwa 24449 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 11)
+ (total-strokes . 16)
+ (chinese-cns11643-1 . #x7153) ; ø»’¸®
+ (china3-jef . #x5BF4) ; øº…¯´
+ ))
+(define-char
+ '((=>ucs . #x78E8) ; 磨
+ (morohashi-daikanwa 24449 1)
(ideographic-radical . 112) ; ⽯
(ideographic-strokes . 11)
(total-strokes . 16)
(japanese-jisx0208-1978 . #x4B61) ; ø»‚º¬
- (chinese-gb2312 . #x4425) ; ø»„¹¢
(japanese-jisx0208 . #x4B61) ; ø»‡Ž´
- (chinese-isoir165 . #x4425) ; ø»¡²
(japanese-jisx0208-1990 . #x4B61) ; ø½Š´¨
- (ucs . #x78E8) ; 磨
+ ))
+(define-char
+ '((morohashi-daikanwa 24449 1 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 11)
+ (total-strokes . 16)
+ (chinese-gb2312 . #x4425) ; ø»„¹¢
+ (chinese-isoir165 . #x4425) ; ø»¡²
+ (ucs . #x78E8) ; 磨
))
(define-char
'((ideographic-radical . 112) ; ⽯
(total-strokes . 16)
(japanese-jisx0212 . #x5033) ; ø»‹©¤
(ideograph-daikanwa . 24452) ; ø¸…¾„
+ (china3-jef . #x5CC0) ; øº…³€
))
(define-char
'((morohashi-daikanwa 24452 0 1)
(total-strokes . 17)
(japanese-jisx0212 . #x5035) ; ø»‹©¦
(ideograph-daikanwa . 24476) ; ø¸…¾œ
+ (china3-jef . #x5CC1) ; øº…³
))
(define-char
'((morohashi-daikanwa 24476 0 2)
(chinese-cns11643-4 . #x5740) ; ø»˜°›
(japanese-jisx0213-1 . #x792D) ; ø»¤”˜
(ideograph-daikanwa . 24479) ; ø¸…¾Ÿ
+ (china3-jef . #x5CC2) ; øº…³‚
(ucs . #x7900) ; 礀
))
(define-char
(japanese-jisx0212 . #x5037) ; ø»‹©¨
(chinese-cns11643-4 . #x573E) ; ø»˜°™
(ideograph-daikanwa . 24480) ; ø¸…¾
+ (china3-jef . #x5CC3) ; øº…³ƒ
(ucs . #x78F6) ; 磶
))
(define-char
'((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 12)
- (japanese-strokes . 13)
(total-strokes . 17)
- (chinese-gb2312 . #x4157) ; ø»„µº
+ (chinese-gb2312 . #x4157) ; ø»„µº
+ (chinese-isoir165 . #x4157) ; ø»žŠ
+ (ideograph-daikanwa . 24481) ; ø¸…¾¡
+ (ucs . #x78F7) ; 磷
+ ))
+(define-char
+ '((=>ucs . #x78F7) ; 磷
+ (morohashi-daikanwa 24481 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 12)
+ (total-strokes . 17)
+ (chinese-cns11643-1 . #x744D) ; ø»’½‚
+ ))
+(define-char
+ '((=>ucs . #x78F7) ; 磷
+ (morohashi-daikanwa 24481 0 1)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 13)
+ (total-strokes . 18)
(japanese-jisx0212 . #x5038) ; ø»‹©©
- (chinese-isoir165 . #x4157) ; ø»žŠ
- (chinese-cns11643-1 . #x744D) ; ø»’½‚
(japanese-jisx0213-1 . #x792E) ; ø»¤”™
- (ideograph-daikanwa . 24481) ; ø¸…¾¡
- (ucs . #x78F7) ; 磷
+ (china3-jef . #x5CC4) ; øº…³„
))
(define-char
'((=>ucs . #x78F8) ; 磸
(japanese-jisx0212 . #x5039) ; ø»‹©ª
(japanese-jisx0213-2 . #x7258) ; ø»¦”µ
(ideograph-daikanwa . 24487) ; ø¸…¾§
+ (china3-jef . #x5CC5) ; øº…³…
))
(define-char
'((=>ucs . #x78FA) ; 磺
(chinese-cns11643-2 . #x5D72) ; ø»”¥¹
(japanese-jisx0213-2 . #x7259) ; ø»¦”¶
(ideograph-daikanwa . 24490) ; ø¸…¾ª
+ (china3-jef . #x5CC6) ; øº…³†
(ucs . #x78FB) ; 磻
))
(define-char
(japanese-jisx0212 . #x503C) ; ø»‹©
(chinese-cns11643-3 . #x5843) ; ø»–§¸
(ideograph-daikanwa . 24503) ; ø¸…¾·
+ (china3-jef . #x5CC7) ; øº…³‡
(ucs . #x7906) ; 礆
))
(define-char
(chinese-cns11643-2 . #x6948) ; ø»”¶·
(japanese-jisx0213-2 . #x725F) ; ø»¦”¼
(ideograph-daikanwa . 24556) ; ø¸…¿¬
+ (china3-jef . #x5CC8) ; øº…³ˆ
(ucs . #x7925) ; 礥
))
(define-char
(japanese-jisx0212 . #x5046) ; ø»‹©·
(chinese-cns11643-2 . #x694D) ; ø»”¶¼
(ideograph-daikanwa . 24570) ; ø¸…¿º
+ (china3-jef . #x5CC9) ; øº…³‰
(ucs . #x7929) ; 礩
))
(define-char
(chinese-cns11643-3 . #x5E43) ; ø»–°¬
(japanese-jisx0213-2 . #x725E) ; ø»¦”»
(ideograph-daikanwa . 24583) ; ø¸†€‡
+ (china3-jef . #x5CCE) ; øº…³Ž
(ucs . #x7930) ; 礰
))
(define-char
(ucs . #x40F5) ; 䃵
))
(define-char
- '((ideographic-radical . 112) ; ⽯
+ '((=>ucs . #x7931) ; 礱
+ (ideographic-radical . 112) ; ⽯
(ideographic-strokes . 16)
(total-strokes . 21)
(japanese-jisx0212 . #x5048) ; ø»‹©¹
(japanese-jisx0213-1 . #x7931) ; ø»¤”œ
- (chinese-gb12345 . #x6D43) ; 礱
(ideograph-daikanwa . 24586) ; ø¸†€Š
- (ucs . #x7931) ; 礱
+ (china3-jef . #x5BF5) ; øº…¯µ
+ ))
+(define-char
+ '((morohashi-daikanwa 24586 0 0)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 16)
+ (total-strokes . 21)
+ (chinese-gb12345 . #x6D43) ; 礱
+ (ucs . #x7931) ; 礱
))
(define-char
'((=>ucs . #x7931) ; 礱
- (morohashi-daikanwa 24586 0 0)
+ (morohashi-daikanwa 24586 0 1)
(ideographic-radical . 112) ; ⽯
(ideographic-strokes . 16)
(total-strokes . 21)
(ideograph-daikanwa . 24601) ; ø¸†€™
))
(define-char
- '((=>ucs . #x7935) ; 礵
- (ideographic-radical . 112) ; ⽯
+ '((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 17)
(total-strokes . 22)
(japanese-jisx0212 . #x504A) ; ø»‹©»
(ideograph-daikanwa . 24602) ; ø¸†€š
+ (ucs . #x7935) ; 礵
))
(define-char
- '((morohashi-daikanwa 24602 0 2)
+ '((=>ucs . #x7935) ; 礵
+ (morohashi-daikanwa 24602 0 2)
(ideographic-radical . 112) ; ⽯
(ideographic-strokes . 17)
(total-strokes . 22)
(chinese-cns11643-2 . #x6D64) ; ø»”½‹
- (ucs . #x7935) ; 礵
))
(define-char
- '((ideographic-radical . 112) ; ⽯
+ '((=>ucs . #x7936) ; 礶
+ (ideographic-radical . 112) ; ⽯
(ideographic-strokes . 18)
(total-strokes . 23)
(ideograph-daikanwa . 24603) ; ø¸†€›
+ (china3-jef . #x5CCB) ; øº…³‹
+ ))
+(define-char
+ '((morohashi-daikanwa 24603 0 2)
+ (ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 17)
+ (total-strokes . 22)
(ucs . #x7936) ; 礶
))
(define-char
(chinese-cns11643-7 . #x5F27) ; ø»Ÿ™¾
))
(define-char
- '((ideographic-radical . 112) ; ⽯
+ '((=>ucs . #x7939) ; 礹
+ (ideographic-radical . 112) ; ⽯
(ideographic-strokes . 20)
(total-strokes . 25)
(chinese-cns11643-2 . #x712A) ; ø»•‚‰
(ideograph-daikanwa . 24616) ; ø¸†€¨
- (ucs . #x7939) ; 礹
+ (china3-jef . #x5CCC) ; øº…³Œ
))
(define-char
- '((=>ucs . #x40FB) ; 䃻
+ '((morohashi-daikanwa 24616 0 1)
(ideographic-radical . 112) ; ⽯
+ (ideographic-strokes . 19)
+ (total-strokes . 24)
+ (ucs . #x7939) ; 礹
+ ))
+(define-char
+ '((ideographic-radical . 112) ; ⽯
(ideographic-strokes . 21)
(total-strokes . 26)
(ideograph-daikanwa . 24617) ; ø¸†€©
+ (ucs . #x40FB) ; 䃻
))
(define-char
- '((morohashi-daikanwa 24617 0 2)
+ '((=>ucs . #x40FB) ; 䃻
+ (morohashi-daikanwa 24617 0 2)
(ideographic-radical . 112) ; ⽯
(ideographic-strokes . 21)
(total-strokes . 26)
(chinese-cns11643-3 . #x6167) ; ø»–µª
- (ucs . #x40FB) ; 䃻
))
(define-char
'((ideographic-radical . 112) ; ⽯
(ucs . #x25605) ; 𥘅
))
(define-char
- '((ideographic-radical . 113) ; â½°
+ '((=>ucs . #x793B) ; 礻
+ (ideographic-radical . 113) ; â½°
(ideographic-strokes . 0)
- (chinese-gb2312 . #x6C6A) ; ø»…µ—
+ (total-strokes . 5)
(japanese-jisx0212 . #x504B) ; ø»‹©¼
- (chinese-isoir165 . #x6C6A) ; ø»Ž§
(japanese-jisx0213-2 . #x7260) ; ø»¦”½
(ideograph-daikanwa . 24625) ; ø¸†€±
- (ucs . #x793B) ; 礻
+ (china3-jef . #x72FE) ; øº‡‹¾
+ ))
+(define-char
+ '((morohashi-daikanwa 24625 0 0)
+ (ideographic-radical . 113) ; â½°
+ (ideographic-strokes . 0)
+ (total-strokes . 5)
+ (chinese-gb2312 . #x6C6A) ; ø»…µ—
+ (chinese-isoir165 . #x6C6A) ; ø»Ž§
+ (ucs . #x793B) ; 礻
))
(define-char
'((=>ucs . #x793C) ; 礼
(ideographic-strokes . 1)
(total-strokes . 6)
(ideograph-daikanwa . 24626) ; ø¸†€²
+ (china3-jef . #x70E5) ; øº‡ƒ¥
))
(define-char
'((morohashi-daikanwa 24626 1)
(total-strokes . 7)
(japanese-jisx0212 . #x504C) ; ø»‹©½
(ideograph-daikanwa . 24629) ; ø¸†€µ
+ (china3-jef . #x92C3) ; øº‰‹ƒ
))
(define-char
'((morohashi-daikanwa 24629 0 5)
(korean-ksc5601 . #x5E64) ; ø»‰´µ
(japanese-jisx0213-1 . #x7933) ; ø»¤”ž
(ideograph-daikanwa . 24631) ; ø¸†€·
+ (china3-jef . #x5CD3) ; øº…³“
))
(define-char
'((morohashi-daikanwa 24631 1)
(ideograph-daikanwa . 24634) ; ø¸†€º
))
(define-char
- '((morohashi-daikanwa 24634 0 3)
+ '((=>ucs . #x7941) ; ç¥
+ (morohashi-daikanwa 24634 0 2)
(ideographic-radical . 113) ; â½°
(ideographic-strokes . 3)
(total-strokes . 8)
- (chinese-gb2312 . #x466E) ; ø»„½§
(japanese-jisx0208 . #x3737) ; ø»†°²
- (chinese-isoir165 . #x466E) ; ø»¥·
- (chinese-cns11643-1 . #x4F25) ; ø»’†„
(japanese-jisx0208-1990 . #x3737) ; ø½Š–¦
- (ucs . #x7941) ; ç¥
+ ))
+(define-char
+ '((morohashi-daikanwa 24634 0 3)
+ (ideographic-radical . 113) ; â½°
+ (ideographic-strokes . 3)
+ (total-strokes . 8)
+ (chinese-gb2312 . #x466E) ; ø»„½§
+ (chinese-isoir165 . #x466E) ; ø»¥·
+ (chinese-cns11643-1 . #x4F25) ; ø»’†„
+ (china3-jef . #x5CD0) ; øº…³
+ (ucs . #x7941) ; ç¥
))
(define-char
'((ideographic-radical . 113) ; â½°
(japanese-jisx0212 . #x5050) ; ø»‹ª
(japanese-jisx0213-1 . #x7936) ; ø»¤”¡
(ideograph-daikanwa . 24638) ; ø¸†€¾
+ (china3-jef . #x95D7) ; øº‰——
))
(define-char
'((morohashi-daikanwa 24638 0 3)
(ideograph-daikanwa . 24639) ; ø¸†€¿
))
(define-char
- '((morohashi-daikanwa 24639 0 3)
+ '((=>ucs . #x7947) ; 祇
+ (morohashi-daikanwa 24639 0 2)
(ideographic-radical . 113) ; â½°
(ideographic-strokes . 4)
(total-strokes . 8)
(japanese-jisx0208 . #x3540) ; ø»†¿
- (chinese-isoir165 . #x7D38) ; ø»Žµ³
- (chinese-cns11643-1 . #x526C) ; ø»’‹¥
(japanese-jisx0208-1990 . #x3540) ; ø½Š“³
- (ucs . #x7947) ; 祇
+ (china3-jef . #x5CCF) ; øº…³
+ ))
+(define-char
+ '((morohashi-daikanwa 24639 0 3)
+ (ideographic-radical . 113) ; â½°
+ (ideographic-strokes . 4)
+ (total-strokes . 8)
+ (chinese-isoir165 . #x7D38) ; ø»Žµ³
+ (chinese-cns11643-1 . #x526C) ; ø»’‹¥
+ (ucs . #x7947) ; 祇
))
(define-char
'((=>ucs . #x7948) ; 祈
(korean-ksc5601 . #x5137) ; ø»‰¡‚
(japanese-jisx0213-1 . #x7937) ; ø»¤”¢
(ideograph-daikanwa . 24640) ; ø¸†€
+ (china3-jef . #x5CD4) ; øº…³”
))
(define-char
'((morohashi-daikanwa 24640 1)
(korean-ksc5601 . #x7233) ; ø»Š‘œ
(japanese-jisx0213-1 . #x7934) ; ø»¤”Ÿ
(ideograph-daikanwa . 24641) ; ø¸†
+ (china3-jef . #x5CD5) ; øº…³•
))
(define-char
'((morohashi-daikanwa 24641 1)
(ucs . #x794F) ; ç¥
))
(define-char
+ '((=>ucs . #x794F) ; ç¥
+ (morohashi-daikanwa 24651 0 5)
+ (ideographic-radical . 113) ; â½°
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (china3-jef . #x8CCB) ; øºˆ³‹
+ ))
+(define-char
'((=>ucs . #x7950) ; ç¥
(ideographic-radical . 113) ; â½°
(ideographic-strokes . 5)
(korean-ksc5601 . #x695E) ; ø»Š„¹
(japanese-jisx0213-1 . #x7938) ; ø»¤”£
(ideograph-daikanwa . 24652) ; ø¸†Œ
+ (china3-jef . #x5CD6) ; øº…³–
))
(define-char
'((morohashi-daikanwa 24652 1)
(total-strokes . 10)
(japanese-jisx0212 . #x5055) ; ø»‹ª†
(ideograph-daikanwa . 24662) ; ø¸†–
+ (china3-jef . #x8EB0) ; øºˆº°
))
(define-char
'((morohashi-daikanwa 24662 0 5)
(korean-ksc5601 . #x7053) ; ø»Š€
(japanese-jisx0213-1 . #x7939) ; ø»¤”¤
(ideograph-daikanwa . 24664) ; ø¸†˜
+ (china3-jef . #x5CD7) ; øº…³—
))
(define-char
'((morohashi-daikanwa 24664 1)
(ideographic-radical . 113) ; â½°
(ideographic-strokes . 5)
(total-strokes . 10)
- (ideograph-daikanwa . 24666) ; ø¸†š
+ (japanese-jisx0212 . #x5056) ; ø»‹ª‡
+ (japanese-jisx0213-2 . #x7262) ; ø»¦”¿
+ (ideograph-daikanwa . 24666) ; ø¸†š
))
(define-char
'((=>ucs . #x7958) ; 祘
- (morohashi-daikanwa 24666 0 1)
+ (morohashi-daikanwa 24666 0 0)
(ideographic-radical . 113) ; â½°
(ideographic-strokes . 5)
(total-strokes . 10)
- (japanese-jisx0212 . #x5056) ; ø»‹ª‡
- (japanese-jisx0213-2 . #x7262) ; ø»¦”¿
+ (china3-jef . #x5CD1) ; øº…³‘
))
(define-char
'((morohashi-daikanwa 24666 0 5)
(japanese-jisx0212 . #x5057) ; ø»‹ªˆ
(japanese-jisx0213-2 . #x7263) ; ø»¦•€
(ideograph-daikanwa . 24670) ; ø¸†ž
+ (china3-jef . #x92C4) ; øº‰‹„
))
(define-char
'((morohashi-daikanwa 24670 0 5)
(japanese-jisx0212 . #x5058) ; ø»‹ª‰
(japanese-jisx0213-1 . #x793A) ; ø»¤”¥
(ideograph-daikanwa . 24671) ; ø¸†Ÿ
+ (china3-jef . #x5CD8) ; øº…³˜
))
(define-char
'((morohashi-daikanwa 24671 0 5)
(korean-ksc5601 . #x7566) ; ø»Š–©
(japanese-jisx0213-1 . #x793B) ; ø»¤”¦
(ideograph-daikanwa . 24672) ; ø¸†
+ (china3-jef . #x5CD9) ; øº…³™
))
(define-char
'((morohashi-daikanwa 24672 1)
(korean-ksc5601 . #x636A) ; ø»‰¼‘
(japanese-jisx0213-1 . #x793C) ; ø»¤”§
(ideograph-daikanwa . 24673) ; ø¸†¡
+ (china3-jef . #x5CDA) ; øº…³š
(ucs-ks . #x795E) ; 神
(ucs . #xFA19) ; 神
))
(ideograph-daikanwa . 24679) ; ø¸†§
))
(define-char
- '((morohashi-daikanwa 24679 0 5)
+ '((=>ucs . #x7962) ; 祢
+ (morohashi-daikanwa 24679 0 2)
(ideographic-radical . 113) ; â½°
(ideographic-strokes . 5)
(total-strokes . 10)
(japanese-jisx0208-1978 . #x472A) ; ø»‚³½
- (chinese-gb2312 . #x6C72) ; ø»…µŸ
(japanese-jisx0208 . #x472A) ; ø»‡ˆ…
- (chinese-isoir165 . #x6C72) ; ø»Ž¯
- (chinese-cns11643-3 . #x3272) ; ø»•°³
(japanese-jisx0208-1990 . #x472A) ; ø½Š¹
- (ucs . #x7962) ; 祢
+ ))
+(define-char
+ '((morohashi-daikanwa 24679 0 3)
+ (ideographic-radical . 113) ; â½°
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (chinese-gb2312 . #x6C72) ; ø»…µŸ
+ (chinese-isoir165 . #x6C72) ; ø»Ž¯
+ (chinese-cns11643-3 . #x3272) ; ø»•°³
+ (china3-jef . #x70E4) ; øº‡ƒ¤
+ (ucs . #x7962) ; 祢
))
(define-char
'((ideographic-radical . 113) ; â½°
(korean-ksc5601 . #x5F54) ; ø»‰¶ƒ
(japanese-jisx0213-1 . #x793D) ; ø»¤”¨
(ideograph-daikanwa . 24689) ; ø¸†±
+ (china3-jef . #x5CDC) ; øº…³œ
(ucs-ks . #x7965) ; 祥
(ucs . #xFA1A) ; 祥
))
(ideograph-daikanwa . 24691) ; ø¸†³
))
(define-char
+ '((=>ucs . #x4105) ; ä„…
+ (morohashi-daikanwa 24691 0 0)
+ (ideographic-radical . 113) ; â½°
+ (ideographic-strokes . 6)
+ (total-strokes . 11)
+ (china3-jef . #x5CD2) ; øº…³’
+ ))
+(define-char
'((morohashi-daikanwa 24691 0 2)
(ideographic-radical . 113) ; â½°
(ideographic-strokes . 6)
(japanese-jisx0212 . #x5059) ; ø»‹ªŠ
(japanese-jisx0213-2 . #x7265) ; ø»¦•‚
(ideograph-daikanwa . 24693) ; ø¸†µ
+ (china3-jef . #x92C5) ; øº‰‹…
))
(define-char
'((morohashi-daikanwa 24693 0 5)
(ideographic-strokes . 7)
(total-strokes . 12)
(ideograph-daikanwa . 24707) ; ø¸†‚ƒ
+ (china3-jef . #x5CDD) ; øº…³
))
(define-char
'((morohashi-daikanwa 24707 0 5)
(japanese-jisx0212 . #x505C) ; ø»‹ª
(japanese-jisx0213-2 . #x7266) ; ø»¦•ƒ
(ideograph-daikanwa . 24713) ; ø¸†‚‰
+ (china3-jef . #x5CDE) ; øº…³ž
))
(define-char
'((morohashi-daikanwa 24713 0 5)
(japanese-jisx0212 . #x505D) ; ø»‹ªŽ
(japanese-jisx0213-1 . #x793E) ; ø»¤”©
(ideograph-daikanwa . 24730) ; ø¸†‚š
+ (china3-jef . #x5CDF) ; øº…³Ÿ
))
(define-char
'((morohashi-daikanwa 24730 0 1)
(total-strokes . 13)
(japanese-jisx0212 . #x505E) ; ø»‹ª
(ideograph-daikanwa . 24734) ; ø¸†‚ž
+ (china3-jef . #x5CE0) ; øº…³
))
(define-char
'((morohashi-daikanwa 24734 0 5)
(total-strokes . 14)
(japanese-jisx0212 . #x5061) ; ø»‹ª’
(ideograph-daikanwa . 24761) ; ø¸†‚¹
+ (china3-jef . #x5CE1) ; øº…³¡
))
(define-char
'((morohashi-daikanwa 24761 0 5)
(korean-ksc5601 . #x7C21) ; ø»ŠŸ¶
(japanese-jisx0213-1 . #x793F) ; ø»¤”ª
(ideograph-daikanwa . 24766) ; ø¸†‚¾
+ (china3-jef . #x5CE2) ; øº…³¢
))
(define-char
'((=>ucs . #x798D) ; ç¦
(korean-ksc5601 . #x6F6E) ; ø»Š½
(japanese-jisx0213-1 . #x7940) ; ø»¤”«
(ideograph-daikanwa . 24767) ; ø¸†‚¿
+ (china3-jef . #x5CE3) ; øº…³£
))
(define-char
'((morohashi-daikanwa 24767 1)
(korean-ksc5601 . #x5C58) ; ø»‰±
(japanese-jisx0213-1 . #x7941) ; ø»¤”¬
(ideograph-daikanwa . 24768) ; ø¸†ƒ€
+ (china3-jef . #x5CE4) ; øº…³¤
(ucs-ks . #x798F) ; 福
(ucs . #xFA1B) ; 福
))
(total-strokes . 14)
(japanese-jisx0212 . #x5064) ; ø»‹ª•
(ideograph-daikanwa . 24772) ; ø¸†ƒ„
+ (china3-jef . #x5CE5) ; øº…³¥
))
(define-char
'((morohashi-daikanwa 24772 0 5)
(japanese-jisx0212 . #x5065) ; ø»‹ª–
(japanese-jisx0213-2 . #x7267) ; ø»¦•„
(ideograph-daikanwa . 24773) ; ø¸†ƒ…
+ (china3-jef . #x5CE6) ; øº…³¦
))
(define-char
'((morohashi-daikanwa 24773 0 5)
(japanese-jisx0212 . #x5068) ; ø»‹ª™
(japanese-jisx0213-1 . #x7942) ; ø»¤”
(ideograph-daikanwa . 24778) ; ø¸†ƒŠ
+ (china3-jef . #x5CE7) ; øº…³§
))
(define-char
'((morohashi-daikanwa 24778 0 5)
(ideographic-strokes . 10)
(total-strokes . 15)
(ideograph-daikanwa . 24788) ; ø¸†ƒ”
+ (china3-jef . #x92C8) ; øº‰‹ˆ
))
(define-char
'((morohashi-daikanwa 24788 0 5)
(japanese-jisx0212 . #x5069) ; ø»‹ªš
(japanese-jisx0213-2 . #x726A) ; ø»¦•‡
(ideograph-daikanwa . 24789) ; ø¸†ƒ•
+ (china3-jef . #x5CE8) ; øº…³¨
))
(define-char
'((morohashi-daikanwa 24789 0 5)
(total-strokes . 17)
(japanese-jisx0212 . #x506C) ; ø»‹ª
(ideograph-daikanwa . 24832) ; ø¸†„€
+ (china3-jef . #x5CEA) ; øº…³ª
))
(define-char
'((morohashi-daikanwa 24832 0 5)
(total-strokes . 16)
(japanese-jisx0212 . #x506D) ; ø»‹ªž
(japanese-jisx0213-2 . #x726C) ; ø»¦•‰
+ (china3-jef . #x9FDB) ; øº‰¿›
))
(define-char
'((morohashi-daikanwa 24833 0 5)
(total-strokes . 18)
(chinese-cns11643-1 . #x7671) ; ø»“€¢
(chinese-gb12345 . #x4071) ; 禮
+ (china3-jef . #x5CEB) ; øº…³«
(ucs . #x79AE) ; 禮
))
(define-char
(ideograph-daikanwa . 24851) ; ø¸†„“
))
(define-char
- '((morohashi-daikanwa 24851 0 5)
+ '((=>ucs . #x79B0) ; 禰
+ (morohashi-daikanwa 24851 0 2)
(ideographic-radical . 113) ; â½°
(ideographic-strokes . 14)
(total-strokes . 19)
(japanese-jisx0208 . #x4729) ; ø»‡ˆ„
- (chinese-cns11643-2 . #x662F) ; ø»”²„
(japanese-jisx0208-1990 . #x4729) ; ø½Š¸
- (chinese-gb12345 . #x6C72) ; 禰
- (ucs . #x79B0) ; 禰
+ ))
+(define-char
+ '((morohashi-daikanwa 24851 0 3)
+ (ideographic-radical . 113) ; â½°
+ (ideographic-strokes . 14)
+ (total-strokes . 19)
+ (chinese-cns11643-2 . #x662F) ; ø»”²„
+ (chinese-gb12345 . #x6C72) ; 禰
+ (china3-jef . #x5CED) ; øº…³
+ (ucs . #x79B0) ; 禰
))
(define-char
'((=>ucs . #x79B1) ; 禱
(chinese-gb2312 . #x353B) ; ø»„£¶
(chinese-isoir165 . #x353B) ; ø»Œ†
(chinese-cns11643-4 . #x395A) ; ø»˜„±
+ (china3-jef . #x5CEC) ; øº…³¬
(ucs . #x7977) ; 祷
))
(define-char
(chinese-isoir165 . #x2E22) ; ø»›
(japanese-jisx0213-1 . #x7944) ; ø»¤”¯
(ideograph-daikanwa . 24884) ; ø¸†„´
+ (china3-jef . #x5CEE) ; øº…³®
(ucs . #x79B8) ; 禸
))
(define-char
(chinese-cns11643-4 . #x2468) ; ø»—¦‰
(japanese-jisx0213-2 . #x726F) ; ø»¦•Œ
(ideograph-daikanwa . 24914) ; ø¸†…’
+ (china3-jef . #x5CF2) ; øº…³²
(ucs . #x79C2) ; 秂
))
(define-char
(chinese-cns11643-3 . #x2A42) ; ø»•¤“
(japanese-jisx0213-2 . #x7270) ; ø»¦•
(ideograph-daikanwa . 24926) ; ø¸†…ž
+ (china3-jef . #x5CF7) ; øº…³·
(ucs . #x79C7) ; 秇
))
(define-char
(chinese-cns11643-3 . #x2A44) ; ø»•¤•
(japanese-jisx0213-1 . #x7946) ; ø»¤”±
(ideograph-daikanwa . 24933) ; ø¸†…¥
+ (china3-jef . #x4CB1) ; øº„²±
(ucs . #x79CA) ; 秊
))
(define-char
'((ideographic-radical . 115) ; â½²
(ideographic-strokes . 4)
(total-strokes . 9)
+ (japanese-jisx0213-2 . #x7271) ; ø»¦•Ž
+ (ideograph-daikanwa . 24941) ; ø¸†…
+ (china3-jef . #x5CF5) ; øº…³µ
+ (ucs . #x79CC) ; 秌
+ ))
+(define-char
+ '((=>ucs . #x79CC) ; 秌
+ (morohashi-daikanwa 24941 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 4)
+ (total-strokes . 9)
+ (chinese-cns11643-4 . #x2A6E) ; ø»—¯ƒ
+ ))
+(define-char
+ '((ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 4)
+ (total-strokes . 9)
(chinese-gb2312 . #x5656) ; ø»…”¯
(chinese-isoir165 . #x5656) ; ø»¼¿
(chinese-cns11643-2 . #x2C5C) ; ø»“¥
(japanese-jisx0213-2 . #x7272) ; ø»¦•
(ideograph-daikanwa . 24942) ; ø¸†…®
+ (china3-jef . #x81C8) ; øºˆ‡ˆ
(ucs . #x79CD) ; ç§
))
(define-char
(ucs . #x79D3) ; 秓
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x79D4) ; 秔
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 4)
(total-strokes . 9)
(japanese-jisx0212 . #x507A) ; ø»‹ª«
- (chinese-cns11643-3 . #x2E41) ; ø»•ªŠ
(japanese-jisx0213-1 . #x7948) ; ø»¤”³
(ideograph-daikanwa . 24954) ; ø¸†…º
- (ucs . #x79D4) ; 秔
+ (china3-jef . #x5CF9) ; øº…³¹
+ ))
+(define-char
+ '((morohashi-daikanwa 24954 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 4)
+ (total-strokes . 9)
+ (chinese-cns11643-3 . #x2E41) ; ø»•ªŠ
+ (ucs . #x79D4) ; 秔
))
(define-char
'((ideographic-radical . 115) ; â½²
(chinese-cns11643-2 . #x2C5E) ; ø»“§
(japanese-jisx0213-2 . #x7273) ; ø»¦•
(ideograph-daikanwa . 24959) ; ø¸†…¿
+ (china3-jef . #x5CFA) ; øº…³º
(ucs . #x79D6) ; 秖
))
(define-char
(define-char
'((ideographic-radical . 115) ; â½²
(ideographic-strokes . 5)
- (kangxi-radical . 86) ; ⽕
- (japanese-strokes . 4)
- (total-strokes . 9)
- (chinese-cns11643-4 . #x2A6E) ; ø»—¯ƒ
- (japanese-jisx0213-2 . #x7271) ; ø»¦•Ž
- (ideograph-daikanwa . 24941) ; ø¸†…
- (ucs . #x79CC) ; 秌
- ))
-(define-char
- '((ideographic-radical . 115) ; â½²
- (ideographic-strokes . 5)
(total-strokes . 10)
(shinjigen-2 . 5536)
(japanese-jisx0208-1978 . #x486B) ; ø»‚¶œ
(ucs . #x79D9) ; 秙
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x79DA) ; 秚
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 5)
(total-strokes . 10)
(japanese-jisx0212 . #x507C) ; ø»‹ª
- (chinese-cns11643-3 . #x3273) ; ø»•°´
(ideograph-daikanwa . 24980) ; ø¸††”
+ (china3-jef . #x5CFB) ; øº…³»
+ ))
+(define-char
+ '((morohashi-daikanwa 24980 0 2)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (chinese-cns11643-3 . #x3273) ; ø»•°´
(ucs . #x79DA) ; 秚
))
(define-char
'((ideographic-radical . 115) ; â½²
(ideographic-strokes . 5)
(total-strokes . 10)
- (chinese-cns11643-2 . #x3156) ; ø»“¤µ
(ideograph-daikanwa . 24982) ; ø¸††–
+ (china3-jef . #x8BF6) ; øºˆ¯¶
(ucs . #x79DC) ; 秜
))
(define-char
+ '((=>ucs . #x79DC) ; 秜
+ (morohashi-daikanwa 24982 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (chinese-cns11643-2 . #x3156) ; ø»“¤µ
+ ))
+(define-char
'((ideographic-radical . 115) ; â½²
(ideographic-strokes . 5)
(total-strokes . 10)
(chinese-cns11643-2 . #x3157) ; ø»“¤¶
(japanese-jisx0213-1 . #x7949) ; ø»¤”´
(ideograph-daikanwa . 24987) ; ø¸††›
+ (china3-jef . #x5CFC) ; øº…³¼
(ucs . #x79DE) ; 秞
))
(define-char
(ucs . #x79E1) ; 秡
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x79E2) ; 秢
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 5)
(total-strokes . 10)
(japanese-jisx0212 . #x5122) ; ø»‹ª±
- (chinese-cns11643-3 . #x327B) ; ø»•°¼
(ideograph-daikanwa . 24991) ; ø¸††Ÿ
+ (china3-jef . #x5CFD) ; øº…³½
+ ))
+(define-char
+ '((=>ucs . #x79E2) ; 秢
+ (morohashi-daikanwa 24991 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (chinese-cns11643-3 . #x327B) ; ø»•°¼
+ ))
+(define-char
+ '((morohashi-daikanwa 24991 0 1)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
(ucs . #x79E2) ; 秢
))
(define-char
(chinese-isoir165 . #x3353) ; ø»‰¢
(chinese-cns11643-1 . #x5732) ; ø»’’
(japanese-jisx0208-1990 . #x4769) ; ø½Š®¸
+ (china3-jef . #x5DC6) ; øº…·†
(ucs . #x79E4) ; 秤
))
(define-char
(ucs . #x79E9) ; 秩
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x79EA) ; 秪
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 5)
(total-strokes . 10)
(japanese-jisx0212 . #x5124) ; ø»‹ª³
(chinese-cns11643-2 . #x3155) ; ø»“¤´
(ideograph-daikanwa . 25000) ; ø¸††¨
+ (china3-jef . #x5CFE) ; øº…³¾
+ ))
+(define-char
+ '((morohashi-daikanwa 25000 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
(ucs . #x79EA) ; 秪
))
(define-char
(chinese-cns11643-2 . #x3154) ; ø»“¤³
(japanese-jisx0213-1 . #x794B) ; ø»¤”¶
(ideograph-daikanwa . 25003) ; ø¸††«
+ (china3-jef . #x92C9) ; øº‰‹‰
(ucs . #x79ED) ; ç§
))
(define-char
(chinese-gb2312 . #x3B7D) ; ø»„¬
(chinese-isoir165 . #x3B7D) ; ø»•¼
(ideograph-daikanwa . 25011) ; ø¸††³
+ (china3-jef . #x81D7) ; øºˆ‡—
(ucs . #x79EF) ; 积
))
(define-char
(ideographic-strokes . 5)
(total-strokes . 10)
(ideograph-daikanwa . 25015) ; ø¸††·
+ (china3-jef . #x8FC0) ; øºˆ¿€
))
(define-char
'((morohashi-daikanwa 25015 0 0)
(japanese-jisx0212 . #x5127) ; ø»‹ª¶
(chinese-cns11643-3 . #x3769) ; ø»•¸€
(ideograph-daikanwa . 25017) ; ø¸††¹
+ (china3-jef . #x5DA2) ; øº…¶¢
(ucs . #x79F1) ; 秱
))
(define-char
(chinese-isoir165 . #x3D55) ; ø»˜
(chinese-cns11643-2 . #x3768) ; ø»“»
(ideograph-daikanwa . 25039) ; ø¸†‡
+ (china3-jef . #x5DA5) ; øº…¶¥
(ucs . #x79F8) ; 秸
))
(define-char
(total-strokes . 11)
(japanese-jisx0212 . #x5129) ; ø»‹ª¸
(ideograph-daikanwa . 25055) ; ø¸†‡Ÿ
+ (china3-jef . #x5DA6) ; øº…¶¦
(ucs . #x79FC) ; 秼
))
(define-char
(ucs . #x7A01) ; ç¨
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x7A02) ; 稂
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 7)
(total-strokes . 12)
- (chinese-gb2312 . #x6F7C) ; ø»…ºƒ
(japanese-jisx0212 . #x512A) ; ø»‹ª¹
+ (ideograph-daikanwa . 25061) ; ø¸†‡¥
+ ))
+(define-char
+ '((morohashi-daikanwa 25061 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 7)
+ (total-strokes . 12)
+ (chinese-gb2312 . #x6F7C) ; ø»…ºƒ
(chinese-isoir165 . #x6F7C) ; ø»Ž¢“
(chinese-cns11643-2 . #x3E5A) ; ø»“·¿
- (ideograph-daikanwa . 25061) ; ø¸†‡¥
+ (china3-jef . #x5DA7) ; øº…¶§
(ucs . #x7A02) ; 稂
))
(define-char
(japanese-jisx0212 . #x512B) ; ø»‹ªº
(japanese-jisx0213-1 . #x794C) ; ø»¤”·
(ideograph-daikanwa . 25068) ; ø¸†‡¬
+ (china3-jef . #x5DA8) ; øº…¶¨
))
(define-char
'((morohashi-daikanwa 25068 0 2)
(total-strokes . 12)
(korean-ksc5601 . #x612A) ; ø»‰¸•
(ideograph-daikanwa . 25070) ; ø¸†‡®
+ (china3-jef . #x5DA9) ; øº…¶©
))
(define-char
'((morohashi-daikanwa 25070 0 0)
'((ideographic-radical . 115) ; â½²
(ideographic-strokes . 7)
(total-strokes . 12)
- (chinese-cns11643-4 . #x3964) ; ø»˜„»
(japanese-jisx0213-2 . #x7277) ; ø»¦•”
(ideograph-daikanwa . 25072) ; ø¸†‡°
+ (china3-jef . #x5DAA) ; øº…¶ª
(ucs . #x414F) ; ä…
))
(define-char
+ '((=>ucs . #x414F) ; ä…
+ (morohashi-daikanwa 25072 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 7)
+ (total-strokes . 12)
+ (chinese-cns11643-4 . #x3964) ; ø»˜„»
+ ))
+(define-char
'((ideographic-radical . 115) ; â½²
(ideographic-strokes . 7)
(total-strokes . 12)
(chinese-cns11643-2 . #x3E5B) ; ø»“¸€
(japanese-jisx0213-2 . #x7278) ; ø»¦••
(ideograph-daikanwa . 25079) ; ø¸†‡·
+ (china3-jef . #x5DAB) ; øº…¶«
(ucs . #x7A0A) ; 稊
))
(define-char
(korean-ksc5601 . #x6F6F) ; ø»Š¾
(chinese-cns11643-1 . #x6123) ; ø»’ ž
(ideograph-daikanwa . 25081) ; ø¸†‡¹
+ (china3-jef . #x5DAC) ; øº…¶¬
))
(define-char
'((morohashi-daikanwa 25081 1)
(japanese-jisx0212 . #x512F) ; ø»‹ª¾
(chinese-cns11643-2 . #x3E5D) ; ø»“¸‚
(ideograph-daikanwa . 25082) ; ø¸†‡º
+ (china3-jef . #x5DAD) ; øº…¶
(ucs . #x7A0C) ; 稌
))
(define-char
(ucs . #x7A10) ; ç¨
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x7A11) ; 稑
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 8)
(total-strokes . 13)
(japanese-jisx0212 . #x5130) ; ø»‹ª¿
- (chinese-cns11643-2 . #x455D) ; ø»”‚”
(japanese-jisx0213-2 . #x7279) ; ø»¦•–
(ideograph-daikanwa . 25102) ; ø¸†ˆŽ
- (ucs . #x7A11) ; 稑
+ (china3-jef . #x5DAF) ; øº…¶¯
+ ))
+(define-char
+ '((=>ucs . #x7A11) ; 稑
+ (morohashi-daikanwa 25102 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 8)
+ (total-strokes . 13)
+ (chinese-cns11643-2 . #x455D) ; ø»”‚”
+ ))
+(define-char
+ '((morohashi-daikanwa 25102 0 1)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 8)
+ (total-strokes . 13)
+ (ucs . #x7A11) ; 稑
))
(define-char
'((ideographic-radical . 115) ; â½²
(total-strokes . 14)
(japanese-jisx0208 . #x4923) ; ø»‡Šº
(japanese-jisx0208-1990 . #x4923) ; ø½Š°®
+ (china3-jef . #x5DC7) ; øº…·‡
(ucs-jis . #x7A17) ; ø»‡Šº
))
(define-char
(chinese-cns11643-1 . #x6563) ; ø»’§–
(japanese-jisx0213-2 . #x727C) ; ø»¦•™
(ideograph-daikanwa . 25126) ; ø¸†ˆ¦
+ (china3-jef . #x5DB0) ; øº…¶°
(ucs . #x7A1E) ; 稞
))
(define-char
(ucs . #x7A20) ; ç¨
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x7A21) ; 稡
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 8)
(total-strokes . 13)
(japanese-jisx0212 . #x5134) ; ø»‹«ƒ
- (chinese-cns11643-4 . #x3F4A) ; ø»˜•
(ideograph-daikanwa . 25131) ; ø¸†ˆ«
+ (china3-jef . #x8CF3) ; øºˆ³³
+ ))
+(define-char
+ '((morohashi-daikanwa 25131 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 8)
+ (total-strokes . 13)
+ (chinese-cns11643-4 . #x3F4A) ; ø»˜•
(ucs . #x7A21) ; 稡
))
(define-char
(total-strokes . 13)
(chinese-cns11643-2 . #x4563) ; ø»”‚š
(ideograph-daikanwa . 25132) ; ø¸†ˆ¬
+ (china3-jef . #x5DB1) ; øº…¶±
(ucs . #x7A22) ; 稢
))
(define-char
(ucs . #x7A26) ; 稦
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x7A27) ; 稧
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 9)
(total-strokes . 14)
(japanese-jisx0212 . #x5135) ; ø»‹«„
- (chinese-cns11643-4 . #x455D) ; ø»˜–œ
(ideograph-daikanwa . 25154) ; ø¸†‰‚
+ ))
+(define-char
+ '((=>ucs . #x7A27) ; 稧
+ (morohashi-daikanwa 25154 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 9)
+ (total-strokes . 14)
+ (chinese-cns11643-4 . #x455D) ; ø»˜–œ
+ ))
+(define-char
+ '((morohashi-daikanwa 25154 0 1)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 9)
+ (total-strokes . 14)
+ (china3-jef . #x5DB3) ; øº…¶³
(ucs . #x7A27) ; 稧
))
(define-char
(chinese-cns11643-3 . #x4853) ; ø»–¨
(japanese-jisx0213-2 . #x727D) ; ø»¦•š
(ideograph-daikanwa . 25162) ; ø¸†‰Š
+ (china3-jef . #x5DB5) ; øº…¶µ
(ucs . #x4163) ; ä…£
))
(define-char
(japanese-jisx0212 . #x5136) ; ø»‹«…
(chinese-cns11643-2 . #x4C4B) ; ø»”Œ”
(ideograph-daikanwa . 25164) ; ø¸†‰Œ
+ (china3-jef . #x5DB6) ; øº…¶¶
(ucs . #x7A2B) ; 稫
))
(define-char
(total-strokes . 14)
(japanese-jisx0208 . #x634A) ; ø»‡±
(japanese-jisx0208-1990 . #x634A) ; ø½‹—¡
+ (china3-jef . #x5DC8) ; øº…·ˆ
(ucs-jis . #x7A31) ; ø»‡±
))
(define-char
(japanese-jisx0208 . #x3972) ; ø»†´©
(chinese-cns11643-4 . #x455F) ; ø»˜–ž
(japanese-jisx0208-1990 . #x3972) ; ø½Šš
+ (china3-jef . #x5CF4) ; øº…³´
(ucs-jis . #x7A40) ; ø»‚ ¡
))
(define-char
(total-strokes . 15)
(japanese-jisx0212 . #x513A) ; ø»‹«‰
(ideograph-daikanwa . 25195) ; ø¸†‰«
+ (china3-jef . #x5DB8) ; øº…¶¸
))
(define-char
'((morohashi-daikanwa 25195 0 2)
(ucs . #x7A37) ; 稷
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x7A38) ; 稸
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 10)
(total-strokes . 15)
(japanese-jisx0212 . #x513C) ; ø»‹«‹
- (chinese-cns11643-3 . #x4D55) ; ø»–˜€
(japanese-jisx0213-2 . #x7321) ; ø»¦•œ
(ideograph-daikanwa . 25208) ; ø¸†‰¸
- (ucs . #x7A38) ; 稸
+ ))
+(define-char
+ '((morohashi-daikanwa 25208 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 10)
+ (total-strokes . 15)
+ (chinese-cns11643-3 . #x4D55) ; ø»–˜€
+ (china3-jef . #x5DB9) ; øº…¶¹
+ (ucs . #x7A38) ; 稸
))
(define-char
'((ideographic-radical . 115) ; â½²
(japanese-jisx0212 . #x513D) ; ø»‹«Œ
(japanese-jisx0213-1 . #x794E) ; ø»¤”¹
(ideograph-daikanwa . 25212) ; ø¸†‰¼
+ (china3-jef . #x5DBA) ; øº…¶º
))
(define-char
'((morohashi-daikanwa 25212 0 3)
(chinese-cns11643-2 . #x5879) ; ø»”žª
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x7A45) ; ç©…
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 11)
(total-strokes . 16)
(japanese-jisx0212 . #x5140) ; ø»‹«
- (chinese-cns11643-3 . #x522A) ; ø»–ž«
(ideograph-daikanwa . 25250) ; ø¸†Š¢
+ ))
+(define-char
+ '((morohashi-daikanwa 25250 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 11)
+ (total-strokes . 16)
+ (chinese-cns11643-3 . #x522A) ; ø»–ž«
+ (china3-jef . #x5DBB) ; øº…¶»
(ucs . #x7A45) ; ç©…
))
(define-char
(chinese-cns11643-2 . #x587B) ; ø»”ž¬
(japanese-jisx0213-2 . #x7322) ; ø»¦•
(ideograph-daikanwa . 25256) ; ø¸†Š¨
+ (china3-jef . #x5DBC) ; øº…¶¼
(ucs . #x7A47) ; 穇
))
(define-char
(ideographic-strokes . 11)
(total-strokes . 16)
(ideograph-daikanwa . 25262) ; ø¸†Š®
+ (china3-jef . #x98E8) ; øº‰£¨
))
(define-char
'((morohashi-daikanwa 25262 0 2)
(ideographic-strokes . 12)
(total-strokes . 17)
(japanese-jisx0212 . #x5146) ; ø»‹«•
- (chinese-cns11643-4 . #x5748) ; ø»˜°£
(japanese-jisx0213-2 . #x7325) ; ø»¦•
(ideograph-daikanwa . 25302) ; ø¸†‹–
+ (china3-jef . #x5DBD) ; øº…¶½
(ucs . #x7A59) ; ç©™
))
(define-char
+ '((=>ucs . #x7A59) ; ç©™
+ (morohashi-daikanwa 25302 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 12)
+ (total-strokes . 17)
+ (chinese-cns11643-4 . #x5748) ; ø»˜°£
+ ))
+(define-char
'((ideographic-radical . 115) ; â½²
(ideographic-strokes . 12)
(total-strokes . 17)
(ucs . #x25894) ; 𥢔
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x7A5C) ; 穜
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 12)
(total-strokes . 17)
(japanese-jisx0212 . #x5147) ; ø»‹«–
- (chinese-cns11643-2 . #x5D7C) ; ø»”¦ƒ
(japanese-jisx0213-2 . #x7326) ; ø»¦•¡
(ideograph-daikanwa . 25307) ; ø¸†‹›
- (ucs . #x7A5C) ; 穜
+ ))
+(define-char
+ '((morohashi-daikanwa 25307 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 12)
+ (total-strokes . 17)
+ (chinese-cns11643-2 . #x5D7C) ; ø»”¦ƒ
+ (china3-jef . #x5DBE) ; øº…¶¾
+ (ucs . #x7A5C) ; 穜
))
(define-char
'((ideographic-radical . 115) ; â½²
(ideographic-strokes . 12)
(total-strokes . 17)
(japanese-jisx0212 . #x5148) ; ø»‹«—
+ (china3-jef . #x5DBF) ; øº…¶¿
(ucs . #x7A5D) ; ç©
))
(define-char
(japanese-jisx0212 . #x5149) ; ø»‹«˜
(japanese-jisx0213-2 . #x7327) ; ø»¦•¢
(ideograph-daikanwa . 25315) ; ø¸†‹£
+ (china3-jef . #x5DC0) ; øº…·€
))
(define-char
'((morohashi-daikanwa 25315 0 2)
(chinese-cns11643-1 . #x7674) ; ø»“€¥
(japanese-jisx0213-2 . #x7328) ; ø»¦•£
(ideograph-daikanwa . 25324) ; ø¸†‹¬
+ (china3-jef . #x5DC1) ; øº…·
(ucs . #x7A60) ; ç©
))
(define-char
(japanese-jisx0212 . #x514B) ; ø»‹«š
(chinese-cns11643-4 . #x6045) ; ø»˜½®
(ideograph-daikanwa . 25338) ; ø¸†‹º
+ (china3-jef . #x5DC2) ; øº…·‚
(ucs . #x7A65) ; ç©¥
))
(define-char
(chinese-cns11643-5 . #x685C) ; ø»›“¹
))
(define-char
- '((ideographic-radical . 115) ; â½²
+ '((=>ucs . #x7A67) ; 穧
+ (ideographic-radical . 115) ; â½²
(ideographic-strokes . 14)
(total-strokes . 19)
(japanese-jisx0212 . #x514C) ; ø»‹«›
- (chinese-cns11643-2 . #x6630) ; ø»”²…
(japanese-jisx0213-2 . #x7329) ; ø»¦•¤
(ideograph-daikanwa . 25342) ; ø¸†‹¾
- (ucs . #x7A67) ; 穧
+ (china3-jef . #x5DC3) ; øº…·ƒ
+ ))
+(define-char
+ '((morohashi-daikanwa 25342 0 0)
+ (ideographic-radical . 115) ; â½²
+ (ideographic-strokes . 14)
+ (total-strokes . 19)
+ (chinese-cns11643-2 . #x6630) ; ø»”²…
+ (ucs . #x7A67) ; 穧
))
(define-char
'((ideographic-radical . 115) ; â½²
(chinese-cns11643-3 . #x5A67) ; ø»–«˜
(japanese-jisx0213-2 . #x732A) ; ø»¦•¥
(ideograph-daikanwa . 25345) ; ø¸†Œ
+ (china3-jef . #x5DC4) ; øº…·„
(ucs . #x7A6A) ; 穪
))
(define-char
(chinese-cns11643-2 . #x6951) ; ø»”·€
(japanese-jisx0213-1 . #x7950) ; ø»¤”»
(ideograph-daikanwa . 25364) ; ø¸†Œ”
+ (china3-jef . #x5DC5) ; øº…·…
(ucs . #x7A6D) ; ç©
))
(define-char
(japanese-jisx0208 . #x376A) ; ø»†±¥
(korean-ksc5601 . #x7A6B) ; ø»Šž„
(ideograph-daikanwa . 25406) ; ø¸†Œ¾
+ (china3-jef . #x5DCB) ; øº…·‹
))
(define-char
'((morohashi-daikanwa 25406 0 0)
(ucs . #x7A79) ; 穹
))
(define-char
- '((ideographic-radical . 116) ; â½³
+ '((=>ucs . #x7A7A) ; 空
+ (ideographic-radical . 116) ; â½³
(ideographic-strokes . 3)
(total-strokes . 8)
(shinjigen-2 . 5681)
(japanese-jisx0208-1978 . #x3675) ; ø»‚œŠ
- (chinese-gb2312 . #x3F55) ; ø»„²¼
(japanese-jisx0208 . #x3675) ; ø»†°’
(korean-ksc5601 . #x4D76) ; ø»‰œ‰
- (chinese-isoir165 . #x3F55) ; ø»›Œ
- (chinese-cns11643-1 . #x4F28) ; ø»’†‡
(japanese-jisx0208-1990 . #x3675) ; ø½Š–†
(ideograph-daikanwa . 25415) ; ø¸†‡
- (ucs . #x7A7A) ; 空
+ ))
+(define-char
+ '((=>ucs . #x7A7A) ; 空
+ (morohashi-daikanwa 25415 0 0)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 3)
+ (total-strokes . 8)
+ (chinese-cns11643-1 . #x4F28) ; ø»’†‡
+ ))
+(define-char
+ '((morohashi-daikanwa 25415 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 3)
+ (total-strokes . 8)
+ (chinese-gb2312 . #x3F55) ; ø»„²¼
+ (chinese-isoir165 . #x3F55) ; ø»›Œ
+ (ucs . #x7A7A) ; 空
+ ))
+(define-char
+ '((=>ucs . #x7A7A) ; 空
+ (morohashi-daikanwa 25415 0 2)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 3)
+ (total-strokes . 8)
+ (china3-jef . #x5DCC) ; øº…·Œ
))
(define-char
'((ideographic-radical . 116) ; â½³
(ucs . #x7A7E) ; 穾
))
(define-char
- '((ideographic-radical . 116) ; â½³
+ '((=>ucs . #x7A7F) ; ç©¿
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 4)
+ (total-strokes . 9)
+ (ideograph-daikanwa . 25436) ; ø¸†œ
+ ))
+(define-char
+ '((=>ucs . #x7A7F) ; ç©¿
+ (morohashi-daikanwa 25436 0 0)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 4)
+ (total-strokes . 9)
+ (chinese-cns11643-1 . #x5272) ; ø»’‹«
+ ))
+(define-char
+ '((morohashi-daikanwa 25436 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 4)
+ (total-strokes . 9)
+ (chinese-gb2312 . #x3429) ; ø»„¢†
+ (chinese-isoir165 . #x3429) ; ø»Š–
+ (ucs . #x7A7F) ; ç©¿
+ ))
+(define-char
+ '((=>ucs . #x7A7F) ; ç©¿
+ (morohashi-daikanwa 25436 0 2)
+ (ideographic-radical . 116) ; â½³
(ideographic-strokes . 4)
(total-strokes . 9)
(japanese-jisx0208-1978 . #x407C) ; ø»‚ª½
- (chinese-gb2312 . #x3429) ; ø»„¢†
(japanese-jisx0208 . #x407C) ; ø»†¿…
(korean-ksc5601 . #x743E) ; ø»Š”£
- (chinese-isoir165 . #x3429) ; ø»Š–
- (chinese-cns11643-1 . #x5272) ; ø»’‹«
(japanese-jisx0208-1990 . #x407C) ; ø½Š¤¹
- (ideograph-daikanwa . 25436) ; ø¸†œ
- (ucs . #x7A7F) ; ç©¿
+ (china3-jef . #x5DD7) ; øº…·—
))
(define-char
'((ideographic-radical . 116) ; â½³
(ucs . #x7A80) ; 窀
))
(define-char
- '((ideographic-radical . 116) ; â½³
+ '((=>ucs . #x7A81) ; çª
+ (ideographic-radical . 116) ; â½³
(ideographic-strokes . 4)
(total-strokes . 9)
- (chinese-gb2312 . #x4D3B) ; ø»…‡†
(korean-ksc5601 . #x544D) ; ø»‰¥²
- (chinese-isoir165 . #x4D3B) ; ø»¯–
- (chinese-cns11643-1 . #x5273) ; ø»’‹¬
(japanese-jisx0213-1 . #x7951) ; ø»¤”¼
(ideograph-daikanwa . 25439) ; ø¸†Ÿ
- (ucs . #x7A81) ; çª
+ (china3-jef . #x5DCD) ; øº…·
+ ))
+(define-char
+ '((=>ucs . #x7A81) ; çª
+ (morohashi-daikanwa 25439 0 0)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 4)
+ (total-strokes . 9)
+ (chinese-cns11643-1 . #x5273) ; ø»’‹¬
+ ))
+(define-char
+ '((morohashi-daikanwa 25439 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 4)
+ (total-strokes . 9)
+ (chinese-gb2312 . #x4D3B) ; ø»…‡†
+ (chinese-isoir165 . #x4D3B) ; ø»¯–
+ (ucs . #x7A81) ; çª
))
(define-char
'((ideographic-radical . 116) ; â½³
(ucs . #x7A85) ; 窅
))
(define-char
- '((ideographic-radical . 116) ; â½³
+ '((=>ucs . #x7A86) ; 窆
+ (ideographic-radical . 116) ; â½³
(ideographic-strokes . 5)
- (japanese-strokes . 4)
(total-strokes . 10)
- (chinese-gb2312 . #x7139) ; ø»…»¼
(japanese-jisx0212 . #x5155) ; ø»‹«¤
- (chinese-isoir165 . #x7139) ; ø»Ž¤Œ
- (chinese-cns11643-2 . #x3159) ; ø»“¤¸
(ideograph-daikanwa . 25459) ; ø¸†³
+ (china3-jef . #x5DCE) ; øº…·Ž
+ ))
+(define-char
+ '((=>ucs . #x7A86) ; 窆
+ (morohashi-daikanwa 25459 0 0)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (chinese-cns11643-2 . #x3159) ; ø»“¤¸
+ ))
+(define-char
+ '((morohashi-daikanwa 25459 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (chinese-gb2312 . #x7139) ; ø»…»¼
+ (chinese-isoir165 . #x7139) ; ø»Ž¤Œ
(ucs . #x7A86) ; 窆
))
(define-char
(ideographic-radical . 116) ; â½³
(ideographic-strokes . 5)
(total-strokes . 10)
- (chinese-cns11643-2 . #x315E) ; ø»“¤½
(ideograph-daikanwa . 25467) ; ø¸†»
))
(define-char
- '((morohashi-daikanwa 25467 0 2)
+ '((morohashi-daikanwa 25467 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (ucs . #x7A8A) ; 窊
+ ))
+(define-char
+ '((=>ucs . #x7A8A) ; 窊
+ (morohashi-daikanwa 25467 0 2)
(ideographic-radical . 116) ; â½³
(ideographic-strokes . 5)
(total-strokes . 10)
(japanese-jisx0212 . #x5156) ; ø»‹«¥
(japanese-jisx0213-2 . #x732E) ; ø»¦•©
- (ucs . #x7A8A) ; 窊
+ (china3-jef . #x5DCF) ; øº…·
+ ))
+(define-char
+ '((=>ucs . #x7A8A) ; 窊
+ (morohashi-daikanwa 25467 0 4)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 5)
+ (total-strokes . 10)
+ (chinese-cns11643-2 . #x315E) ; ø»“¤½
))
(define-char
'((ideographic-radical . 116) ; â½³
(ucs . #x7A8F) ; çª
))
(define-char
- '((ideographic-radical . 116) ; â½³
+ '((=>ucs . #x7A90) ; çª
+ (ideographic-radical . 116) ; â½³
(ideographic-strokes . 6)
(total-strokes . 11)
(japanese-jisx0212 . #x5158) ; ø»‹«§
- (chinese-cns11643-2 . #x376D) ; ø»“®€
(japanese-jisx0213-2 . #x732F) ; ø»¦•ª
(ideograph-daikanwa . 25490) ; ø¸†Ž’
- (ucs . #x7A90) ; çª
+ (china3-jef . #x5DD0) ; øº…·
))
(define-char
- '((ideographic-radical . 116) ; â½³
+ '((=>ucs . #x7A90) ; çª
+ (morohashi-daikanwa 25490 0 0)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 6)
+ (total-strokes . 11)
+ (chinese-cns11643-2 . #x376D) ; ø»“®€
+ ))
+(define-char
+ '((morohashi-daikanwa 25490 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 6)
+ (total-strokes . 11)
+ (ucs . #x7A90) ; çª
+ ))
+(define-char
+ '((=>ucs . #x7A91) ; 窑
+ (ideographic-radical . 116) ; â½³
(ideographic-strokes . 6)
(total-strokes . 11)
- (chinese-gb2312 . #x5224) ; ø»…Ž…
(japanese-jisx0212 . #x5159) ; ø»‹«¨
- (chinese-isoir165 . #x5224) ; ø»¶•
- (chinese-cns11643-3 . #x3772) ; ø»•¸‰
(ideograph-daikanwa . 25491) ; ø¸†Ž“
+ (china3-jef . #x5DD1) ; øº…·‘
+ ))
+(define-char
+ '((=>ucs . #x7A91) ; 窑
+ (morohashi-daikanwa 25491 0 0)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 6)
+ (total-strokes . 11)
+ (chinese-cns11643-3 . #x3772) ; ø»•¸‰
+ ))
+(define-char
+ '((morohashi-daikanwa 25491 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 6)
+ (total-strokes . 11)
+ (chinese-gb2312 . #x5224) ; ø»…Ž…
+ (chinese-isoir165 . #x5224) ; ø»¶•
(ucs . #x7A91) ; 窑
))
(define-char
(ucs . #x7A98) ; 窘
))
(define-char
- '((ideographic-radical . 116) ; â½³
+ '((=>ucs . #x7A99) ; 窙
+ (ideographic-radical . 116) ; â½³
(ideographic-strokes . 7)
(total-strokes . 12)
- (chinese-cns11643-2 . #x3E5F) ; ø»“¸„
(ideograph-daikanwa . 25520) ; ø¸†Ž°
+ (china3-jef . #x5DD2) ; øº…·’
+ ))
+(define-char
+ '((=>ucs . #x7A99) ; 窙
+ (morohashi-daikanwa 25520 0 0)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 7)
+ (total-strokes . 12)
+ (chinese-cns11643-2 . #x3E5F) ; ø»“¸„
+ ))
+(define-char
+ '((morohashi-daikanwa 25520 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 7)
+ (total-strokes . 12)
(ucs . #x7A99) ; 窙
))
(define-char
(ideographic-strokes . 7)
(total-strokes . 12)
(ideograph-daikanwa . 25526) ; ø¸†Ž¶
+ (china3-jef . #x4AC6) ; øº„«†
))
(define-char
'((morohashi-daikanwa 25526 0 0)
(chinese-cns11643-4 . #x3F53) ; ø»˜ž
))
(define-char
- '((ideographic-radical . 116) ; â½³
+ '((=>ucs . #x7AA0) ; çª
+ (ideographic-radical . 116) ; â½³
(ideographic-strokes . 8)
(total-strokes . 13)
- (chinese-gb2312 . #x713D) ; ø»…¼€
(japanese-jisx0212 . #x515C) ; ø»‹««
- (chinese-isoir165 . #x713D) ; ø»Ž¤
- (chinese-cns11643-1 . #x6565) ; ø»’§˜
(japanese-jisx0213-1 . #x7953) ; ø»¤”¾
(ideograph-daikanwa . 25556) ; ø¸†”
- (ucs . #x7AA0) ; çª
+ (china3-jef . #x5DD3) ; øº…·“
+ ))
+(define-char
+ '((=>ucs . #x7AA0) ; çª
+ (morohashi-daikanwa 25556 0 0)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 8)
+ (total-strokes . 13)
+ (chinese-cns11643-1 . #x6565) ; ø»’§˜
+ ))
+(define-char
+ '((morohashi-daikanwa 25556 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 8)
+ (total-strokes . 13)
+ (chinese-gb2312 . #x713D) ; ø»…¼€
+ (chinese-isoir165 . #x713D) ; ø»Ž¤
+ (ucs . #x7AA0) ; çª
))
(define-char
'((=>ucs . #x2599F) ; 𥦟
(ideographic-radical . 116) ; â½³
(ideographic-strokes . 10)
(total-strokes . 15)
- (chinese-cns11643-2 . #x525D) ; ø»”•š
(ideograph-daikanwa . 25601) ; ø¸†
))
(define-char
+ '((morohashi-daikanwa 25601 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 10)
+ (total-strokes . 15)
+ (chinese-gb2312 . #x7141) ; ø»…¼„
+ (chinese-isoir165 . #x7141) ; ø»Ž¤”
+ (ucs . #x7AB3) ; 窳
+ ))
+(define-char
'((=>ucs . #x7AB3) ; 窳
(morohashi-daikanwa 25601 0 2)
(ideographic-radical . 116) ; â½³
(total-strokes . 15)
(japanese-jisx0212 . #x515F) ; ø»‹«®
(japanese-jisx0213-1 . #x7955) ; ø»¤•€
+ (china3-jef . #x5DD4) ; øº…·”
))
(define-char
- '((morohashi-daikanwa 25601 0 3)
+ '((=>ucs . #x7AB3) ; 窳
+ (morohashi-daikanwa 25601 0 4)
(ideographic-radical . 116) ; â½³
(ideographic-strokes . 10)
(total-strokes . 15)
- (chinese-gb2312 . #x7141) ; ø»…¼„
- (chinese-isoir165 . #x7141) ; ø»Ž¤”
- (ucs . #x7AB3) ; 窳
+ (chinese-cns11643-2 . #x525D) ; ø»”•š
))
(define-char
'((=>ucs . #x259D3) ; 𥧓
(ucs . #x7AB8) ; 窸
))
(define-char
- '((ideographic-radical . 116) ; â½³
+ '((=>ucs . #x7AB9) ; 窹
+ (ideographic-radical . 116) ; â½³
(ideographic-strokes . 11)
(total-strokes . 16)
(japanese-jisx0212 . #x5161) ; ø»‹«°
(japanese-jisx0213-2 . #x7334) ; ø»¦•¯
(ideograph-daikanwa . 25632) ; ø¸†
- (ucs . #x7AB9) ; 窹
+ (china3-jef . #x5DD5) ; øº…·•
))
(define-char
'((=>ucs . #x7AB9) ; 窹
- (morohashi-daikanwa 25632 0 1)
+ (morohashi-daikanwa 25632 0 0)
(ideographic-radical . 116) ; â½³
(ideographic-strokes . 11)
(total-strokes . 16)
(chinese-cns11643-5 . #x5652) ; ø»š¹“
))
(define-char
+ '((morohashi-daikanwa 25632 0 1)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 11)
+ (total-strokes . 16)
+ (ucs . #x7AB9) ; 窹
+ ))
+(define-char
'((ideographic-radical . 116) ; â½³
(ideographic-strokes . 11)
(total-strokes . 16)
(japanese-jisx0212 . #x5162) ; ø»‹«±
(japanese-jisx0213-1 . #x7956) ; ø»¤•
(ideograph-daikanwa . 25635) ; ø¸†£
+ (china3-jef . #x5DD6) ; øº…·–
))
(define-char
- '((morohashi-daikanwa 25635 0 2)
+ '((=>ucs . #x7ABB) ; 窻
+ (morohashi-daikanwa 25635 0 1)
(ideographic-radical . 116) ; â½³
(ideographic-strokes . 11)
(total-strokes . 16)
(chinese-cns11643-3 . #x522F) ; ø»–ž°
+ ))
+(define-char
+ '((morohashi-daikanwa 25635 0 2)
+ (ideographic-radical . 116) ; â½³
+ (ideographic-strokes . 11)
+ (total-strokes . 16)
(ucs . #x7ABB) ; 窻
))
(define-char
(ucs . #x25A59) ; 𥩙
))
(define-char
- '((ideographic-radical . 117) ; â½´
+ '((=>ucs . #x7AD1) ; ç«‘
+ (ideographic-radical . 117) ; â½´
(ideographic-strokes . 4)
(total-strokes . 9)
(japanese-jisx0212 . #x5168) ; ø»‹«·
- (chinese-isoir165 . #x7D6F) ; ø»Ž¶ª
- (chinese-cns11643-2 . #x2C62) ; ø»“«
(japanese-jisx0213-2 . #x7339) ; ø»¦•´
(ideograph-daikanwa . 25735) ; ø¸†’‡
- (ucs . #x7AD1) ; ç«‘
+ ))
+(define-char
+ '((morohashi-daikanwa 25735 0 0)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 4)
+ (total-strokes . 9)
+ (chinese-isoir165 . #x7D6F) ; ø»Ž¶ª
+ (chinese-cns11643-2 . #x2C62) ; ø»“«
+ (china3-jef . #x5DDD) ; øº…·
+ (ucs . #x7AD1) ; ç«‘
))
(define-char
'((ideographic-radical . 117) ; â½´
(total-strokes . 10)
(japanese-jisx0212 . #x5169) ; ø»‹«¸
(ideograph-daikanwa . 25746) ; ø¸†’’
+ (china3-jef . #x5DDE) ; øº…·ž
))
(define-char
'((morohashi-daikanwa 25746 0 1)
(ideographic-strokes . 6)
(total-strokes . 11)
(chinese-cns11643-5 . #x3446) ; ø»š‡‹
+ (china3-jef . #x5DDF) ; øº…·Ÿ
(ucs . #x41CB) ; 䇋
))
(define-char
(ucs . #x25A72) ; 𥩲
))
(define-char
- '((ideographic-radical . 117) ; â½´
+ '((=>ucs . #x7AE0) ; ç«
+ (ideographic-radical . 117) ; â½´
(ideographic-strokes . 6)
(total-strokes . 11)
(shinjigen-2 . 5735)
(japanese-jisx0208-1978 . #x3E4F) ; ø»‚§”
- (chinese-gb2312 . #x5542) ; ø»…’½
(japanese-jisx0208 . #x3E4F) ; ø»†»œ
(korean-ksc5601 . #x6D71) ; ø»Š‹„
- (chinese-isoir165 . #x5542) ; ø»»
- (chinese-cns11643-1 . #x5D7D) ; ø»’œ€
(japanese-jisx0208-1990 . #x3E4F) ; ø½Š¡
(ideograph-daikanwa . 25761) ; ø¸†’¡
- (ucs . #x7AE0) ; ç«
+ ))
+(define-char
+ '((morohashi-daikanwa 25761 0 0)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 6)
+ (total-strokes . 11)
+ (chinese-gb2312 . #x5542) ; ø»…’½
+ (chinese-isoir165 . #x5542) ; ø»»
+ (chinese-cns11643-1 . #x5D7D) ; ø»’œ€
+ (ucs . #x7AE0) ; ç«
+ ))
+(define-char
+ '((=>ucs . #x7AE0) ; ç«
+ (morohashi-daikanwa 25761 0 1)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 6)
+ (total-strokes . 11)
+ (china3-jef . #x5DDA) ; øº…·š
))
(define-char
'((=>ucs . #x25A73) ; 𥩳
(ucs . #x7AE3) ; ç«£
))
(define-char
- '((ideographic-radical . 117) ; â½´
+ '((=>ucs . #x7AE4) ; 竤
+ (ideographic-radical . 117) ; â½´
(ideographic-strokes . 7)
(total-strokes . 12)
- (chinese-cns11643-2 . #x3E61) ; ø»“¸†
(ideograph-daikanwa . 25774) ; ø¸†’®
+ ))
+(define-char
+ '((morohashi-daikanwa 25774 0 0)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 7)
+ (total-strokes . 12)
+ (chinese-cns11643-2 . #x3E61) ; ø»“¸†
+ (china3-jef . #x5DE0) ; øº…·
(ucs . #x7AE4) ; 竤
))
(define-char
- '((ideographic-radical . 117) ; â½´
+ '((=>ucs . #x7AE5) ; ç«¥
+ (ideographic-radical . 117) ; â½´
(ideographic-strokes . 7)
(total-strokes . 12)
(shinjigen-2 . 5740)
(japanese-jisx0208-1978 . #x4638) ; ø»‚²
- (chinese-gb2312 . #x4D2F) ; ø»…†º
(japanese-jisx0208 . #x4638) ; ø»‡†µ
(korean-ksc5601 . #x545B) ; ø»‰¦€
- (chinese-isoir165 . #x4D2F) ; ø»¯Š
- (chinese-cns11643-1 . #x6129) ; ø»’ ¤
(japanese-jisx0208-1990 . #x4638) ; ø½Š¬©
(ideograph-daikanwa . 25775) ; ø¸†’¯
- (ucs . #x7AE5) ; ç«¥
+ ))
+(define-char
+ '((morohashi-daikanwa 25775 0 0)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 7)
+ (total-strokes . 12)
+ (chinese-gb2312 . #x4D2F) ; ø»…†º
+ (chinese-isoir165 . #x4D2F) ; ø»¯Š
+ (chinese-cns11643-1 . #x6129) ; ø»’ ¤
+ (ucs . #x7AE5) ; ç«¥
+ ))
+(define-char
+ '((=>ucs . #x7AE5) ; ç«¥
+ (morohashi-daikanwa 25775 0 1)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 7)
+ (total-strokes . 12)
+ (china3-jef . #x5DDB) ; øº…·›
))
(define-char
'((ideographic-radical . 117) ; â½´
(ucs . #x25A83) ; 𥪃
))
(define-char
- '((ideographic-radical . 117) ; â½´
+ '((=>ucs . #x7AE7) ; 竧
+ (ideographic-radical . 117) ; â½´
(ideographic-strokes . 7)
(total-strokes . 12)
- (chinese-cns11643-3 . #x3D70) ; ø»–€»
(japanese-jisx0213-2 . #x733A) ; ø»¦•µ
(ideograph-daikanwa . 25781) ; ø¸†’µ
- (ucs . #x7AE7) ; 竧
+ ))
+(define-char
+ '((morohashi-daikanwa 25781 0 0)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 7)
+ (total-strokes . 12)
+ (chinese-cns11643-3 . #x3D70) ; ø»–€»
+ (china3-jef . #x5DE1) ; øº…·¡
+ (ucs . #x7AE7) ; 竧
))
(define-char
'((=>ucs . #x25A84) ; 𥪄
(ucs . #x25A8B) ; 𥪋
))
(define-char
- '((ideographic-radical . 117) ; â½´
+ '((=>ucs . #x7AE8) ; 竨
+ (ideographic-radical . 117) ; â½´
(ideographic-strokes . 8)
(total-strokes . 13)
(japanese-jisx0212 . #x516A) ; ø»‹«¹
- (chinese-cns11643-4 . #x3F57) ; ø»˜¢
(japanese-jisx0213-2 . #x733B) ; ø»¦•¶
(ideograph-daikanwa . 25786) ; ø¸†’º
- (ucs . #x7AE8) ; 竨
+ (china3-jef . #x5DE2) ; øº…·¢
))
(define-char
- '((ideographic-radical . 117) ; â½´
+ '((morohashi-daikanwa 25786 0 0)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 8)
+ (total-strokes . 13)
+ (chinese-cns11643-4 . #x3F57) ; ø»˜¢
+ (ucs . #x7AE8) ; 竨
+ ))
+(define-char
+ '((=>ucs . #x7AE9) ; ç«©
+ (ideographic-radical . 117) ; â½´
(ideographic-strokes . 8)
(total-strokes . 13)
(japanese-jisx0212 . #x516B) ; ø»‹«º
- (chinese-cns11643-3 . #x4349) ; ø»–‰ˆ
(ideograph-daikanwa . 25787) ; ø¸†’»
+ ))
+(define-char
+ '((morohashi-daikanwa 25787 0 0)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 8)
+ (total-strokes . 13)
+ (chinese-cns11643-3 . #x4349) ; ø»–‰ˆ
+ (china3-jef . #x5DE3) ; øº…·£
(ucs . #x7AE9) ; ç«©
))
(define-char
(japanese-jisx0212 . #x516C) ; ø»‹«»
(japanese-jisx0213-1 . #x7958) ; ø»¤•ƒ
(ideograph-daikanwa . 25791) ; ø¸†’¿
+ (china3-jef . #x5DE4) ; øº…·¤
))
(define-char
'((morohashi-daikanwa 25791 0 2)
(ucs . #x25A8C) ; 𥪌
))
(define-char
- '((ideographic-radical . 117) ; â½´
+ '((=>ucs . #x7AEC) ; 竬
+ (ideographic-radical . 117) ; â½´
(ideographic-strokes . 9)
(total-strokes . 14)
(japanese-jisx0212 . #x516D) ; ø»‹«¼
- (chinese-cns11643-3 . #x4854) ; ø»–©
(ideograph-daikanwa . 25800) ; ø¸†“ˆ
+ (china3-jef . #x5DE6) ; øº…·¦
+ ))
+(define-char
+ '((morohashi-daikanwa 25800 0 0)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 9)
+ (total-strokes . 14)
+ (chinese-cns11643-3 . #x4854) ; ø»–©
(ucs . #x7AEC) ; 竬
))
(define-char
(chinese-cns11643-7 . #x263E) ; ø»ž†§
))
(define-char
- '((ideographic-radical . 117) ; â½´
+ '((=>ucs . #x7AF1) ; 竱
+ (ideographic-radical . 117) ; â½´
(ideographic-strokes . 11)
(total-strokes . 16)
(japanese-jisx0212 . #x516E) ; ø»‹«½
- (chinese-cns11643-3 . #x5230) ; ø»–ž±
(ideograph-daikanwa . 25815) ; ø¸†“—
+ ))
+(define-char
+ '((morohashi-daikanwa 25815 0 0)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 11)
+ (total-strokes . 16)
+ (chinese-cns11643-3 . #x5230) ; ø»–ž±
+ (china3-jef . #x5DE7) ; øº…·§
(ucs . #x7AF1) ; 竱
))
(define-char
(ucs . #x7AF2) ; 竲
))
(define-char
- '((ideographic-radical . 117) ; â½´
+ '((=>ucs . #x7AF3) ; 竳
+ (ideographic-radical . 117) ; â½´
(ideographic-strokes . 12)
(total-strokes . 17)
- (chinese-cns11643-3 . #x556A) ; ø»–¤…
(ideograph-daikanwa . 25817) ; ø¸†“™
+ (china3-jef . #x5DE8) ; øº…·¨
+ ))
+(define-char
+ '((morohashi-daikanwa 25817 0 0)
+ (ideographic-radical . 117) ; â½´
+ (ideographic-strokes . 12)
+ (total-strokes . 17)
+ (chinese-cns11643-3 . #x556A) ; ø»–¤…
(ucs . #x7AF3) ; 竳
))
(define-char
(chinese-cns11643-1 . #x5275) ; ø»’‹®
(japanese-jisx0213-1 . #x7959) ; ø»¤•„
(ideograph-daikanwa . 25851) ; ø¸†“»
+ (china3-jef . #x5DEC) ; øº…·¬
(ucs . #x7AFD) ; 竽
))
(define-char
(ucs . #x7B07) ; 笇
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7B08) ; 笈
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 4)
+ (total-strokes . 10)
+ (chinese-cns11643-2 . #x3166) ; ø»“¥…
+ (ideograph-daikanwa . 25869) ; ø¸†”
+ ))
+(define-char
+ '((morohashi-daikanwa 25869 0 2)
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 4)
(total-strokes . 10)
(japanese-jisx0208-1978 . #x3568) ; ø»‚šŸ
(chinese-gb2312 . #x7345) ; ø»…¿„
(japanese-jisx0208 . #x3568) ; ø»†®§
(chinese-isoir165 . #x7345) ; ø»Ž§”
- (chinese-cns11643-2 . #x3166) ; ø»“¥…
(japanese-jisx0208-1990 . #x3568) ; ø½Š”›
- (ideograph-daikanwa . 25869) ; ø¸†”
+ (china3-jef . #x5DEA) ; øº…·ª
(ucs . #x7B08) ; 笈
))
(define-char
(chinese-gb2312 . #x314A) ; ø»„ž
(japanese-jisx0212 . #x5174) ; ø»‹¬ƒ
(chinese-isoir165 . #x314A) ; ø»†
- (chinese-cns11643-3 . #x332C) ; ø»•±‹
(ideograph-daikanwa . 25888) ; ø¸†”
(ucs . #x7B14) ; 笔
))
(define-char
+ '((=>ucs . #x7B14) ; 笔
+ (morohashi-daikanwa 25888 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 4)
+ (total-strokes . 10)
+ (chinese-cns11643-3 . #x332C) ; ø»•±‹
+ ))
+(define-char
+ '((=>ucs . #x7B14) ; 笔
+ (morohashi-daikanwa 25888 0 9)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 4)
+ (total-strokes . 10)
+ (china3-jef . #x81F4) ; øºˆ‡´
+ ))
+(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 4)
(total-strokes . 10)
(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 5)
- (japanese-strokes . 6)
(total-strokes . 11)
- (japanese-jisx0212 . #x5175) ; ø»‹¬„
- (chinese-cns11643-3 . #x377B) ; ø»•¸’
(ideograph-daikanwa . 25923) ; ø¸†•ƒ
(ucs . #x7B1F) ; 笟
))
(define-char
+ '((=>ucs . #x7B1F) ; 笟
+ (morohashi-daikanwa 25923 0 1)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 6)
+ (total-strokes . 12)
+ (japanese-jisx0212 . #x5175) ; ø»‹¬„
+ (china3-jef . #x5DED) ; øº…·
+ ))
+(define-char
+ '((=>ucs . #x7B1F) ; 笟
+ (morohashi-daikanwa 25923 0 2)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 5)
+ (total-strokes . 11)
+ (chinese-cns11643-3 . #x377B) ; ø»•¸’
+ ))
+(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 5)
(total-strokes . 11)
(japanese-jisx0212 . #x5176) ; ø»‹¬…
(chinese-cns11643-2 . #x3822) ; ø»“®“
(ideograph-daikanwa . 25928) ; ø¸†•ˆ
+ (china3-jef . #x5DEE) ; øº…·®
(ucs . #x7B23) ; 笣
))
(define-char
(ucs . #x7B26) ; 符
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7B27) ; 笧
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 5)
(total-strokes . 11)
(japanese-jisx0212 . #x5177) ; ø»‹¬†
(chinese-cns11643-4 . #x337C) ; ø»—¼Ÿ
(japanese-jisx0213-2 . #x7342) ; ø»¦•½
(ideograph-daikanwa . 25938) ; ø¸†•’
- (ucs . #x7B27) ; 笧
+ (china3-jef . #x5DEF) ; øº…·¯
+ ))
+(define-char
+ '((morohashi-daikanwa 25938 0 5)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 5)
+ (total-strokes . 11)
+ (ucs . #x7B27) ; 笧
))
(define-char
'((ideographic-radical . 118) ; â½µ
(chinese-cns11643-2 . #x3777) ; ø»“®Š
(japanese-jisx0213-2 . #x7343) ; ø»¦•¾
(ideograph-daikanwa . 25941) ; ø¸†••
+ (china3-jef . #x98EB) ; øº‰£«
(ucs . #x7B2A) ; 笪
))
(define-char
(chinese-isoir165 . #x734A) ; ø»Ž§™
(chinese-cns11643-2 . #x377A) ; ø»“®
(ideograph-daikanwa . 25942) ; ø¸†•–
+ (china3-jef . #x5DF0) ; øº…·°
(ucs . #x7B2B) ; 笫
))
(define-char
(ideographic-strokes . 5)
(total-strokes . 11)
(japanese-jisx0212 . #x517D) ; ø»‹¬Œ
- (chinese-cns11643-2 . #x377C) ; ø»“®
(japanese-jisx0213-2 . #x7345) ; ø»¦–€
(ideograph-daikanwa . 25946) ; ø¸†•š
(ucs . #x7B2F) ; 笯
))
(define-char
+ '((=>ucs . #x7B2F) ; 笯
+ (morohashi-daikanwa 25946 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 5)
+ (total-strokes . 11)
+ (chinese-cns11643-2 . #x377C) ; ø»“®
+ (china3-jef . #x5DF1) ; øº…·±
+ ))
+(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 5)
(total-strokes . 11)
(japanese-jisx0212 . #x5224) ; ø»‹¬‘
(chinese-cns11643-5 . #x3B24) ; ø»š»
(ideograph-daikanwa . 25969) ; ø¸†•±
+ (china3-jef . #x5DF3) ; øº…·³
(ucs . #x7B3F) ; 笿
))
(define-char
(japanese-jisx0212 . #x5225) ; ø»‹¬’
(chinese-cns11643-2 . #x3E68) ; ø»“¸
(ideograph-daikanwa . 25972) ; ø¸†•´
+ (china3-jef . #x5DF4) ; øº…·´
(ucs . #x7B40) ; ç€
))
(define-char
(total-strokes . 12)
(japanese-jisx0212 . #x5228) ; ø»‹¬•
(chinese-isoir165 . #x7E26) ; ø»Ž¶¿
- (chinese-cns11643-2 . #x3E67) ; ø»“¸Œ
(japanese-jisx0213-1 . #x795E) ; ø»¤•‰
(ideograph-daikanwa . 25998) ; ø¸†–Ž
+ (china3-jef . #x5DF5) ; øº…·µ
(ucs . #x7B4E) ; çŽ
))
(define-char
+ '((=>ucs . #x7B4E) ; çŽ
+ (morohashi-daikanwa 25998 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 6)
+ (total-strokes . 12)
+ (chinese-cns11643-2 . #x3E67) ; ø»“¸Œ
+ ))
+(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 6)
(total-strokes . 12)
(ucs . #x7B5F) ; çŸ
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7B60) ; ç
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 7)
(total-strokes . 13)
- (chinese-gb2312 . #x735E) ; ø»…¿
(korean-ksc5601 . #x5035) ; ø»‰Ÿ¢
(japanese-jisx0212 . #x522A) ; ø»‹¬—
- (chinese-isoir165 . #x735E) ; ø»Ž§
- (chinese-cns11643-1 . #x6568) ; ø»’§›
(japanese-jisx0213-1 . #x795F) ; ø»¤•Š
(ideograph-daikanwa . 26032) ; ø¸†–°
- (ucs . #x7B60) ; ç
+ (china3-jef . #x5DF7) ; øº…··
+ ))
+(define-char
+ '((=>ucs . #x7B60) ; ç
+ (morohashi-daikanwa 26032 0 1)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 7)
+ (total-strokes . 13)
+ (chinese-cns11643-1 . #x6568) ; ø»’§›
+ ))
+(define-char
+ '((morohashi-daikanwa 26032 0 2)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 7)
+ (total-strokes . 13)
+ (chinese-gb2312 . #x735E) ; ø»…¿
+ (chinese-isoir165 . #x735E) ; ø»Ž§
+ (ucs . #x7B60) ; ç
))
(define-char
'((ideographic-radical . 118) ; â½µ
(ucs . #x7B63) ; ç£
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7B64) ; ç¤
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 7)
(total-strokes . 13)
(japanese-jisx0212 . #x522B) ; ø»‹¬˜
- (chinese-cns11643-2 . #x456C) ; ø»”‚£
(japanese-jisx0213-2 . #x734E) ; ø»¦–‰
(ideograph-daikanwa . 26047) ; ø¸†–¿
- (ucs . #x7B64) ; ç¤
+ (china3-jef . #x5DF8) ; øº…·¸
+ ))
+(define-char
+ '((morohashi-daikanwa 26047 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 7)
+ (total-strokes . 13)
+ (chinese-cns11643-2 . #x456C) ; ø»”‚£
+ (ucs . #x7B64) ; ç¤
))
(define-char
'((ideographic-radical . 118) ; â½µ
(ucs . #x7B65) ; ç¥
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7B66) ; ç¦
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 7)
(total-strokes . 13)
(japanese-jisx0212 . #x522C) ; ø»‹¬™
- (chinese-cns11643-2 . #x456B) ; ø»”‚¢
(japanese-jisx0213-2 . #x734F) ; ø»¦–Š
(ideograph-daikanwa . 26057) ; ø¸†—‰
- (ucs . #x7B66) ; ç¦
+ (china3-jef . #x5DF9) ; øº…·¹
+ ))
+(define-char
+ '((morohashi-daikanwa 26057 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 7)
+ (total-strokes . 13)
+ (chinese-cns11643-2 . #x456B) ; ø»”‚¢
+ (ucs . #x7B66) ; ç¦
))
(define-char
'((ideographic-radical . 118) ; â½µ
(chinese-cns11643-2 . #x456F) ; ø»”‚¦
(japanese-jisx0213-2 . #x7350) ; ø»¦–‹
(ideograph-daikanwa . 26062) ; ø¸†—Ž
+ (china3-jef . #x5DFA) ; øº…·º
(ucs . #x7B69) ; ç©
))
(define-char
(japanese-jisx0212 . #x522E) ; ø»‹¬›
(chinese-cns11643-4 . #x3F5E) ; ø»˜©
(ideograph-daikanwa . 26064) ; ø¸†—
+ (china3-jef . #x5DFB) ; øº…·»
(ucs . #x7B6A) ; çª
))
(define-char
(chinese-cns11643-2 . #x456D) ; ø»”‚¤
(japanese-jisx0213-1 . #x7960) ; ø»¤•‹
(ideograph-daikanwa . 26069) ; ø¸†—•
+ (china3-jef . #x5DFC) ; øº…·¼
(ucs . #x7B6D) ; ç
))
(define-char
(chinese-cns11643-3 . #x4354) ; ø»–‰“
(japanese-jisx0213-1 . #x7961) ; ø»¤•Œ
(ideograph-daikanwa . 26071) ; ø¸†——
+ (china3-jef . #x5DFD) ; øº…·½
(ucs . #x7B6F) ; ç¯
))
(define-char
(chinese-gb2312 . #x3F6A) ; ø»„³‘
(japanese-jisx0212 . #x5233) ; ø»‹¬
(chinese-isoir165 . #x3F6A) ; ø»›¡
- (chinese-cns11643-1 . #x6566) ; ø»’§™
(ideograph-daikanwa . 26100) ; ø¸†—´
+ (china3-jef . #x80D7) ; øºˆƒ—
(ucs . #x7B77) ; ç·
))
(define-char
+ '((=>ucs . #x7B77) ; ç·
+ (morohashi-daikanwa 26100 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 7)
+ (total-strokes . 13)
+ (chinese-cns11643-1 . #x6566) ; ø»’§™
+ ))
+(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 7)
(total-strokes . 13)
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 7)
(total-strokes . 13)
+ (<-vulgar-ideograph
+ (:sources (jikai morohashi-daikanwa)
+ :char ((ideograph-daikanwa . 26243) ; ø¸†šƒ
+ )
+ ))
(shinjigen-2 . 5805)
(japanese-jisx0208-1978 . #x4061) ; ø»‚ª¢
(japanese-jisx0208 . #x4061) ; ø»†¾ª
(chinese-cns11643-2 . #x4C58) ; ø»”Œ¡
(japanese-jisx0213-2 . #x7355) ; ø»¦–
(ideograph-daikanwa . 26136) ; ø¸†˜˜
+ (china3-jef . #x5DFE) ; øº…·¾
(ucs . #x7B91) ; 箑
))
(define-char
(japanese-jisx0212 . #x5239) ; ø»‹¬¦
(chinese-cns11643-2 . #x4C5A) ; ø»”Œ£
(ideograph-daikanwa . 26145) ; ø¸†˜¡
+ (china3-jef . #x5EA1) ; øº…º¡
(ucs . #x7B96) ; ç®–
))
(define-char
(japanese-jisx0208 . #x6439) ; ø»‡²º
(chinese-cns11643-2 . #x4C62) ; ø»”Œ«
(japanese-jisx0208-1990 . #x6439) ; ø½‹˜®
+ (china3-jef . #x5EC6) ; øº…»†
(ucs . #x7B99) ; ç®™
))
(define-char
(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 8)
- (japanese-strokes . 9)
+ (total-strokes . 14)
+ (ideograph-daikanwa . 26150) ; ø¸†˜¦
+ (ucs . #x7B9B) ; ç®›
+ ))
+(define-char
+ '((=>ucs . #x7B9B) ; ç®›
+ (morohashi-daikanwa 26150 0 1)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 8)
(total-strokes . 14)
(japanese-jisx0212 . #x523A) ; ø»‹¬§
- (chinese-cns11643-2 . #x4C5D) ; ø»”Œ¦
(japanese-jisx0213-2 . #x7356) ; ø»¦–‘
- (ideograph-daikanwa . 26150) ; ø¸†˜¦
- (ucs . #x7B9B) ; ç®›
+ (china3-jef . #x5EA2) ; øº…º¢
+ ))
+(define-char
+ '((=>ucs . #x7B9B) ; ç®›
+ (morohashi-daikanwa 26150 0 2)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 8)
+ (total-strokes . 14)
+ (chinese-cns11643-2 . #x4C5D) ; ø»”Œ¦
))
(define-char
'((ideographic-radical . 118) ; â½µ
(ucs . #x7B9D) ; ç®
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7B9E) ; 箞
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 8)
(total-strokes . 14)
(japanese-jisx0212 . #x523B) ; ø»‹¬¨
- (chinese-cns11643-3 . #x4857) ; ø»–¬
(japanese-jisx0213-1 . #x7963) ; ø»¤•Ž
(ideograph-daikanwa . 26153) ; ø¸†˜©
- (ucs . #x7B9E) ; 箞
+ (china3-jef . #x5EA3) ; øº…º£
+ ))
+(define-char
+ '((morohashi-daikanwa 26153 0 2)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 8)
+ (total-strokes . 14)
+ (chinese-cns11643-3 . #x4857) ; ø»–¬
+ (ucs . #x7B9E) ; 箞
))
(define-char
'((ideographic-radical . 118) ; â½µ
(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 8)
- (total-strokes . 15)
+ (total-strokes . 14)
(japanese-jisx0212 . #x523C) ; ø»‹¬©
- (chinese-cns11643-1 . #x6E34) ; ø»’³µ
(ideograph-daikanwa . 26158) ; ø¸†˜®
+ (china3-jef . #x5EA4) ; øº…º¤
(ucs . #x7BA0) ; ç®
))
(define-char
+ '((=>ucs . #x7BA0) ; ç®
+ (morohashi-daikanwa 26158 0 1)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 9)
+ (total-strokes . 15)
+ (chinese-cns11643-1 . #x6E34) ; ø»’³µ
+ ))
+(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 8)
(total-strokes . 14)
(japanese-jisx0212 . #x523D) ; ø»‹¬ª
(chinese-cns11643-4 . #x4570) ; ø»˜–¯
(ideograph-daikanwa . 26189) ; ø¸†™
+ (china3-jef . #x5EA5) ; øº…º¥
(ucs . #x7BA5) ; 箥
))
(define-char
(total-strokes . 14)
(chinese-gb2312 . #x736C) ; ø»…¿«
(chinese-isoir165 . #x736C) ; ø»Ž§»
+ (china3-jef . #x5EC2) ; øº…»‚
(ucs . #x7BAA) ; 箪
))
(define-char
(korean-ksc5601 . #x6F29) ; ø»ŠŒ¸
(chinese-isoir165 . #x3C7D) ; ø»—š
(japanese-jisx0208-1990 . #x407D) ; ø½Š¤º
+ (china3-jef . #x5DEB) ; øº…·«
(ucs . #x7BAD) ; ç®
))
(define-char
(japanese-jisx0212 . #x5241) ; ø»‹¬®
(chinese-cns11643-3 . #x4D65) ; ø»–˜
(ideograph-daikanwa . 26212) ; ø¸†™¤
+ (china3-jef . #x5EA6) ; øº…º¦
(ucs . #x7BB2) ; 箲
))
(define-char
(chinese-isoir165 . #x7367) ; ø»Ž§¶
(chinese-cns11643-1 . #x6A2F) ; ø»’¸
(japanese-jisx0208-1990 . #x4824) ; ø½Š¯‘
+ (china3-jef . #x5EC3) ; øº…»ƒ
(ucs . #x7BB8) ; 箸
))
(define-char
(japanese-jisx0212 . #x5245) ; ø»‹¬²
(chinese-cns11643-4 . #x4C31) ; ø»˜ ‚
(ideograph-daikanwa . 26228) ; ø¸†™´
+ (china3-jef . #x5EA8) ; øº…º¨
(ucs . #x7BBB) ; ç®»
))
(define-char
(japanese-jisx0212 . #x5247) ; ø»‹¬´
(chinese-cns11643-4 . #x4C2A) ; ø»˜Ÿ»
(ideograph-daikanwa . 26231) ; ø¸†™·
+ (china3-jef . #x5EA9) ; øº…º©
(ucs . #x7BBD) ; 箽
))
(define-char
(ideographic-strokes . 9)
(total-strokes . 15)
(ideograph-daikanwa . 26243) ; ø¸†šƒ
+ (china3-jef . #x5EAA) ; øº…ºª
))
(define-char
'((ideographic-radical . 118) ; â½µ
(ucs . #x7BC6) ; 篆
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7BC7) ; 篇
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 9)
+ (total-strokes . 15)
+ (korean-ksc5601 . #x7839) ; ø»Šš–
+ (chinese-cns11643-1 . #x6E32) ; ø»’³³
+ (ideograph-daikanwa . 26257) ; ø¸†š‘
+ ))
+(define-char
+ '((=>ucs . #x7BC7) ; 篇
+ (morohashi-daikanwa 26257 0 1)
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 9)
(total-strokes . 15)
(japanese-jisx0208-1978 . #x4A53) ; ø»‚¹€
- (chinese-gb2312 . #x462A) ; ø»„¼£
(japanese-jisx0208 . #x4A53) ; ø»‡ˆ
- (korean-ksc5601 . #x7839) ; ø»Šš–
- (chinese-isoir165 . #x462A) ; ø»¤³
- (chinese-cns11643-1 . #x6E32) ; ø»’³³
(japanese-jisx0208-1990 . #x4A53) ; ø½Š²¼
- (ideograph-daikanwa . 26257) ; ø¸†š‘
- (ucs . #x7BC7) ; 篇
+ (china3-jef . #x5EC4) ; øº…»„
+ ))
+(define-char
+ '((morohashi-daikanwa 26257 0 2)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 9)
+ (total-strokes . 15)
+ (chinese-gb2312 . #x462A) ; ø»„¼£
+ (chinese-isoir165 . #x462A) ; ø»¤³
+ (ucs . #x7BC7) ; 篇
))
(define-char
'((ideographic-radical . 118) ; â½µ
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 9)
(total-strokes . 15)
+ (<-wrong-ideograph
+ (:sources (kangxi morohashi-daikanwa)
+ :char ((ideograph-daikanwa . 26564) ; ø¸†Ÿ„
+ )
+ ))
(chinese-cns11643-5 . #x4F36) ; ø»š®¥
(ideograph-daikanwa . 26295) ; ø¸†š·
+ (china3-jef . #x5EAC) ; øº…º¬
(ucs . #x4227) ; 䈧
))
(define-char
(chinese-cns11643-2 . #x592C) ; ø»”ž»
(japanese-jisx0213-2 . #x735F) ; ø»¦–š
(ideograph-daikanwa . 26299) ; ø¸†š»
+ (china3-jef . #x5EAD) ; øº…º
(ucs . #x7BD4) ; 篔
))
(define-char
(ideographic-radical . 118) ; â½µ
(ideographic-strokes . 10)
(total-strokes . 16)
+ (ideograph-daikanwa . 26308) ; ø¸†›„
+ ))
+(define-char
+ '((=>ucs . #x7BD7) ; 篗
+ (morohashi-daikanwa 26308 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 10)
+ (total-strokes . 16)
(japanese-jisx0212 . #x524E) ; ø»‹¬»
(japanese-jisx0213-1 . #x7965) ; ø»¤•
- (ideograph-daikanwa . 26308) ; ø¸†›„
+ (china3-jef . #x5EAE) ; øº…º®
))
(define-char
- '((morohashi-daikanwa 26308 0 1)
+ '((morohashi-daikanwa 26308 0 2)
(ideographic-radical . 118) ; â½µ
(ideographic-strokes . 10)
(total-strokes . 16)
(ucs . #x25C20) ; ð¥°
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7BD9) ; 篙
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 10)
(total-strokes . 16)
- (chinese-gb2312 . #x385D) ; ø»„¨²
(japanese-jisx0212 . #x524F) ; ø»‹¬¼
- (chinese-isoir165 . #x385D) ; ø»‘‚
- (chinese-cns11643-1 . #x715E) ; ø»’¸¹
(japanese-jisx0213-1 . #x7966) ; ø»¤•‘
(ideograph-daikanwa . 26313) ; ø¸†›‰
- (ucs . #x7BD9) ; 篙
+ (china3-jef . #x5EAF) ; øº…º¯
+ ))
+(define-char
+ '((morohashi-daikanwa 26313 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 10)
+ (total-strokes . 16)
+ (chinese-gb2312 . #x385D) ; ø»„¨²
+ (chinese-isoir165 . #x385D) ; ø»‘‚
+ (chinese-cns11643-1 . #x715E) ; ø»’¸¹
+ (ucs . #x7BD9) ; 篙
))
(define-char
'((=>ucs . #x7BDA) ; 篚
(chinese-cns11643-2 . #x5929) ; ø»”ž¸
(japanese-jisx0213-2 . #x7361) ; ø»¦–œ
(ideograph-daikanwa . 26314) ; ø¸†›Š
+ (china3-jef . #x5EB0) ; øº…º°
))
(define-char
'((morohashi-daikanwa 26314 0 0)
(japanese-jisx0212 . #x5252) ; ø»‹¬¿
(chinese-cns11643-2 . #x592A) ; ø»”ž¹
(ideograph-daikanwa . 26358) ; ø¸†›¶
+ (china3-jef . #x9BF3) ; øº‰¯³
(ucs . #x7BE8) ; 篨
))
(define-char
(ideographic-strokes . 10)
(total-strokes . 16)
(japanese-jisx0212 . #x5253) ; ø»‹€
- (chinese-cns11643-2 . #x592D) ; ø»”ž¼
(japanese-jisx0213-2 . #x7362) ; ø»¦–
(ideograph-daikanwa . 26360) ; ø¸†›¸
))
(define-char
+ '((=>ucs . #x7BEA) ; 篪
+ (morohashi-daikanwa 26360 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 10)
+ (total-strokes . 16)
+ (chinese-cns11643-2 . #x592D) ; ø»”ž¼
+ ))
+(define-char
'((morohashi-daikanwa 26360 0 2)
(ideographic-radical . 118) ; â½µ
(ideographic-strokes . 10)
(total-strokes . 16)
(chinese-gb2312 . #x7378) ; ø»…¿·
(chinese-isoir165 . #x7378) ; ø»Ž¨‡
+ (china3-jef . #x5EB2) ; øº…º²
(ucs . #x7BEA) ; 篪
))
(define-char
(chinese-isoir165 . #x737A) ; ø»Ž¨‰
(chinese-cns11643-1 . #x7458) ; ø»’½
(ideograph-daikanwa . 26416) ; ø¸†œ°
+ (china3-jef . #x5EB3) ; øº…º³
(ucs . #x7BFE) ; 篾
))
(define-char
(chinese-cns11643-2 . #x5E33) ; ø»”¦˜
(japanese-jisx0213-2 . #x7364) ; ø»¦–Ÿ
(ideograph-daikanwa . 26428) ; ø¸†œ¼
+ (china3-jef . #x92CC) ; øº‰‹Œ
(ucs . #x7C03) ; ç°ƒ
))
(define-char
(total-strokes . 17)
(japanese-jisx0212 . #x5261) ; ø»‹Ž
(ideograph-daikanwa . 26444) ; ø¸†Œ
+ (china3-jef . #x5EB4) ; øº…º´
))
(define-char
'((=>ucs . #x7C09) ; ç°‰
(ucs . #x7C0E) ; ç°Ž
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7C0F) ; ç°
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 11)
(total-strokes . 17)
- (chinese-gb2312 . #x737C) ; ø»…¿»
(japanese-jisx0212 . #x5265) ; ø»‹’
- (chinese-isoir165 . #x737C) ; ø»Ž¨‹
- (chinese-cns11643-2 . #x5E28) ; ø»”¦
(japanese-jisx0213-2 . #x7367) ; ø»¦–¢
(ideograph-daikanwa . 26458) ; ø¸†š
- (ucs . #x7C0F) ; ç°
+ (china3-jef . #x5EB5) ; øº…ºµ
+ ))
+(define-char
+ '((morohashi-daikanwa 26458 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 11)
+ (total-strokes . 17)
+ (chinese-gb2312 . #x737C) ; ø»…¿»
+ (chinese-isoir165 . #x737C) ; ø»Ž¨‹
+ (ucs . #x7C0F) ; ç°
+ ))
+(define-char
+ '((=>ucs . #x7C0F) ; ç°
+ (morohashi-daikanwa 26458 0 1)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 11)
+ (total-strokes . 17)
+ (chinese-cns11643-2 . #x5E28) ; ø»”¦
))
(define-char
'((ideographic-radical . 118) ; â½µ
(japanese-jisx0212 . #x5267) ; ø»‹”
(chinese-cns11643-3 . #x584E) ; ø»–¨ƒ
(ideograph-daikanwa . 26500) ; ø¸†ž„
+ (china3-jef . #x5EB6) ; øº…º¶
(ucs . #x7C1B) ; ç°›
))
(define-char
(japanese-jisx0212 . #x5269) ; ø»‹–
(chinese-cns11643-2 . #x6257) ; ø»”¬´
(ideograph-daikanwa . 26528) ; ø¸†ž
+ (china3-jef . #x5EB7) ; øº…º·
(ucs . #x7C25) ; ç°¥
))
(define-char
(ideographic-strokes . 12)
(total-strokes . 18)
(japanese-jisx0212 . #x526B) ; ø»‹˜
- (chinese-cns11643-2 . #x6255) ; ø»”¬²
(ideograph-daikanwa . 26554) ; ø¸†žº
+ (china3-jef . #x98ED) ; øº‰£
(ucs . #x7C28) ; ç°¨
))
(define-char
+ '((=>ucs . #x7C28) ; ç°¨
+ (morohashi-daikanwa 26554 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 12)
+ (total-strokes . 18)
+ (chinese-cns11643-2 . #x6255) ; ø»”¬²
+ ))
+(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 12)
(total-strokes . 18)
(ideographic-strokes . 13)
(total-strokes . 19)
(ideograph-daikanwa . 26598) ; ø¸†Ÿ¦
+ (china3-jef . #x5EB9) ; øº…º¹
))
(define-char
'((morohashi-daikanwa 26598 0 1)
(ideograph-daikanwa . 26616) ; ø¸†Ÿ¸
))
(define-char
- '((morohashi-daikanwa 26616 0 2)
+ '((=>ucs . #x7C3E) ; ç°¾
+ (morohashi-daikanwa 26616 0 2)
(ideographic-radical . 118) ; â½µ
(ideographic-strokes . 13)
(total-strokes . 19)
(japanese-jisx0208-1978 . #x4E7C) ; ø»‚¿¡
(japanese-jisx0208 . #x4E7C) ; ø»‡“©
(korean-ksc5601 . #x5633) ; ø»‰¨”
- (chinese-cns11643-1 . #x7859) ; ø»“ƒ†
(japanese-jisx0208-1990 . #x4E7C) ; ø½Š¹
- (chinese-gb12345 . #x4131) ; ç°¾
- (ucs . #x7C3E) ; ç°¾
+ (china3-jef . #x5EC5) ; øº…»…
+ ))
+(define-char
+ '((morohashi-daikanwa 26616 0 3)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 13)
+ (total-strokes . 19)
+ (chinese-cns11643-1 . #x7859) ; ø»“ƒ†
+ (chinese-gb12345 . #x4131) ; ç°¾
+ (ucs . #x7C3E) ; ç°¾
))
(define-char
'((ideographic-radical . 118) ; â½µ
(define-char
'((ideographic-radical . 118) ; â½µ
(ideographic-strokes . 13)
+ (total-strokes . 19)
(japanese-jisx0213-1 . #x796D) ; ø»¤•˜
(ideograph-daikanwa . 26647) ; ø¸† —
+ (china3-jef . #x5EBA) ; øº…ºº
(ucs . #x4264) ; 䉤
))
(define-char
(korean-ksc5601 . #x6E5F) ; ø»ŠŒ
(chinese-cns11643-1 . #x7A26) ; ø»“…
(ideograph-daikanwa . 26676) ; ø¸† ´
+ (china3-jef . #x5EBC) ; øº…º¼
))
(define-char
'((morohashi-daikanwa 26676 0 2)
(ucs . #x7C58) ; 籘
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7C59) ; ç±™
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 16)
(total-strokes . 22)
(japanese-jisx0212 . #x5279) ; ø»‹¦
(chinese-cns11643-2 . #x6D6A) ; ø»”½‘
(japanese-jisx0213-1 . #x796F) ; ø»¤•š
(ideograph-daikanwa . 26734) ; ø¸†¡®
- (ucs . #x7C59) ; ç±™
+ (china3-jef . #x98EE) ; øº‰£®
+ ))
+(define-char
+ '((morohashi-daikanwa 26734 0 5)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 16)
+ (total-strokes . 22)
+ (ucs . #x7C59) ; ç±™
))
(define-char
'((=>ucs . #x25DB9) ; 𥶹
(ucs . #x7C5B) ; ç±›
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7C5C) ; 籜
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 16)
(total-strokes . 22)
(japanese-jisx0212 . #x527C) ; ø»‹©
+ (ideograph-daikanwa . 26742) ; ø¸†¡¶
+ ))
+(define-char
+ '((morohashi-daikanwa 26742 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 16)
+ (total-strokes . 22)
(chinese-cns11643-2 . #x6D69) ; ø»”½
(chinese-gb12345 . #x736A) ; 籜
- (ideograph-daikanwa . 26742) ; ø¸†¡¶
+ (china3-jef . #x5EBD) ; øº…º½
(ucs . #x7C5C) ; 籜
))
(define-char
(japanese-jisx0212 . #x5322) ; ø»‹
(chinese-cns11643-1 . #x7C3F) ; ø»“ˆ¤
(ideograph-daikanwa . 26768) ; ø¸†¢
+ (china3-jef . #x5EBE) ; øº…º¾
(ucs . #x7C63) ; ç±£
))
(define-char
(ucs . #x7C6C) ; 籬
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7C6D) ; ç±
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 19)
(total-strokes . 25)
(japanese-jisx0212 . #x5325) ; ø»‹°
- (chinese-cns11643-3 . #x6144) ; ø»–µ‡
(japanese-jisx0213-1 . #x7970) ; ø»¤•›
(ideograph-daikanwa . 26804) ; ø¸†¢´
- (ucs . #x7C6D) ; ç±
+ (china3-jef . #x5EBF) ; øº…º¿
+ ))
+(define-char
+ '((morohashi-daikanwa 26804 0 0)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 19)
+ (total-strokes . 25)
+ (ucs . #x7C6D) ; ç±
+ ))
+(define-char
+ '((=>ucs . #x7C6D) ; ç±
+ (morohashi-daikanwa 26804 0 1)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 19)
+ (total-strokes . 25)
+ (chinese-cns11643-3 . #x6144) ; ø»–µ‡
))
(define-char
'((=>ucs . #x7C6E) ; ç±®
(japanese-jisx0212 . #x5326) ; ø»‹±
(japanese-jisx0213-2 . #x7370) ; ø»¦–«
(ideograph-daikanwa . 26805) ; ø¸†¢µ
+ (china3-jef . #x8CD0) ; øºˆ³
))
(define-char
'((morohashi-daikanwa 26805 0 1)
(ucs . #x25E08) ; 𥸈
))
(define-char
- '((ideographic-radical . 118) ; â½µ
+ '((=>ucs . #x7C70) ; ç±°
+ (ideographic-radical . 118) ; â½µ
(ideographic-strokes . 20)
(total-strokes . 26)
(japanese-jisx0212 . #x5327) ; ø»‹²
- (chinese-cns11643-4 . #x6D5B) ; ø»™‘Š
(japanese-jisx0213-2 . #x7372) ; ø»¦–
(ideograph-daikanwa . 26815) ; ø¸†¢¿
- (ucs . #x7C70) ; ç±°
+ (china3-jef . #x5EC0) ; øº…»€
+ ))
+(define-char
+ '((morohashi-daikanwa 26815 0 1)
+ (ideographic-radical . 118) ; â½µ
+ (ideographic-strokes . 20)
+ (total-strokes . 26)
+ (chinese-cns11643-4 . #x6D5B) ; ø»™‘Š
+ (ucs . #x7C70) ; ç±°
))
(define-char
'((ideographic-radical . 118) ; â½µ
(chinese-isoir165 . #x744C) ; ø»Ž¨¹
(chinese-cns11643-3 . #x2E53) ; ø»•ªœ
(ideograph-daikanwa . 26849) ; ø¸†£¡
+ (china3-jef . #x5EC8) ; øº…»ˆ
(ucs . #x7C7C) ; ç±¼
))
(define-char
(total-strokes . 9)
(japanese-jisx0208 . #x4C62) ; ø»‡“
(japanese-jisx0208-1990 . #x4C62) ; ø½Š¶‡
+ (china3-jef . #x5EDD) ; øº…»
(ucs-jis . #x7C7E) ; ø»‡“
))
(define-char
(ucs . #x7C85) ; ç²…
))
(define-char
- '((ideographic-radical . 119) ; ⽶
+ '((=>ucs . #x7C86) ; 粆
+ (ideographic-radical . 119) ; ⽶
(ideographic-strokes . 4)
(total-strokes . 10)
(japanese-jisx0212 . #x532C) ; ø»‹·
- (chinese-cns11643-3 . #x332E) ; ø»•±
(ideograph-daikanwa . 26868) ; ø¸†£´
+ (china3-jef . #x5ECA) ; øº…»Š
+ ))
+(define-char
+ '((morohashi-daikanwa 26868 0 0)
+ (ideographic-radical . 119) ; ⽶
+ (ideographic-strokes . 4)
+ (total-strokes . 10)
+ (chinese-cns11643-3 . #x332E) ; ø»•±
(ucs . #x7C86) ; 粆
))
(define-char
(total-strokes . 10)
(japanese-jisx0208 . #x6464) ; ø»‡³¥
(japanese-jisx0208-1990 . #x6464) ; ø½‹™™
+ (china3-jef . #x5EDE) ; øº…»ž
(ucs-jis . #x7C90) ; ø»‡³¥
))
(define-char
(total-strokes . 11)
(chinese-cns11643-3 . #x377E) ; ø»•¸•
(ideograph-daikanwa . 26905) ; ø¸†¤™
+ (china3-jef . #x5ECD) ; øº…»
(ucs . #x7C99) ; ç²™
))
(define-char
(chinese-cns11643-3 . #x3E21) ; ø»–Š
(japanese-jisx0213-1 . #x7974) ; ø»¤•Ÿ
(ideograph-daikanwa . 26924) ; ø¸†¤¬
+ (china3-jef . #x5ECE) ; øº…»Ž
(ucs . #x7CA0) ; ç²
))
(define-char
(total-strokes . 12)
(chinese-cns11643-3 . #x3D7C) ; ø»–‡
(ideograph-daikanwa . 26931) ; ø¸†¤³
+ (china3-jef . #x5ECF) ; øº…»
(ucs . #x4285) ; 䊅
))
(define-char
(total-strokes . 12)
(japanese-jisx0212 . #x5332) ; ø»‹½
(japanese-jisx0213-2 . #x7376) ; ø»¦–±
+ (china3-jef . #x5EC7) ; øº…»‡
))
(define-char
'((ideographic-radical . 119) ; ⽶
(ucs . #x7CB5) ; ç²µ
))
(define-char
- '((ideographic-radical . 119) ; ⽶
+ '((=>ucs . #x25E9E) ; 𥺞
+ (ideographic-radical . 119) ; ⽶
(ideographic-strokes . 7)
(total-strokes . 13)
(chinese-cns11643-6 . #x563C) ; ø»ƒ
- (ucs . #x25E9E) ; 𥺞
))
(define-char
- '((ideographic-radical . 119) ; ⽶
+ '((=>ucs . #x7CB6) ; 粶
+ (ideographic-radical . 119) ; ⽶
(ideographic-strokes . 8)
(total-strokes . 14)
(japanese-jisx0212 . #x5334) ; ø»‹¿
(chinese-cns11643-4 . #x4574) ; ø»˜–³
(ideograph-daikanwa . 26979) ; ø¸†¥£
+ (china3-jef . #x5ED0) ; øº…»
+ ))
+(define-char
+ '((morohashi-daikanwa 26979 0 5)
+ (ideographic-radical . 119) ; ⽶
+ (ideographic-strokes . 8)
+ (total-strokes . 14)
(ucs . #x7CB6) ; 粶
))
(define-char
(chinese-cns11643-3 . #x4862) ; ø»–·
(japanese-jisx0213-2 . #x7379) ; ø»¦–´
(ideograph-daikanwa . 26980) ; ø¸†¥¤
+ (china3-jef . #x5ED1) ; øº…»‘
(ucs . #x7CB7) ; ç²·
))
(define-char
(japanese-jisx0212 . #x5336) ; ø»‹®
(chinese-cns11643-2 . #x4C68) ; ø»”Œ±
(ideograph-daikanwa . 26988) ; ø¸†¥¬
+ (china3-jef . #x5ED2) ; øº…»’
(ucs . #x7CBA) ; 粺
))
(define-char
(total-strokes . 14)
(korean-ksc5601 . #x6F71) ; ø»ŠŽ€
(ideograph-daikanwa . 26997) ; ø¸†¥µ
+ (china3-jef . #x5ED3) ; øº…»“
))
(define-char
'((morohashi-daikanwa 26997 1)
(chinese-cns11643-2 . #x4C66) ; ø»”Œ¯
(japanese-jisx0213-2 . #x737A) ; ø»¦–µ
(ideograph-daikanwa . 26998) ; ø¸†¥¶
+ (china3-jef . #x5ED4) ; øº…»”
(ucs . #x7CBF) ; 粿
))
(define-char
(define-char
'((ideographic-radical . 119) ; ⽶
(ideographic-strokes . 8)
+ (total-strokes . 14)
(chinese-gb2312 . #x7456) ; ø»†€³
(chinese-isoir165 . #x7456) ; ø»Ž©ƒ
(ucs . #x7CC1) ; ç³
))
(define-char
'((ideographic-radical . 119) ; ⽶
+ (ideographic-strokes . 8)
+ (total-strokes . 14)
+ (ucs . #x25E9E) ; 𥺞
+ ))
+(define-char
+ '((ideographic-radical . 119) ; ⽶
(ideographic-strokes . 9)
(total-strokes . 15)
(japanese-jisx0208-1978 . #x6473) ; ø»ƒŸ¬
'((ideographic-radical . 119) ; ⽶
(ideographic-strokes . 9)
(total-strokes . 15)
- (chinese-cns11643-4 . #x4C37) ; ø»˜ ˆ
(ideograph-daikanwa . 27024) ; ø¸†¦
+ (china3-jef . #x5ED5) ; øº…»•
(ucs . #x4297) ; 䊗
))
(define-char
+ '((=>ucs . #x4297) ; 䊗
+ (morohashi-daikanwa 27024 0 0)
+ (ideographic-radical . 119) ; ⽶
+ (ideographic-strokes . 9)
+ (total-strokes . 15)
+ (chinese-cns11643-4 . #x4C37) ; ø»˜ ˆ
+ ))
+(define-char
'((ideographic-radical . 119) ; ⽶
(ideographic-strokes . 9)
(total-strokes . 15)
(chinese-gb2312 . #x745A) ; ø»†€·
(japanese-jisx0212 . #x533C) ; ø»‹®‡
(chinese-isoir165 . #x745A) ; ø»Ž©‡
- (chinese-cns11643-2 . #x5268) ; ø»”•¥
(japanese-jisx0213-2 . #x737E) ; ø»¦–¹
(ideograph-daikanwa . 27035) ; ø¸†¦›
+ (china3-jef . #x98CC) ; øº‰£Œ
(ucs . #x7CC8) ; 糈
))
(define-char
+ '((=>ucs . #x7CC8) ; 糈
+ (morohashi-daikanwa 27035 0 0)
+ (ideographic-radical . 119) ; ⽶
+ (ideographic-strokes . 9)
+ (total-strokes . 15)
+ (chinese-cns11643-2 . #x5268) ; ø»”•¥
+ ))
+(define-char
'((ideographic-radical . 119) ; ⽶
(ideographic-strokes . 9)
(total-strokes . 15)
(chinese-cns11643-3 . #x4D6E) ; ø»–˜™
(japanese-jisx0213-2 . #x7421) ; ø»¦–º
(ideograph-daikanwa . 27056) ; ø¸†¦°
+ (china3-jef . #x8CF5) ; øºˆ³µ
(ucs . #x7CCD) ; ç³
))
(define-char
(chinese-cns11643-1 . #x7166) ; ø»’¹
(japanese-jisx0213-1 . #x7976) ; ø»¤•¡
(ideograph-daikanwa . 27069) ; ø¸†¦½
+ (china3-jef . #x5ED6) ; øº…»–
(ucs . #x7CD5) ; 糕
))
(define-char
- '((ideographic-radical . 119) ; ⽶
+ '((=>ucs . #x7CD6) ; ç³–
+ (ideographic-radical . 119) ; ⽶
+ (ideographic-strokes . 10)
+ (total-strokes . 16)
+ (korean-ksc5601 . #x5358) ; ø»‰¤Ÿ
+ (ideograph-daikanwa . 27070) ; ø¸†¦¾
+ ))
+(define-char
+ '((morohashi-daikanwa 27070 0 0)
+ (ideographic-radical . 119) ; ⽶
+ (ideographic-strokes . 10)
+ (total-strokes . 16)
+ (chinese-gb2312 . #x4C47) ; ø»……´
+ (chinese-isoir165 . #x4C47) ; ø»®„
+ (chinese-cns11643-1 . #x7167) ; ø»’¹‚
+ (china3-jef . #x5ED7) ; øº…»—
+ (ucs . #x7CD6) ; ç³–
+ ))
+(define-char
+ '((=>ucs . #x7CD6) ; ç³–
+ (morohashi-daikanwa 27070 0 2)
+ (ideographic-radical . 119) ; ⽶
(ideographic-strokes . 10)
(total-strokes . 16)
(japanese-jisx0208-1978 . #x457C) ; ø»‚²“
- (chinese-gb2312 . #x4C47) ; ø»……´
(japanese-jisx0208 . #x457C) ; ø»‡†›
- (korean-ksc5601 . #x5358) ; ø»‰¤Ÿ
- (chinese-isoir165 . #x4C47) ; ø»®„
- (chinese-cns11643-1 . #x7167) ; ø»’¹‚
(japanese-jisx0208-1990 . #x457C) ; ø½Š¬
- (ideograph-daikanwa . 27070) ; ø¸†¦¾
- (ucs . #x7CD6) ; ç³–
))
(define-char
'((ideographic-radical . 119) ; ⽶
(total-strokes . 17)
(japanese-jisx0212 . #x5344) ; ø»‹®
(ideograph-daikanwa . 27087) ; ø¸†§
+ (china3-jef . #x5ED8) ; øº…»˜
))
(define-char
'((=>ucs . #x7CD9) ; ç³™
(total-strokes . 17)
(chinese-cns11643-1 . #x7462) ; ø»’½—
(chinese-gb12345 . #x7456) ; ç³
+ (china3-jef . #x5ED9) ; øº…»™
(ucs . #x7CDD) ; ç³
))
(define-char
(chinese-cns11643-3 . #x5854) ; ø»–¨‰
(japanese-jisx0213-2 . #x7425) ; ø»¦–¾
(ideograph-daikanwa . 27131) ; ø¸†§»
+ (china3-jef . #x5EDA) ; øº…»š
(ucs . #x7CE6) ; 糦
))
(define-char
(chinese-cns11643-5 . #x706E) ; ø»›Ÿ»
))
(define-char
- '((ideographic-radical . 119) ; ⽶
+ '((=>ucs . #x42AF) ; 䊯
+ (ideographic-radical . 119) ; ⽶
(ideographic-strokes . 15)
(total-strokes . 21)
(ideograph-daikanwa . 27180) ; ø¸†¨¬
- (ucs . #x42AF) ; 䊯
+ (china3-jef . #x5EDC) ; øº…»œ
))
(define-char
'((=>ucs . #x42AF) ; 䊯
- (morohashi-daikanwa 27180 0 2)
+ (morohashi-daikanwa 27180 0 1)
(ideographic-radical . 119) ; ⽶
(ideographic-strokes . 15)
(total-strokes . 21)
(chinese-cns11643-7 . #x543A) ; ø»ŸŠ‡
))
(define-char
+ '((morohashi-daikanwa 27180 0 3)
+ (ideographic-radical . 119) ; ⽶
+ (ideographic-strokes . 14)
+ (total-strokes . 20)
+ (ucs . #x42AF) ; 䊯
+ ))
+(define-char
'((=>ucs . #x7CF2) ; ç³²
(ideographic-radical . 119) ; ⽶
(ideographic-strokes . 15)
inkaiho \e$B1$2qJd\e(B
jii \e$B;zWC\e(B
jiiho \e$B;zWCJd\e(B
+ jikai \e$B<-3$\e(B
jiyun (shuuin) \e$B=81$\e(B
kaihen \e$B3$JS\e(B
kangxi \e$B9/_f;zE5\e(B
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
2001-10-23 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.4.5 "Civil Service" is released.
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+man/ChangeLog
+2001-12-15 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * lispref/packaging.texi (The User's View):
+ Correct description of man subdirectory.
+
+ (The Package Release Engineer's View):
+ (package-compile.el):
+ Change hazmat to useful documentation.
+
+ (Issues):
+ Hazmat removal.
+
+2001-11-27 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * lispref/packaging.texi: New file.
+ * lispref/lispref.texi (Top): Add Packaging & subnodes to menus.
+ Include packaging.texi.
+ * lispref/intro.texi (Introduction): Next -> Packaging.
+ * lispref/objects.texi (Lisp Data Types): Previous -> Packaging.
+ * Makefile (lispref-srcs): Depend on lispref/packaging.texi.
+
2001-10-23 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.4.5 "Civil Service" is released.
lispref/numbers.texi \
lispref/objects.texi \
lispref/os.texi \
+ lispref/packaging.texi \
lispref/positions.texi \
lispref/processes.texi \
lispref/range-tables.texi \
* Redisplay Glyphs:: Glyphs controlling various redisplay functions.
* Subwindows:: Inserting an externally-controlled subwindow
into a buffer.
+* Glyph Examples:: Examples of how to work with glyphs.
@end menu
@node Glyph Functions
@defun subwindowp object
This function returns non-@code{nil} if @var{object} is a subwindow.
@end defun
+
+@node Glyph Examples
+@section Glyph Examples
+
+For many applications, displaying graphics is a simple process: you
+create a glyph, and then you insert it into a buffer.
+
+The easiest way to create a glyph is to use a file that contains a
+graphical image, such as a JPEG, TIFF, or PNG file:
+
+@lisp
+;; Create a glyph from a JPEG file:
+(setq foo (make-glyph [jpeg :file "/tmp/file1.jpg"]))
+@end lisp
+
+@lisp
+;; Create a glyph from a XPM file:
+(setq foo (make-glyph [xpm :file "/tmp/file2.xpm"]))
+@end lisp
+
+@lisp
+;; Create a glyph from a PNG file:
+(setq foo (make-glyph [png :file "/tmp/file3.png"]))
+@end lisp
+
+@lisp
+;; Create a glyph from a TIFF file:
+(setq foo (make-glyph [tiff :file "/tmp/file4.tiff"]))
+@end lisp
+
+The parameters passed to @code{make-glyph} are called "Image
+Specifiers", and can handle more image types than those shown above.
+You can also put the raw image data into a string (e.g., if you put the
+contents of a JPEG file into a string), and use that to create a glyph.
+@xref{Image Specifiers}, for more information.
+
+@quotation
+@strong{Caution}: In order for XEmacs to read a particular graphics file
+format, support for that format must have been compiled into XEmacs.
+It's possible, although somewhat unlikely, for XEmacs to have been
+compiled without support for any of the various graphics file formats.
+To see what graphics formats your particular version of XEmacs supports,
+use @kbd{M-x describe-installation}.
+
+To programmatically query whether or not a particular file format is
+supported, you can use the @code{featurep} function, with one of:
+@code{gif}, @code{tiff}, @code{jpeg}, @code{xpm}, @code{xbm},
+@code{png}, or @code{xface}. For an up-to-date list, @ref{Image
+Specifiers}. Example:
+
+@example
+;; Returns `t' if TIFF is supported:
+(featurep 'tiff)
+@end example
+
+Another example is:
+
+@example
+;; Returns a list of `t' or `nil', depending on whether or not the
+;; corresponding feature is supported:
+(mapcar #'(lambda (format-symbol) (featurep format-symbol))
+ '(gif tiff jpeg xpm png))
+@end example
+
+@end quotation
+
+Once you have a glyph, you can then insert it into a buffer. Example:
+
+@lisp
+;; Use this function to insert a glyph at the left edge of point in the
+;; current buffer. Any existing glyph at this location is replaced.
+(defun insert-glyph (gl)
+ "Insert a glyph at the left edge of point."
+ (let ( (prop 'myimage) ;; myimage is an arbitrary name, chosen
+ ;; to (hopefully) not conflict with any
+ ;; other properties. Change it if
+ ;; necessary.
+ extent )
+ ;; First, check to see if one of our extents already exists at
+ ;; point. For ease-of-programming, we are creating and using our
+ ;; own extents (multiple extents are allowed to exist/overlap at the
+ ;; same point, and it's quite possible for other applications to
+ ;; embed extents in the current buffer without your knowledge).
+ ;; Basically, if an extent, with the property stored in "prop",
+ ;; exists at point, we assume that it is one of ours, and we re-use
+ ;; it (this is why it is important for the property stored in "prop"
+ ;; to be unique, and only used by us).
+ (if (not (setq extent (extent-at (point) (current-buffer) prop)))
+ (progn
+ ;; If an extent does not already exist, create a zero-length
+ ;; extent, and give it our special property.
+ (setq extent (make-extent (point) (point) (current-buffer)))
+ (set-extent-property extent prop t)
+ ))
+ ;; Display the glyph by storing it as the extent's "begin-glyph".
+ (set-extent-property extent 'begin-glyph gl)
+ ))
+
+;; You can then use this function like:
+(insert-glyph (make-glyph [jpeg :file "/tmp/file1.jpg"]))
+;; This will insert the glyph at point.
+
+;; Here's an example of how to insert two glyphs side-by-side, at point
+;; (using the above code):
+(progn
+ (insert-glyph (make-glyph [jpeg :file "/tmp/file1.jpg"]))
+ ;; Create a new extent at point. We can't simply call "insert-glyph",
+ ;; as "insert-glyph" will simply replace the first glyph with the
+ ;; second.
+ (setq extent (make-extent (point) (point) (current-buffer)))
+ ;; Here, we're only setting the 'myimage property in case we need
+ ;; to later identify/locate/reuse this particular extent.
+ (set-extent-property extent 'myimage t)
+ (set-extent-property extent 'begin-glyph
+ (make-glyph [jpeg :file "/tmp/file2.jpg"]))
+ )
+
+@end lisp
+
+Here are the gory details:
+
+@itemize @bullet
+
+@item
+Glyphs are displayed by attaching them to extents (see @ref{Extents}),
+either to the beginning or the end of extents.
+
+Note that extents can be used for many things, and not just for
+displaying images (although, in the above example, we are creating our
+own extent for the sole purpose of displaying an image). Also, note
+that multiple extents are allowed to exist at the same position, and
+they can overlap.
+
+@item
+Glyphs are often displayed inside the text area (alongside text). This
+is the default.
+
+Although glyphs can also be displayed in the margins, how to do this
+will not be described here. For more information on this, see
+@ref{Annotation Basics} (look for information on "layout types") and
+@ref{Extent Properties} (look for @code{begin-glyph-layout} and
+@code{end-glyph-layout}).
+
+@item
+The easiest way to insert a glyph into text is to create a zero-length
+extent at the point where you want the glyph to appear.
+
+Note that zero-length extents are attached to the character to the
+right of the extent; deleting this character will also delete the extent.
+
+@item
+It's often a good idea to assign a unique property to the newly-created
+extent, in case you later want to locate it, and replace any existing
+glyph with a different one (or just delete the existing one). In the
+above example, we are using "myimage" as our (hopefully) unique property
+name.
+
+If you need to locate all of the extents, you'll have to use functions
+like @code{extent-list} or @code{next-extent}, or provide additional
+parameters to the @code{extent-at} function. Assigning a unique
+property to the extent makes it easy to locate your extents; for
+example, @code{extent-list} can return only those extents with a
+particular property. @xref{Finding Extents}, and @ref{Mapping Over
+Extents}, for more information.
+
+@item
+Glyphs are displayed by assigning then to the @code{begin-glyph} or
+@code{end-glyph} property of the extent. For zero-length extents, it
+doesn't really matter if you assign the glyph to the @code{begin-glyph}
+or @code{end-glyph} property, as they are both at the same location;
+however, for non-zero-length extents (extents that cover one or more
+characters of text), it does matter which one you use.
+
+Assigning @code{nil} to the @code{begin-glyph} or @code{end-glyph}
+property will delete any existing glyph. In this case, you may also
+want to delete the extent, assuming that the extent is used for no other
+purpose.
+
+@item
+If you happen to insert two glyphs, side-by-side, note that the example
+@code{insert-glyph} function will have trouble, if it's again used at
+the same point (it can only locate one of the two extents).
+@xref{Finding Extents}, and @ref{Mapping Over Extents}, for more
+information on locating extents in a buffer.
+
+@item
+Among other things, glyphs provide a way of displaying graphics
+alongside text. Note, however, that glyphs only provide a way of
+displaying graphics; glyphs are not actually part of the text, and are
+only displayed alongside the text. If you save the text in the buffer,
+the graphics are not saved. The low-level glyph code does not provide a
+way of saving graphics with the text. If you need to save graphics and
+text, you have to write your own code to do this, and this topic is
+outside the scope of this discussion.
+
+@end itemize
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
-@node Introduction, Lisp Data Types, Copying, Top
+@node Introduction, Packaging, Copying, Top
@chapter Introduction
Most of the XEmacs text editor is written in the programming
* Copying:: Conditions for copying and changing XEmacs.
* Introduction:: Introduction and conventions used.
+* Packaging:: Lisp library administrative infrastructure.
+
* Lisp Data Types:: Data types of objects in XEmacs Lisp.
* Numbers:: Numbers and arithmetic functions.
* Strings and Characters:: Strings, and functions that work on them.
* A Sample Function Description::
* A Sample Variable Description::
+Packaging
+
+* Package Overview:: Lisp Libraries and Packages.
+* Package Terminology:: Basic stuff.
+* Building Packages:: Turn packaged source into a tarball.
+* Local.rules File:: Tell the XEmacs Packaging System about your host.
+* Creating Packages:: Tell the XEmacs Packaging System about your package.
+* Issues::
+
+Package Overview
+
+* The User's View::
+* The Library Maintainer's View::
+* The Package Release Engineer's View::
+
+The Library Maintainer's View
+
+* Infrastructure:: Global Makefiles and common rules.
+* Control Files:: Package-specific Makefiles and administrative files.
+* Obtaining:: Obtaining the XEmacs Packaging System and utilities.
+
+Creating Packages
+
+* package-compile.el::
+* package-info.in Fields::
+* Makefile Variables::
+* Makefile Targets::
+
Lisp Data Types
* Printed Representation:: How Lisp objects are represented as text.
* Redisplay Glyphs:: Glyphs controlling various redisplay functions.
* Subwindows:: Inserting an externally-controlled subwindow
into a buffer.
+* Glyph Examples:: Examples of how to work with glyphs.
Glyph Functions
@end menu
@include intro.texi
+@include packaging.texi
@include objects.texi
@include numbers.texi
@include strings.texi
@c Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
@c See the file lispref.texi for copying conditions.
@setfilename ../../info/objects.info
-@node Lisp Data Types, Numbers, Introduction, Top
+@node Lisp Data Types, Numbers, Packaging, Top
@chapter Lisp Data Types
@cindex object
@cindex Lisp object
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-10-27 Andy Piper <andy@xemacs.org>
+
+ * localdir.cc (dialog_cmd): allow download directory to be
+ created.
+ * log.cc (exit_setup): cygwin -> XEmacs
+ * net.cc (dialog_cmd):
+ (dialog_proc):
+ (do_net): sync with cygwin installer.
+ * res.rc:
+ * resource.h (IDS_CREATE_DIR): new.
+ * source.cc (load_dialog):
+ (save_dialog):
+ (dialog_cmd):
+ (dialog_proc):
+ (do_source): sync with cygwin installer.
+ * uninstall.cc (progress): remove log message.
+ * Makefile.in.in: generated setup-bin.ini correctly.
+
+2001-10-25 Andy Piper <andy@xemacs.org>
+
+ * Merge 21.5 codeline.
+
+2001-10-25 Andy Piper <andy@xemacs.org>
+
+ * setup.mak (OBJS): minor build fixes.
+ (distclean):
+
2001-10-23 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.4.5 "Civil Service" is released.
* all: port from cygwin setup.
-%%% $Id: ChangeLog,v 1.2.2.10 2001/07/28 11:45:44 stephent Exp $
-$Revision: 1.2.2.10 $
+%%% $Id: ChangeLog,v 1.2.2.13 2001/12/17 08:45:59 stephent Exp $
+$Revision: 1.2.2.13 $
PROGS = setup.exe
XEMACS=${blddir}/src/${PROGNAME}
+CYGWIN_SIZE=0
+WIN32_SIZE=0
+
CONFIG_H = ../src/config.h
OBJS = \
ini.o \
inilex.o \
iniparse.o \
+ init.o \
install.o \
localdir.o \
log.o \
splash.o \
state.o \
tar.o \
+ uninstall.o \
version.o
.SUFFIXES:
-L$(MINGW_ZLIB_DIR) -lz -lmingw32
@chmod a-x $@
-setup-bin.ini: setup.exe
+setup-bin.ini:
V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \
- | sed -e 's/\$$Revision:* *//' \
- -e 's/ *$$.*//'` ;\
- $(XEMACS) -batch -vanilla -l ${srcdir}/../lisp/package-net.el \
- -f package-net-batch-generate-bin-ini . $$V
+ | sed -e 's/\$$Revision:* *//' -e 's/ *$$.*//'` ;\
+ $(XEMACS) -batch -vanilla \
+ -eval '(setq package-net-cygwin32-binary-size $(CYGWIN_SIZE) \
+ package-net-win32-binary-size $(WIN32_SIZE) \
+ package-net-setup-version "'$$V'")' \
+ -l ${srcdir}/../lisp/package-net.el \
+ -f package-net-batch-generate-bin-ini
install:
@echo; echo "Installing net setup."
.PHONY: mostlyclean clean distclean realclean extraclean
mostlyclean:
- $(RM) *.o *.i core $(PROGS)
+ $(RM) *.o *.i *.ini core $(PROGS)
clean: mostlyclean
install.o: install.cc win32.h \
resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h
+init.o: init.cc win32.h resource.h dialog.h state.h msg.h log.h
+uninstall.o: uninstall.cc win32.h \
+ resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
+ diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h
localdir.o: localdir.cc win32.h dialog.h resource.h state.h msg.h \
concat.h log.h
log.o: log.cc win32.h resource.h msg.h log.h dialog.h state.h concat.h \
return FALSE;
}
-static char *
+char *
base (char *s)
{
if (!s)
#include "reginfo.h"
#include "regedit.h"
#include "port.h"
+#include "log.h"
extern "C" {
void make_link_2 (char *exepath, char *args, char *icon, char *lname);
static char *iconname;
static char *batname;
+static char *uninstname;
static void
-make_link (char *linkpath, char *title, char *target)
+make_link (char *linkpath, char *title, char *target, char* args)
{
+#if 0
char argbuf[_MAX_PATH];
+#endif
char *fname = concat (linkpath, "/", title, ".lnk", 0);
if (_access (fname, 0) == 0)
return; /* already exists */
- msg ("make_link %s, %s, %s\n", fname, title, target);
+ msg ("make_link %s, %s, %s, %s\n", fname, title, target, args);
mkdir_p (0, fname);
- char *exepath, *args;
-
+ char *exepath;
+#if 0
/* If we are running Win9x, build a command line. */
if (verinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
{
+#endif
exepath = target;
- args = "";
+#if 0
}
else
{
sprintf (argbuf, "%s %s", COMMAND9XARGS, target);
args = argbuf;
}
-
+#endif
msg ("make_link_2 (%s, %s, %s, %s)", exepath, args, iconname, fname);
- make_link_2 (exepath, args, iconname, fname);
+ make_link_2 (backslash (exepath), args, iconname, fname);
}
static char*
"\\", XEMACS_NATIVE_ARCH_NAME, 0));
}
-static char*
+char*
find_xemacs_exe_name ()
{
/* Hack to support older versions. */
}
static void
-start_menu (char *title, char *target)
+remove_link (char *linkpath, char* title)
+{
+ if (title)
+ {
+ char *fname = backslash (concat (linkpath, "/", title, ".lnk", 0));
+ msg ("remove_link %s, %s\n", fname, title);
+ if (_access (fname, 0) != 0)
+ return; /* doesn't exist */
+ _unlink (fname);
+ }
+ else
+ {
+ msg ("remove_link %s\n", linkpath);
+ if (_access (linkpath, 0) != 0)
+ return; /* doesn't exist */
+ _rmdir (linkpath);
+ }
+}
+
+static void
+start_menu (char *title, char *target, int rem, char* args)
{
char path[_MAX_PATH];
LPITEMIDLIST id;
msg("Program directory for program link changed to: %s",path);
}
// end of Win95 addition
- strcat (path, "/");
+ strcat (path, "\\");
strcat (path, XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME);
- make_link (path, title, target);
+ if (rem == 0)
+ make_link (path, title, target, args);
+ else
+ remove_link (path, title);
}
static void
-desktop_icon (char *title, char *target)
+desktop_icon (char *title, char *target, int rem)
{
char path[_MAX_PATH];
LPITEMIDLIST id;
msg("Desktop directory for deskop link changed to: %s",path);
}
// end of Win95 addition
- make_link (path, title, target);
-}
-
-static int
-uexists (char *path)
-{
- char *f = concat (root_dir, path, 0);
- int a = _access (f, 0);
- free (f);
- if (a == 0)
- return 1;
- return 0;
-}
-
-static void
-make_passwd_group ()
-{
- if (verinfo.dwPlatformId != VER_PLATFORM_WIN32_NT)
- {
- int i;
-
- LOOP_PACKAGES
- {
- if (!strcmp (package[i].name, "cygwin"))
- {
- /* mkpasswd and mkgroup are not working on 9x/ME up to 1.1.5-4 */
- char *border_version = canonicalize_version ("1.1.5-4");
- char *inst_version = canonicalize_version (pi.version);
-
- if (strcmp (inst_version, border_version) <= 0)
- return;
-
- break;
- }
- }
- }
-
- if (uexists ("/etc/passwd") && uexists ("/etc/group"))
- return;
-
- char *fname = concat (root_dir, "/etc/postinstall/passwd-grp.bat", 0);
- mkdir_p (0, fname);
-
- FILE *p = fopen (fname, "wb");
- if (!p)
- return;
-
- if (!uexists ("/etc/passwd"))
- fprintf (p, "bin\\mkpasswd -l > etc\\passwd\n");
- if (!uexists ("/etc/group"))
- fprintf (p, "bin\\mkgroup -l > etc\\group\n");
-
- fclose (p);
+ if (rem == 0)
+ make_link (path, title, target, "");
+ else
+ remove_link (path, title);
}
static void
}
}
+void
+remove_desktop_setup()
+{
+ start_menu ("XEmacs", 0, 1, 0);
+ start_menu ("Uninstall XEmacs", 0, 1, 0);
+ start_menu (0, 0, 1, 0);
+ desktop_icon ("XEmacs", 0, 1);
+
+ if (xemacs_package != 0)
+ {
+#define FROB(exe) remove_app_path (exe)
+ FROB (find_xemacs_exe_name ());
+ FROB ("runemacs.exe");
+ FROB ("xemacs.exe");
+#undef FROB
+ }
+}
+
static void
do_desktop_setup()
{
save_icon ();
if (root_menu && batname) {
- start_menu ("XEmacs", batname);
+ start_menu ("XEmacs", batname, 0, "");
+ start_menu ("Uninstall XEmacs", uninstname, 0, "-u");
}
if (root_desktop && batname) {
- desktop_icon ("XEmacs", batname);
+ desktop_icon ("XEmacs", batname, 0);
}
// set regkeys for the application
if (xemacs_package != 0)
{
int issystem = (root_scope == IDC_ROOT_SYSTEM ? 1 : 0);
- if (xemacs_package->type == TY_NATIVE)
+ if (xemacs_package->type == TY_NATIVE
+ || xemacs_package->type == TY_CYGWIN)
{
+ if (xemacs_package->type == TY_NATIVE)
+ {
#define FROB(exe) set_app_path ((exe), \
find_xemacs_exe_path (), \
issystem)
- FROB (find_xemacs_exe_name ());
- FROB ("runemacs.exe");
- FROB ("xemacs.exe");
+ FROB (find_xemacs_exe_name ());
+ FROB ("runemacs.exe");
+ FROB ("xemacs.exe");
#undef FROB
- }
- else if (xemacs_package->type == TY_CYGWIN)
- {
- int junk;
- char* root = find_cygwin_root (&junk);
+ }
+ else if (xemacs_package->type == TY_CYGWIN)
+ {
+ int junk;
+ char* root = find_cygwin_root (&junk);
#define FROB(exe) set_app_path ((exe), \
concat (find_xemacs_exe_path (), ";", \
root, "\\bin;", \
root, "\\usr\\bin", 0), \
issystem)
- FROB (find_xemacs_exe_name ());
- FROB ("runemacs.exe");
- FROB ("xemacs.exe");
+ FROB (find_xemacs_exe_name ());
+ FROB ("runemacs.exe");
+ FROB ("xemacs.exe");
#undef FROB
+ }
+ set_install_path (find_xemacs_exe_path(), issystem);
+ }
+ // Register file types
+ if (batname)
+ {
+ if (reg_java)
+ {
+ log (0, "Registering .java files");
+ setup_explorer ("java", "Java Source file", batname);
+ setup_explorer ("jav", "Java Source file", batname);
+ }
+ if (reg_cpp)
+ {
+ log (0, "Registering .cpp files");
+ setup_explorer ("cpp", "C++ Source file", batname);
+ setup_explorer ("cc", "C++ Source file", batname);
+ setup_explorer ("hh", "C++ Header file", batname);
+ }
+ if (reg_c)
+ {
+ log (0, "Registering .c files");
+ setup_explorer ("c", "C Source file", batname);
+ setup_explorer ("h", "C Header file", batname);
+ }
+ if (reg_elisp)
+ {
+ log (0, "Registering .el files");
+ setup_explorer ("el", "E-Lisp Source file", batname);
+ }
+ if (reg_txt)
+ {
+ log (0, "Registering .txt files");
+ setup_explorer ("txt", "Text file", batname);
+ }
+ if (reg_idl)
+ {
+ log (0, "Registering .idl files");
+ setup_explorer ("idl", "OMG IDL file", batname);
+ }
}
}
}
static int da[] = { IDC_ROOT_DESKTOP, 0 };
static int ma[] = { IDC_ROOT_MENU, 0 };
+static int ct[] = { IDC_C_TYPE, 0 };
+static int javat[] = { IDC_JAVA_TYPE, 0 };
+static int cppt[] = { IDC_CPP_TYPE, 0 };
+static int elispt[] = { IDC_ELISP_TYPE, 0 };
+static int txtt[] = { IDC_TXT_TYPE, 0 };
+static int idlt[] = { IDC_IDL_TYPE, 0 };
+
static void
check_if_enable_next (HWND h)
{
{
rbset (h, da, root_desktop);
rbset (h, ma, root_menu);
+ rbset (h, ct, reg_c);
+ rbset (h, javat, reg_java);
+ rbset (h, cppt, reg_cpp);
+ rbset (h, elispt, reg_elisp);
+ rbset (h, txtt, reg_txt);
+ rbset (h, idlt, reg_idl);
check_if_enable_next (h);
}
msg ("Program directory for program link changed to: %s",path);
}
// end of Win95 addition
- strcat (path, "/");
+ strcat (path, "\\");
strcat (path, XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME);
- char *fname = concat (path, "/", title, ".lnk", 0);
+ char *fname = concat (path, "\\", title, ".lnk", 0);
if (_access (fname, 0) == 0)
return 0; /* already exists */
- fname = concat (path, "/", title, ".pif", 0); /* check for a pif as well */
+ fname = concat (path, "\\", title, ".pif", 0); /* check for a pif as well */
if (_access (fname, 0) == 0)
return 0; /* already exists */
{
root_desktop= rbget (h, da);
root_menu = rbget (h, ma);
+ reg_c = rbget (h, ct);
+ reg_java = rbget (h, javat);
+ reg_cpp = rbget (h, cppt);
+ reg_elisp = rbget (h, elispt);
+ reg_txt = rbget (h, txtt);
+ reg_idl = rbget (h, idlt);
}
static BOOL
verinfo.dwOSVersionInfoSize = sizeof (verinfo);
GetVersionEx (&verinfo);
batname = 0;
+ uninstname = 0;
if (xemacs_package != 0 && xemacs_package->type != TY_GENERIC)
{
batname = concat (find_xemacs_exe_path (), "\\",
find_xemacs_exe_name (),
0);
+ uninstname = concat (find_xemacs_exe_path (), "\\", "setup.exe", 0);
root_desktop = check_desktop ("XEmacs", batname);
root_menu = check_startmenu ("XEmacs", batname);
+ reg_c = IDC_C_TYPE;
+ reg_cpp = IDC_CPP_TYPE;
+ reg_java = IDC_JAVA_TYPE;
+ reg_elisp = IDC_ELISP_TYPE;
+ reg_txt = IDC_TXT_TYPE;
+ reg_idl = IDC_IDL_TYPE;
}
else
{
root_desktop = 0;
root_menu = 0;
+ reg_c = 0;
+ reg_cpp = 0;
+ reg_java = 0;
+ reg_elisp = 0;
+ reg_txt = 0;
+ reg_idl = 0;
}
int rv = 0;
D(do_download);
D(do_fromcwd);
D(do_ini);
+D(do_init);
D(do_install);
D(do_local_dir);
D(do_net);
D(do_other);
D(do_postinstall);
+D(do_uninstall);
D(do_root);
D(do_site);
D(do_source);
#include "mkdir.h"
#include "log.h"
-#define pi (package[i].info[package[i].trust])
-
static int
download_one (char *name, int expected_size)
{
dialog (void *)
{
MSG m;
- HWND gw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS),
+ HWND lgw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS),
0, dialog_proc);
- ShowWindow (gw_dialog, SW_SHOWNORMAL);
- UpdateWindow (gw_dialog);
+ ShowWindow (lgw_dialog, SW_SHOWNORMAL);
+ UpdateWindow (lgw_dialog);
while (GetMessage (&m, 0, 0, 0) > 0) {
TranslateMessage (&m);
DispatchMessage (&m);
bufs = tmp;
}
*rvp = 0;
+
+ if (n)
+ delete n;
+
return rv;
}
fclose (f);
+ if (n)
+ delete n;
+
return 0;
}
Package *new_package (char *name);
void ini_init (char *string);
-#define pi (package[i].info[package[i].trust])
+#define pinfo(p) ((p).info[(p).trust])
+#define pi pinfo(package[i])
#define LOOP_PACKAGES \
for (i=0; i<npackages; i++) \
* Written by Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
* based on work and suggestions of DJ Delorie
*
+ * Sync'ed with cinstall 2001-10-16
*/
/* The purpose of this file is to ask the user where they want the
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
+#include <io.h>
+#include "mkdir.h"
#include "dialog.h"
#include "resource.h"
#include "state.h"
case IDOK:
save_dialog (h);
+ if (_access (local_dir, 0) != 0 && yesno (IDS_CREATE_DIR, local_dir) == IDYES)
+ {
+ log (0, "Created install directory %s\n", local_dir);
+ mkdir_p (1, local_dir);
+ }
if (SetCurrentDirectoryA (local_dir))
{
switch (source)
NEXT (0);
break;
}
- return FALSE;
}
static BOOL CALLBACK
if (exit_msg)
note (exit_msg);
- log (LOG_TIMESTAMP, "Ending cygwin install");
+ log (LOG_TIMESTAMP, "Ending XEmacs install");
if (source == IDC_SOURCE_DOWNLOAD || !root_dir)
{
int cmd_show)
{
hinstance = h;
+ int pos = -1;
+ if ((pos = strcspn(command_line, "-")) >= 0
+ &&
+ command_line[pos+1] == 'u')
+ {
+ next_dialog = IDD_UNINSTALL;
+ log (LOG_TIMESTAMP, "Starting XEmacs uninstall");
+ uninstall = 1;
+ }
+ else
+ {
+ next_dialog = IDD_SPLASH;
+ log (LOG_TIMESTAMP, "Starting XEmacs install");
+ }
- next_dialog = IDD_SPLASH;
-
- log (LOG_TIMESTAMP, "Starting XEmacs install");
-
- char cwd[_MAX_PATH];
- GetCurrentDirectory (sizeof (cwd), cwd);
- local_dir = strdup (cwd);
- log (0, "Current Directory: %s", cwd);
+ do_init(h);
while (next_dialog)
{
switch (next_dialog)
{
case IDD_SPLASH: do_splash (h); break;
+ case IDD_UNINSTALL: do_uninstall (h); break;
case IDD_SOURCE: do_source (h); break;
case IDD_LOCAL_DIR: do_local_dir (h); break;
case IDD_ROOT: do_root (h); break;
/* The purpose of this file is to centralize all the message
functions. */
-static char *cvsid = "\n%%% $Id: msg.cc,v 1.2 2001/04/12 18:22:49 michaels Exp $\n";
+static char *cvsid = "\n%%% $Id: msg.cc,v 1.2.2.1 2001/12/17 05:49:18 stephent Exp $\n";
#include "win32.h"
#include <stdio.h>
*
* Written by DJ Delorie <dj@cygnus.com>
*
+ * Sync'ed with cinstall 2001-10-16
*/
/* The purpose of this file is to get the network configuration
NEXT (0);
break;
}
- return FALSE;
}
static BOOL CALLBACK
{
case WM_INITDIALOG:
load_dialog (h);
+
+ // Check to see if any radio buttons are selected. If not, select a default.
+ if ((!SendMessage(GetDlgItem (h, IDC_NET_IE5), BM_GETCHECK, 0, 0) == BST_CHECKED)
+ && (!SendMessage(GetDlgItem (h, IDC_NET_PROXY), BM_GETCHECK, 0, 0) == BST_CHECKED))
+ {
+ SendMessage(GetDlgItem (h, IDC_NET_DIRECT), BM_CLICK, 0, 0);
+ }
return FALSE;
case WM_COMMAND:
return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);
{
int rv = 0;
+ net_method = IDC_NET_DIRECT;
rv = DialogBox (h, MAKEINTRESOURCE (IDD_NET), 0, dialog_proc);
if (rv == -1)
fatal (IDS_DIALOG_FAILED);
last_line = s->gets ();
log (LOG_BABBLE, "ftp > %s", last_line);
} while (last_line && (!isdigit (last_line[0]) || last_line[3] != ' '));
- return atoi (last_line ? last_line : "0");
+ return atoi (last_line ?: "0");
}
NetIO_FTP::NetIO_FTP (char *Purl)
code = ftp_line (c);
if (code == 331)
{
- c->printf ("PASS xenacs-setup@\r\n");
+ c->printf ("PASS xemacs-setup@\r\n");
code = ftp_line (c);
}
must already have installed and configured IE5. This module is
called from netio.cc, which is called from geturl.cc */
-static char *cvsid = "\n%%% $Id: nio-ie5.cc,v 1.2 2001/04/12 18:22:51 michaels Exp $\n";
-
#include "win32.h"
#include "resource.h"
path, path);
RegSetValueEx (key, XEMACS_INFO_XEMACS_PACKAGE_KEY,
0, REG_SZ, (BYTE *)buf, strlen (buf)+1);
+ RegCloseKey (key);
}
void
RegSetValueEx (key, "Path",
0, REG_SZ, (BYTE *)path, strlen (path)+1);
+ RegCloseKey (key);
+}
+
+void
+set_install_path (char* path, int issystem)
+{
+ char buf[1000];
+ HKEY key;
+ DWORD disposition;
+
+ sprintf (buf, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\XEmacs");
+
+ HKEY kr = issystem ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
+ RegDeleteKey (kr, buf);
+
+ if (RegCreateKeyEx (kr, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+ 0, &key, &disposition) != ERROR_SUCCESS)
+ fatal ("set_install_path");
+
+ RegSetValueEx (key, "DisplayName",
+ 0, REG_SZ, (BYTE *)"XEmacs", strlen ("XEmacs")+1);
+
+ sprintf (buf, "%s\\setup.exe -u", path);
+ RegSetValueEx (key, "UninstallString",
+ 0, REG_SZ, (BYTE *)buf, strlen (buf)+1);
+ RegCloseKey (key);
+}
+
+void
+setup_explorer (char* file_type, char* name, char *exe)
+{
+ char buf[1000];
+ char ftype[32];
+ HKEY key;
+ DWORD disposition;
+
+ sprintf (buf, ".%s", file_type);
+ RegDeleteKey (HKEY_CLASSES_ROOT, buf);
+
+ if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+ 0, &key, &disposition) != ERROR_SUCCESS)
+ fatal ("setup_explorer");
+
+ // set default key
+ sprintf (ftype, "%sfile", file_type);
+ RegSetValueEx (key, NULL,
+ 0, REG_SZ, (BYTE *)ftype, strlen (ftype)+1);
+ RegCloseKey (key);
+
+ // create file type entry
+ RegDeleteKey (HKEY_CLASSES_ROOT, ftype);
+ if (RegCreateKeyEx (HKEY_CLASSES_ROOT, ftype, 0, "XEmacs",
+ 0, KEY_ALL_ACCESS,
+ 0, &key, &disposition) != ERROR_SUCCESS)
+ fatal ("setup_explorer");
+ RegSetValueEx (key, NULL,
+ 0, REG_SZ, (BYTE *)name, strlen (name)+1);
+ RegSetValueEx (key, "AlwaysShowExt",
+ 0, REG_SZ, (BYTE *)"", strlen ("")+1);
+ RegCloseKey (key);
+
+ // make xemacs file the default icon
+ sprintf(buf, "%s\\DefaultIcon", ftype);
+ if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+ 0, &key, &disposition) != ERROR_SUCCESS)
+ fatal ("setup_explorer");
+
+ sprintf(buf, "%s,1", exe);
+ RegSetValueEx (key, NULL,
+ 0, REG_SZ, (BYTE *)buf, strlen (buf)+1);
+ RegCloseKey (key);
+
+ // command default key (exe)
+ sprintf(buf, "%s\\shell\\Open\\command", ftype);
+ if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+ 0, &key, &disposition) != ERROR_SUCCESS)
+ fatal ("setup_explorer");
+
+ sprintf(buf, "\"%s\"", exe); // Don't need %1 because dde will open the file
+ RegSetValueEx (key, NULL,
+ 0, REG_SZ, (BYTE *)buf, strlen (buf)+1);
+ RegCloseKey (key);
+
+ // ddeexec
+ sprintf(buf, "%s\\shell\\Open\\ddeexec", ftype);
+ if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+ 0, &key, &disposition) != ERROR_SUCCESS)
+ fatal ("setup_explorer");
+
+#define DDE_OPEN "Open(\"%1\")"
+ RegSetValueEx (key, NULL,
+ 0, REG_SZ, (BYTE *)DDE_OPEN, strlen (DDE_OPEN)+1);
+ RegCloseKey (key);
+
+ // ddeexec application
+ sprintf(buf, "%s\\shell\\Open\\ddeexec\\application", ftype);
+ if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+ 0, &key, &disposition) != ERROR_SUCCESS)
+ fatal ("setup_explorer");
+ RegSetValueEx (key, NULL,
+ 0, REG_SZ, (BYTE *)"XEmacs", strlen ("XEmacs")+1);
+ RegCloseKey (key);
+
+ // ddeexec topic
+ sprintf(buf, "%s\\shell\\Open\\ddeexec\\topic", ftype);
+ if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+ 0, &key, &disposition) != ERROR_SUCCESS)
+ fatal ("setup_explorer");
+ RegSetValueEx (key, NULL,
+ 0, REG_SZ, (BYTE *)"system", strlen ("system")+1);
+ RegCloseKey (key);
}
static void
sprintf (buf, "Software\\%s\\%s",
XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME,
XEMACS_INFO_XEMACS_REGISTRY_NAME);
+ RegDeleteKey (rkey, buf);
+ sprintf (buf, "Software\\%s",
+ XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME);
RegDeleteKey (rkey, buf);
}
remove1 (HKEY_CURRENT_USER);
}
+void
+remove_app_path (char *exe)
+{
+ char buf[1000];
+ sprintf (buf, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s",
+ exe);
+
+ RegDeleteKey (HKEY_LOCAL_MACHINE, buf);
+ RegDeleteKey (HKEY_CURRENT_USER, buf);
+}
+
+void
+remove_uninstall_path ()
+{
+ char buf[1000];
+ sprintf (buf, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\XEmacs");
+
+ RegDeleteKey (HKEY_LOCAL_MACHINE, buf);
+ RegDeleteKey (HKEY_CURRENT_USER, buf);
+}
void create_xemacs_root (char *posix, int issystem, int isnative);
void remove_xemacs_root ();
void set_app_path (char *exe, char* path, int issystem);
+void set_install_path (char* path, int issystem);
+void setup_explorer (char* file_type, char* name, char *exe);
+void remove_app_path (char *exe);
+void remove_uninstall_path ();
Copyright (C) 2000 Andy Piper. */
-#define XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME "GNU"
+#define XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME "XEmacs"
#define XEMACS_INFO_XEMACS_REGISTRY_NAME "XEmacs"
/* Keys */
#define XEMACS_INFO_XEMACS_ROOT_KEY "emacs_dir"
CAPTION "XEmacs Setup"\r
FONT 8, "MS Sans Serif"\r
BEGIN\r
- DEFPUSHBUTTON "Next >",IDOK,199,176,45,15,WS_DISABLED\r
+ PUSHBUTTON "Next >",IDOK,199,176,45,15, WS_GROUP\r
PUSHBUTTON "Cancel",IDCANCEL,256,176,45,15\r
+ CONTROL "Download from the Internet",IDC_SOURCE_DOWNLOAD,"Button",\r
+ BS_AUTORADIOBUTTON | WS_TABSTOP,127,102,152,10\r
+ CONTROL "Install from the Internet",IDC_SOURCE_NETINST,"Button",\r
+ BS_AUTORADIOBUTTON | WS_TABSTOP,127,121,87,10\r
+ CONTROL "Install from Local Directory",IDC_SOURCE_CWD,"Button",\r
+ BS_AUTORADIOBUTTON | WS_TABSTOP,127,140,104,10\r
LTEXT "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
LTEXT "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
LTEXT "Setup will use the following installation method.",\r
IDC_STATIC,112,11,170,17\r
LTEXT "To exit setup click Cancel at any time.",IDC_STATIC,112,\r
32,166,17\r
- CONTROL "Download from the Internet",IDC_SOURCE_DOWNLOAD,"Button",\r
- BS_AUTORADIOBUTTON,127,102,152,10\r
- CONTROL "Install from the Internet",IDC_SOURCE_NETINST,"Button",\r
- BS_AUTORADIOBUTTON,127,121,87,10\r
- CONTROL "Install from Local Directory",IDC_SOURCE_CWD,"Button",\r
- BS_AUTORADIOBUTTON,127,140,104,10\r
GROUPBOX "Installation method",IDC_STATIC,113,84,188,77\r
CONTROL "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
END\r
CONTROL "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
END\r
\r
-IDD_NET DIALOG 0, 0, 311, 201\r
+IDD_NET DIALOG DISCARDABLE 0, 0, 311, 201\r
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "XEmacs Setup"\r
FONT 8, "MS Sans Serif"\r
BEGIN\r
- DEFPUSHBUTTON "Next >",IDOK,199,176,45,15\r
+ PUSHBUTTON "Next >",IDOK,199,176,45,15,WS_GROUP\r
PUSHBUTTON "< Back",IDC_BACK,154,176,45,15\r
PUSHBUTTON "Cancel",IDCANCEL,256,176,45,15\r
LTEXT "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
LTEXT "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
LTEXT "Setup will use the following connection method.",\r
- IDC_STATIC,112,11,170,17\r
+ IDC_STATIC,112,11,170,17,NOT WS_GROUP\r
LTEXT "To exit setup click Cancel at any time.",IDC_STATIC,112,\r
- 32,166,17\r
+ 32,166,17,NOT WS_GROUP\r
CONTROL "Use IE5 Settings",IDC_NET_IE5,"Button",\r
- BS_AUTORADIOBUTTON,128,93,69,10\r
+ BS_AUTORADIOBUTTON | WS_TABSTOP,128,93,69,10\r
CONTROL "Direct Connection",IDC_NET_DIRECT,"Button",\r
- BS_AUTORADIOBUTTON,128,109,73,10\r
+ BS_AUTORADIOBUTTON | WS_TABSTOP,128,109,73,10\r
CONTROL "Use HTTP/FTP Proxy:",IDC_NET_PROXY,"Button",\r
- BS_AUTORADIOBUTTON,128,124,88,10\r
+ BS_AUTORADIOBUTTON | WS_TABSTOP,128,124,88,10\r
EDITTEXT IDC_PROXY_HOST,128,141,80,12,ES_AUTOHSCROLL | \r
WS_DISABLED\r
LTEXT "Proxy",IDC_STATIC,10,55,50,15,SS_CENTERIMAGE,\r
CONTROL "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
END\r
\r
+IDD_UNINSTALL DIALOG DISCARDABLE 0, 0, 311, 201\r
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Uninstall XEmacs"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+ PUSHBUTTON "Cancel",IDCANCEL,199,176,45,15\r
+ DEFPUSHBUTTON "Uninstall",IDOK,256,176,45,15\r
+ LTEXT "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
+ LTEXT "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
+ LTEXT "Uninstalling Packages",IDC_STATIC,112,10,170,17\r
+ LTEXT "(PKG)",IDC_UNINS_PKG,112,26,170,11\r
+ LTEXT "(FILE)",IDC_UNINS_FILE,112,41,166,11\r
+ CONTROL "Progress1",IDC_UNINS_DISKFULL,"msctls_progress32",\r
+ WS_BORDER,123,143,165,10\r
+ CONTROL "Progress1",IDC_UNINS_IPROGRESS,"msctls_progress32",\r
+ WS_BORDER,125,106,163,10\r
+ CONTROL "Progress1",IDC_UNINS_PPROGRESS,"msctls_progress32",\r
+ WS_BORDER,125,67,163,10\r
+ GROUPBOX "Disk",IDC_STATIC,112,130,186,31\r
+ GROUPBOX "Package",IDC_STATIC,112,54,186,31\r
+ GROUPBOX "Total",IDC_STATIC,112,93,186,31\r
+ CONTROL "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
+END\r
+\r
IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95\r
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "XEmacs Setup"\r
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15\r
END\r
\r
-IDD_SPLASH DIALOG 0, 0, 311, 201\r
+IDD_SPLASH DIALOG DISCARDABLE 0, 0, 311, 201\r
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "XEmacs Setup"\r
FONT 8, "MS Sans Serif"\r
DEFPUSHBUTTON "Finish",IDOK,199,176,45,15\r
PUSHBUTTON "< Back",IDC_BACK,154,176,45,15\r
PUSHBUTTON "Cancel",IDCANCEL,256,176,45,15\r
- LTEXT "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
- LTEXT "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
LTEXT "Setup has now finished. To create desktop shortcuts, please select from the following options.",\r
IDC_STATIC,112,11,170,17\r
LTEXT "To complete setup click Finish.",IDC_STATIC,112,32,166,\r
17\r
CONTROL "Create Desktop Icon",IDC_ROOT_DESKTOP,"Button",\r
- BS_AUTOCHECKBOX,113,76,100,8\r
+ BS_AUTOCHECKBOX,113,50,100,8\r
CONTROL "Add to Start Menu",IDC_ROOT_MENU,"Button",\r
- BS_AUTOCHECKBOX,113,97,100,8\r
+ BS_AUTOCHECKBOX,113,66,100,8\r
+ CONTROL "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
+ CONTROL "Text",IDC_TXT_TYPE,"Button",BS_AUTOCHECKBOX,209,101,38,\r
+ 8\r
+ CONTROL "Java",IDC_JAVA_TYPE,"Button",BS_AUTOCHECKBOX,113,100,50,\r
+ 8\r
+ CONTROL "C",IDC_C_TYPE,"Button",BS_AUTOCHECKBOX,113,116,41,8\r
+ CONTROL "C++",IDC_CPP_TYPE,"Button",BS_AUTOCHECKBOX,113,133,38,8\r
+ CONTROL "E-Lisp",IDC_ELISP_TYPE,"Button",BS_AUTOCHECKBOX,113,148,\r
+ 38,8\r
+ LTEXT "Register XEmacs for these file types:",IDC_STATIC,113,\r
+ 84,166,13\r
+ LTEXT "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
+ LTEXT "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
CONTROL "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
+ CONTROL "IDL",IDC_IDL_TYPE,"Button",BS_AUTOCHECKBOX,209,116,38,8\r
END\r
\r
\r
IDD_DESKTOP, DIALOG\r
BEGIN\r
VERTGUIDE, 113\r
+ VERTGUIDE, 209\r
+ HORZGUIDE, 124\r
END\r
END\r
#endif // APSTUDIO_INVOKED\r
IDB_CHECK_YES BITMAP DISCARDABLE "check-yes.bmp"\r
IDB_CHECK_NO BITMAP DISCARDABLE "check-no.bmp"\r
IDB_CHECK_NA BITMAP DISCARDABLE "check-na.bmp"\r
-GNU BITMAP DISCARDABLE "gnu.bmp"\r
+GNU BITMAP DISCARDABLE "gnu.bmp"\r
IDB_GNU BITMAP DISCARDABLE "gnu.bmp"\r
\r
/////////////////////////////////////////////////////////////////////////////\r
IDS_ERR_OPEN_READ "Can't open %s for reading: %s"\r
IDS_ROOT_ABSOLUTE "The install directory must be absolute, with both a drive letter and leading slash, like C:\\Cygwin"\r
IDS_DOWNLOAD_COMPLETE "Download Complete"\r
- IDS_CVSID "\n%%% $Id: res.rc,v 1.2 2001/04/12 18:22:53 michaels Exp $\n"\r
+ IDS_CVSID "\n%%% $Id: res.rc,v 1.2.2.1 2001/12/17 05:49:18 stephent Exp $\n"\r
IDS_NOLOGFILE "Cannot open log file %s for writing"\r
IDS_UNINSTALL_COMPLETE "Uninstalls complete."\r
IDS_WININET "Unable to find or load the Internet Explorer 5 DLLs"\r
IDS_ERR_CHDIR "Could not change dir to %s"\r
+ IDS_CREATE_DIR "The directory %s does not exist, create it?"\r
IDS_OLD_SETUP_VERSION "This setup is version %s, but setup.ini claims version %s is available.\nYou might want to upgrade to get the latest features and bug fixes."\r
IDS_DOWNLOAD_FAILED "Unable to download %s"\r
IDS_DOWNLOAD_INCOMPLETE "Download Incomplete. Try again?"\r
#define IDS_DOWNLOAD_INCOMPLETE 26\r
#define IDS_INSTALL_INCOMPLETE 27\r
#define IDS_ROOT_NOCYGWIN 28\r
+#define IDS_CREATE_DIR 29\r
#define IDD_ROOT 101\r
#define IDD_SOURCE 102\r
#define IDD_OTHER_URL 103\r
#define IDB_CHECK_NO 124\r
#define IDB_CHECK_NA 125\r
#define IDB_GNU 126\r
+#define IDD_UNINSTALL 127\r
#define IDC_SOURCE_DOWNLOAD 1000\r
#define IDC_SOURCE_NETINST 1001\r
#define IDC_SOURCE_CWD 1002\r
#define IDC_ROOT_DESKTOP 1041\r
#define IDC_ROOT_MENU 1042\r
#define IDC_LOCAL_DIR_BROWSE 1043\r
+#define IDC_TXT_TYPE 1043\r
#define IDC_LOCAL_DIR 1044\r
+#define IDC_JAVA_TYPE 1044\r
#define IDC_INSTALL_NATIVE 1045\r
+#define IDC_C_TYPE 1045\r
#define IDC_INSTALL_CYGWIN 1046\r
+#define IDC_CPP_TYPE 1046\r
+#define IDC_UNINS_PKG 1047\r
+#define IDC_ELISP_TYPE 1047\r
+#define IDC_UNINS_FILE 1048\r
+#define IDC_IDL_TYPE 1048\r
+#define IDC_UNINS_DISKFULL 1049\r
+#define IDC_UNINS_IPROGRESS 1050\r
+#define IDC_UNINS_PPROGRESS 1051\r
+#define IDC_UNINS_ACTION 1052\r
#define IDC_STATIC -1\r
\r
// Next default values for new objects\r
}
}
-static void
-read_mount_table ()
-{
- int isnative, issystem;
- root_dir = find_root_location (&issystem, &isnative);
- if (root_dir)
- {
- if (isnative)
- install_type = IDC_INSTALL_NATIVE;
- else
- install_type = IDC_INSTALL_CYGWIN;
-
- if (issystem)
- root_scope = IDC_ROOT_SYSTEM;
- else
- root_scope = IDC_ROOT_USER;
- root_dir_default = 0;
- }
- else
- {
- change_default_root (IDC_INSTALL_NATIVE);
- root_scope = (is_admin()) ? IDC_ROOT_SYSTEM : IDC_ROOT_USER;
- root_dir_default = 1;
- }
-}
-
static int CALLBACK
browse_cb (HWND h, UINT m, LPARAM lp, LPARAM data)
{
return FALSE;
}
+static void
+set_default_root ()
+{
+ change_default_root (IDC_INSTALL_NATIVE);
+ root_scope = (is_admin()) ? IDC_ROOT_SYSTEM : IDC_ROOT_USER;
+ root_dir_default = 1;
+}
+
void
do_root (HINSTANCE h)
{
int rv = 0;
- read_mount_table ();
+ // init will have read a previous root
+ if (!root_dir)
+ set_default_root ();
rv = DialogBox (h, MAKEINTRESOURCE (IDD_ROOT), 0, dialog_proc);
if (rv == -1)
TARGETOS=BOTH
APPVER=4.0
-!include "c:\Program Files\Microsoft Platform SDK\Include\win32.mak"
default: all
VERBOSECC=0
!endif
!if $(VERBOSECC)
-cc=$(cc)
+CCV=$(CC)
!else
-cc=@$(cc)
+CCV=@$(CC)
!endif
!if $(DEBUG_XEMACS)
$(OUTDIR)\geturl.obj \
$(OUTDIR)\hash.obj \
$(OUTDIR)\ini.obj \
+ $(OUTDIR)\init.obj \
$(OUTDIR)\inilex.obj \
$(OUTDIR)\iniparse.obj \
$(OUTDIR)\install.obj \
$(OUTDIR)\nio-http.obj \
$(OUTDIR)\other.obj \
$(OUTDIR)\postinstall.obj \
-# $(OUTDIR)\res.obj \
$(OUTDIR)\root.obj \
$(OUTDIR)\simpsock.obj \
$(OUTDIR)\site.obj \
$(OUTDIR)\splash.obj \
$(OUTDIR)\state.obj \
$(OUTDIR)\tar.obj \
+ $(OUTDIR)\uninstall.obj \
$(OUTDIR)\version.obj
#
# nmake rule
.cc{$(OUTDIR)}.obj:
- $(cc) /TP $(cflags) $(cdebug) $(cvarsmt) $(defines) -Fo$@ $<
+ $(CC) /TP $(cflags) $(cdebug) $(cvarsmt) $(defines) -Fo$@ $<
.c{$(OUTDIR)}.obj:
- $(cc) $(cflags) $(cdebug) $(cvarsmt) $(defines) -Fo$@ $<
+ $(CC) $(cflags) $(cdebug) $(cvarsmt) $(defines) -Fo$@ $<
#
# Main target
# DO NOT DELETE
$(OUTDIR)/autoload.obj: autoload.c win32.h
-$(OUTDIR)/inilex.obj: inilex.c win32.h ini.h iniparse.h \
-
+$(OUTDIR)/inilex.obj: inilex.c win32.h ini.h iniparse.h
+$(OUTDIR)/init.obj: win32.h dialog.h resource.h \
+ state.h ini.h concat.h msg.h log.h find.h reginfo.h
$(OUTDIR)/iniparse.obj: iniparse.c ini.h iniparse.h port.h
$(OUTDIR)/inilex.obj: inilex.c win32.h ini.h iniparse.h
$(OUTDIR)/mklink2.obj: mklink2.c win32.h
$(OUTDIR)/splash.obj: splash.cc win32.h dialog.h resource.h msg.h \
version.h
$(OUTDIR)/state.obj: state.cc state.h
+$(OUTDIR)/uninstall.obj: install.cc win32.h \
+ $(ZLIBDIR)/zlib.h $(ZLIBDIR)/zconf.h \
+ resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
+ diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h
$(OUTDIR)/tar.obj: tar.cc win32.h \
$(ZLIBDIR)/zlib.h $(ZLIBDIR)/zconf.h \
tar.h mkdir.h log.h port.h
*
* Written by DJ Delorie <dj@cygnus.com>
*
+ * Sync'ed with cinstall 2001-10-16
*/
/* The purpose of this file is to manage the dialog box that lets the
#include "msg.h"
#include "log.h"
-static int rb[] = { IDC_SOURCE_DOWNLOAD, IDC_SOURCE_NETINST, IDC_SOURCE_CWD, 0 };
+static int rb[] = { IDC_SOURCE_NETINST, IDC_SOURCE_DOWNLOAD, IDC_SOURCE_CWD, 0 };
static void
check_if_enable_next (HWND h)
static void
load_dialog (HWND h)
{
+ int i;
rbset (h, rb, source);
- check_if_enable_next (h);
}
static void
save_dialog (HWND h)
{
+ int i;
source = rbget (h, rb);
}
case IDC_SOURCE_NETINST:
case IDC_SOURCE_CWD:
save_dialog (h);
- check_if_enable_next (h);
break;
case IDOK:
case IDCANCEL:
NEXT (0);
break;
+
+ default:
+ break;
}
- return FALSE;
}
static BOOL CALLBACK
{
case WM_INITDIALOG:
load_dialog (h);
+ // Check to see if any radio buttons are selected. If not, select a default.
+ if ((!SendMessage(GetDlgItem (h, IDC_SOURCE_DOWNLOAD), BM_GETCHECK, 0, 0) == BST_CHECKED)
+ && (!SendMessage(GetDlgItem (h, IDC_SOURCE_CWD), BM_GETCHECK, 0, 0) == BST_CHECKED))
+ {
+ SendMessage(GetDlgItem (h, IDC_SOURCE_NETINST), BM_SETCHECK, BST_CHECKED, 0);
+ }
return FALSE;
case WM_COMMAND:
return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);
do_source (HINSTANCE h)
{
int rv = 0;
+ /* source = IDC_SOURCE_CWD;*/
+ source = IDC_SOURCE_NETINST;
rv = DialogBox (h, MAKEINTRESOURCE (IDD_SOURCE), 0, dialog_proc);
if (rv == -1)
fatal (IDS_DIALOG_FAILED);
do_splash (HINSTANCE h)
{
int rv = 0;
- HANDLE gnu = LoadImage (h, MAKEINTRESOURCE (IDB_GNU), IMAGE_BITMAP, 0, 0, 0);
rv = DialogBox (h, MAKEINTRESOURCE (IDD_SPLASH), 0, dialog_proc);
if (rv == -1)
fatal (IDS_DIALOG_FAILED);
extern int root_menu;
extern int root_desktop;
+extern int reg_c;
+extern int reg_cpp;
+extern int reg_java;
+extern int reg_elisp;
+extern int reg_txt;
+extern int reg_idl;
+
extern int net_method;
extern char * net_proxy_host;
extern int net_proxy_port;
extern char * other_url;
extern int trust_level;
+extern int uninstall;
#define MIRROR_SITE (mirror_site ? mirror_site : other_url)
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
2001-10-23 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.4.5 "Civil Service" is released.
(Vcharset_thai_tis620): Likewise.
(Vcharset_katakana_jisx0201): Likewise.
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-16 Torsten Duwe <duwe@caldera.de>
+
+ * search.c (Freplace_match): Add missing sub-expression functionality.
+
+ * buffer.c (decode_buffer): Add a check for pointer type to
+ decode_buffer, before gcc's CSE optimization reorders a
+ dereference in front of the allow_string test.
+
+2001-11-16 Darryl Okahata <darrylo@xemacs.org>
+
+ * window.c (window_loop): Fix bug that sometimes prevented
+ window_loop() from iterating across multiple devices. Also, at
+ Ben's request, changed infloop-detecting code to abort() instead
+ of silently terminating window_loop().
+
+2001-11-21 Stephen J. Turnbull <stephen@xemacs.org>
+
+ Based on analysis and patch by Simon Josefson <jas@extundo.com>.
+ * editfns.c (make_time): New function.
+ (Fencode_time): Use it instead of wasteful_word_to_lisp.
+ * lisp.h (make_time): Prototype and comment it.
+ * dired.c (wasteful_word_to_lisp): Deprecate.
+ (Ffile_attributes): Use make_time() instead of wasteful_word_to_lisp().
+
+2001-10-31 Kyle Jones <kyle_jones@wonderworks.com>
+
+ * fileio.c (auto_save_1): Use current coding system, not
+ escape-quoted.
+
+2001-11-13 Ben Wing <ben@xemacs.org>
+
+ * window.c:
+ * window.c (window_truncation_on):
+ * window.c (syms_of_window):
+ truncate-partial-width-windows should respect the buffer being
+ displayed, like other redisplay vars.
+
+2001-11-13 Hirokazu FUKUI <hfukui@sannet.ne.jp>
+
+ * event-stream.c (Fread_key_sequence): save current buffer.
+
+2001-10-29 Andrew Begel <abegel@eecs.berkeley.edu>
+
+ * ntheap.c (_heap_init): Don't redefine in VS.NET (MSC >= 1300).
+
+2001-10-29 Andrew Begel <abegel@eecs.berkeley.edu>
+
+ * alloc.c (lcrecord_stats): Add space for types defined in modules.
+
+2001-10-26 Mike Alexander <mta@arbortext.com>
+
+ * event-msw.c (slurper_free_shared_data_maybe): Free the pipe handle.
+
+2001-10-25 Andy Piper <andy@xemacs.org>
+
+ * ChangeLog:
+ * dialog-msw.c (handle_directory_proc): new function.
+ (handle_directory_dialog_box): new fucntion.
+ (handle_file_dialog_box): use new directory dialog support.
+ (mswindows_make_dialog_box_internal): ditto.
+ * event-msw.c (mswindows_wnd_proc): minor fix to scrollbar event
+ handling.
+ (mswindows_find_frame): make global.
+ * fileio.c (Fexpand_file_name): build fix.
+ * general-slots.h: add Qdirectory.
+ * scrollbar-msw.c (mswindows_handle_scrollbar_event): fix focus
+ handling.
+ * syswindows.h (LOCAL_TO_WIN32_FILE_FORMAT): fix problem with
+ cygwin not leaving win32 paths unchanged.
+ * win32.c (Fmswindows_cygwin_to_win32_path): new function. Use the
+ cygwin runtime to do path conversion.
+ (Fmswindows_shell_execute): fix cygwin handling of URLs.
+ (syms_of_win32): add new function.
+ * window.c (window_loop): build fix.
+
+2001-10-15 Andy Piper <andy@xemacs.org>
+
+ (Fmswindows_shell_execute): fix handling of URL's under cygwin.
+
2001-10-23 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.4.5 "Civil Service" is released.
2001-04-24 Jerry James <james@xemacs.org>
- * faces.h: pass parameters to Fadd_spec_to_specifier in the
- correct order.
+ * faces.h: pass parameters to Fadd_spec_to_specifier in the
+ correct order.
2001-06-01 Ben Wing <ben@xemacs.org>
int instances_freed;
int bytes_freed;
int instances_on_free_list;
-} lcrecord_stats [countof (lrecord_implementations_table)];
+} lcrecord_stats [countof (lrecord_implementations_table)
+ + MODULE_DEFINABLE_TYPE_COUNT];
static void
tick_lcrecord_stats (const struct lrecord_header *h, int free_p)
struct buffer *
decode_buffer (Lisp_Object buffer, int allow_string)
{
- if (NILP (buffer))
+ if (NILP (buffer) || (!POINTER_TYPE_P( XTYPE(buffer))))
return current_buffer;
if (allow_string && STRINGP (buffer))
{ FRERR_BUFFERLENGTHZERO, "FRERR_BUFFERLENGTHZERO" },
};
+struct param_data {
+ char* fname;
+ char* unknown_fname;
+ int validate;
+};
+
+static int
+CALLBACK handle_directory_proc (HWND hwnd, UINT msg,
+ LPARAM lParam, LPARAM lpData)
+{
+ TCHAR szDir[MAX_PATH];
+ struct param_data* pd = (struct param_data*)lpData;
+
+ switch(msg) {
+ case BFFM_INITIALIZED:
+ // WParam is TRUE since you are passing a path.
+ // It would be FALSE if you were passing a pidl.
+ SendMessage(hwnd, BFFM_SETSELECTION, TRUE, (LPARAM)pd->fname);
+ break;
+
+ case BFFM_SELCHANGED:
+ // Set the status window to the currently selected path.
+ if (SHGetPathFromIDList((LPITEMIDLIST) lParam, szDir)) {
+ SendMessage(hwnd, BFFM_SETSTATUSTEXT, 0, (LPARAM)szDir);
+ }
+ break;
+
+ case BFFM_VALIDATEFAILED:
+ if (pd->validate)
+ return TRUE;
+ else
+ pd->unknown_fname = xstrdup((char*)lParam);
+ break;
+
+ default:
+ break;
+ }
+ return 0;
+}
+
+static Lisp_Object
+handle_directory_dialog_box (struct frame *f, Lisp_Object keys)
+{
+ Lisp_Object ret = Qnil;
+ BROWSEINFO bi;
+ LPITEMIDLIST pidl;
+ LPMALLOC pMalloc;
+ struct param_data pd;
+
+ xzero(pd);
+ xzero(bi);
+
+ bi.lParam = (LPARAM)&pd;
+ bi.hwndOwner = FRAME_MSWINDOWS_HANDLE (f);
+ bi.pszDisplayName = 0;
+ bi.pidlRoot = 0;
+ bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_EDITBOX;
+ bi.lpfn = handle_directory_proc;
+
+ LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil),
+ (char*)pd.fname);
+
+ {
+ EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys)
+ {
+ if (EQ (key, Q_title))
+ {
+ CHECK_STRING (value);
+ LISP_STRING_TO_EXTERNAL (value, bi.lpszTitle, Qmswindows_tstr);
+ }
+ else if (EQ (key, Q_initial_directory))
+ LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (value, Qnil),
+ pd.fname);
+ else if (EQ (key, Q_initial_filename))
+ ; /* do nothing */
+ else if (EQ (key, Q_file_must_exist))
+ {
+ if (!NILP (value)) {
+ pd.validate = TRUE;
+ bi.ulFlags |= BIF_VALIDATE;
+ }
+ else
+ bi.ulFlags &= ~BIF_VALIDATE;
+ }
+ else
+ syntax_error ("Unrecognized directory dialog keyword", key);
+ }
+ }
+
+ if (SHGetMalloc(&pMalloc) == NOERROR)
+ {
+ pidl = SHBrowseForFolder(&bi);
+ if (pidl) {
+ TCHAR* szDir = alloca (MAX_PATH);
+
+ if (SHGetPathFromIDList(pidl, szDir)) {
+ ret = tstr_to_local_file_format (szDir);
+ }
+
+ pMalloc->lpVtbl->Free(pMalloc, pidl);
+ pMalloc->lpVtbl->Release(pMalloc);
+ return ret;
+ }
+ else if (pd.unknown_fname != 0) {
+ ret = tstr_to_local_file_format (pd.unknown_fname);
+ xfree(pd.unknown_fname);
+ }
+
+ }
+ else
+ signal_type_error (Qdialog_box_error,
+ "Unable to create folder browser",
+ make_int (0));
+ return ret;
+}
+
static Lisp_Object
handle_file_dialog_box (struct frame *f, Lisp_Object keys)
{
OPENFILENAME ofn;
+
char fnbuf[8000];
xzero (ofn);
ofn.lStructSize = sizeof (ofn);
+ ofn.Flags = OFN_EXPLORER;
ofn.hwndOwner = FRAME_MSWINDOWS_HANDLE (f);
ofn.lpstrFile = fnbuf;
ofn.nMaxFile = sizeof (fnbuf) / XETCHAR_SIZE;
{
if (EQ (type, Qfile))
return handle_file_dialog_box (f, keys);
+ else if (EQ (type, Qdirectory))
+ return handle_directory_dialog_box (f, keys);
else if (EQ (type, Qquestion))
return handle_question_dialog_box (f, keys);
else if (EQ (type, Qprint))
return Qnil;
}
\f
+#if 0
+/* ... never used ... should use list2 directly anyway ... */
+/* NOTE: This function can never return a negative value. */
Lisp_Object
wasteful_word_to_lisp (unsigned int item)
{
XCDR (cons) = Fcons (XCDR (cons), Qnil);
return cons;
}
+#endif
DEFUN ("file-attributes", Ffile_attributes, 1, 1, 0, /*
Return a list of attributes of file FILENAME.
values[1] = make_int (s.st_nlink);
values[2] = make_int (s.st_uid);
values[3] = make_int (s.st_gid);
- values[4] = wasteful_word_to_lisp (s.st_atime);
- values[5] = wasteful_word_to_lisp (s.st_mtime);
- values[6] = wasteful_word_to_lisp (s.st_ctime);
+ values[4] = make_time (s.st_atime);
+ values[5] = make_time (s.st_mtime);
+ values[6] = make_time (s.st_ctime);
values[7] = make_int ((EMACS_INT) s.st_size);
/* If the size is out of range, give back -1. */
/* #### Fix when Emacs gets bignums! */
static void set_time_zone_rule (char *tzstring);
+/* from GNU Emacs 21, per Simon Josefsson, modified by stephen
+ The slight inefficiency is justified since negative times are weird. */
+Lisp_Object
+make_time (time_t time)
+{
+ return list2 (make_int (time < 0 ? time / 0x10000 : time >> 16),
+ make_int (time & 0xFFFF));
+}
+
DEFUN ("encode-time", Fencode_time, 6, MANY, 0, /*
Convert SECOND, MINUTE, HOUR, DAY, MONTH, YEAR and ZONE to internal time.
This is the reverse operation of `decode-time', which see.
if (the_time == (time_t) -1)
error ("Specified time is not representable");
- return wasteful_word_to_lisp (the_time);
+ return make_time (the_time);
}
DEFUN ("current-time-string", Fcurrent_time_string, 0, 1, 0, /*
/* Timer ID used for button2 emulation */
#define BUTTON_2_TIMER_ID 1
-static Lisp_Object mswindows_find_frame (HWND hwnd);
+Lisp_Object mswindows_find_frame (HWND hwnd);
static Lisp_Object mswindows_find_console (HWND hwnd);
static Lisp_Object mswindows_key_to_emacs_keysym (int mswindows_key, int mods,
int extendedp);
CloseHandle (s->hev_thread);
CloseHandle (s->hev_caller);
CloseHandle (s->hev_unsleep);
+ CloseHandle (s->hpipe);
s->inuse_p = 0;
}
}
MAKEPOINTS (lParam)))
{
GCPRO2 (emacs_event, fobj);
- mswindows_pump_outstanding_events (); /* Can GC */
+ if (UNBOUNDP(mswindows_pump_outstanding_events ())) /* Can GC */
+ SendMessage (hwnd, WM_CANCELMODE, 0, 0);
UNGCPRO;
}
else
/*
* Find the frame that matches the supplied mswindows window handle
*/
-static Lisp_Object
+Lisp_Object
mswindows_find_frame (HWND hwnd)
{
LONG l = GetWindowLong (hwnd, XWL_FRAMEOBJ);
struct gcpro gcpro1;
GCPRO1 (event);
+ record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
if (!NILP (prompt))
CHECK_STRING (prompt);
/* else prompt = Fkeymap_prompt (current_buffer->keymap); may GC */
if (IS_DIRECTORY_SEP (nm[1]))
{
if (strcmp ((char *) nm, (char *) XSTRING_DATA (name)) != 0)
- name = build_string ((CBufbyte *) nm);
+ name = build_string ((Bufbyte *) nm);
}
/* drive must be set, so this is okay */
else if (strcmp ((char *) nm - 2,
return
/* !!#### need to deal with this 'escape-quoted everywhere */
Fwrite_region_internal (Qnil, Qnil, a, Qnil, Qlambda, Qnil,
-#ifdef MULE
- Qescape_quoted
+#ifdef FILE_CODING
+ current_buffer->buffer_file_coding_system
#else
Qnil
#endif
SYMBOL (Qdevice);
SYMBOL_KEYWORD (Q_device);
SYMBOL (Qdialog);
+SYMBOL (Qdirectory);
SYMBOL (Qdimension);
SYMBOL (Qdisplay);
SYMBOL (Qdoc_string);
arith_grtr_or_equal };
Lisp_Object arithcompare (Lisp_Object, Lisp_Object, enum arith_comparison);
+/* Do NOT use word_to_lisp or wasteful_word_to_lisp to decode time_t's
+ unless you KNOW arg is non-negative. They cannot return negative
+ values! Use make_time. */
Lisp_Object word_to_lisp (unsigned int);
unsigned int lisp_to_word (Lisp_Object);
void buffer_insert1 (struct buffer *, Lisp_Object);
Lisp_Object make_string_from_buffer (struct buffer *, Bufpos, Charcount);
Lisp_Object make_string_from_buffer_no_extents (struct buffer *, Bufpos, Charcount);
+Lisp_Object make_time (time_t);
Lisp_Object save_excursion_save (void);
Lisp_Object save_restriction_save (void);
Lisp_Object save_excursion_restore (Lisp_Object);
sbrk (need_to_alloc);
}
-#if (_MSC_VER >= 1000)
+#if ((_MSC_VER >= 1000) && (_MSC_VER < 1300))
/* MSVC 4.2 invokes these functions from mainCRTStartup to initialize
a heap via HeapCreate. They are normally defined by the runtime,
but we override them here so that the unnecessary HeapCreate call
is not performed. */
+/* MSVC 7.0 does not allow you to redefine _heap_init or _heap_term. */
+
int __cdecl
_heap_init (void)
{
#define VERTICAL_SCROLLBAR_DRAG_HACK
static int vertical_drag_in_progress = 0;
+extern Lisp_Object mswindows_find_frame (HWND hwnd);
static void
mswindows_create_scrollbar_instance (struct frame *f, int vertical,
}
sb = (struct scrollbar_instance *)GetWindowLong (hwnd, GWL_USERDATA);
- win = real_window ((sb==NULL) ? GetFocus() : sb->mirror, 1);
- /* "0 as the second parameter" refers to the call to real_window above.
- This comment was taken from Ben's 21.5 code that differs somewhat
- from this, I don't think the 21.4 code ever had a 0 there.
- #### we're still hitting an abort here with 0 as the second
- parameter, although only occasionally. It seems that sometimes we
- receive events for scrollbars that don't exist anymore. I assume
- it must happen like this: The user does something that causes a
- scrollbar to disappear (e.g. Alt-TAB, causing recomputation of
- everything in the new frame) and then immediately uses the mouse
- wheel, generating scrollbar events. Both events get posted before
- we have a chance to process them, and in processing the first, the
- scrollbar mentioned in the second disappears. */
- if (NILP (win))
- return;
- frame = XWINDOW (win)->frame;
- f = XFRAME (frame);
+ if (sb != NULL)
+ {
+ win = real_window (sb->mirror, 1);
+ /* "0 as the second parameter" refers to the call to real_window
+ above. This comment was taken from Ben's 21.5 code that differs
+ somewhat from this, I don't think the 21.4 code ever had a 0
+ there. #### we're still hitting an abort here with 0 as the
+ second parameter, although only occasionally. It seems that
+ sometimes we receive events for scrollbars that don't exist
+ anymore. I assume it must happen like this: The user does
+ something that causes a scrollbar to disappear (e.g. Alt-TAB,
+ causing recomputation of everything in the new frame) and then
+ immediately uses the mouse wheel, generating scrollbar events.
+ Both events get posted before we have a chance to process them,
+ and in processing the first, the scrollbar mentioned in the
+ second disappears. */
+ if (NILP (win))
+ return;
+ frame = XWINDOW (win)->frame;
+ f = XFRAME (frame);
+ }
+ else
+ {
+ /* I'm not sure if this is right, but its much better than
+ passing an HNWD to real_window() - which is what the previous
+ code did -- andyp */
+ frame = mswindows_find_frame (GetFocus());
+ f = XFRAME (frame);
+ win = FRAME_SELECTED_WINDOW (f);
+ }
/* SB_LINEDOWN == SB_CHARLEFT etc. This is the way they will
always be - any Windows is binary compatible backward with
Lisp_Object buffer;
int_dynarr *ul_action_dynarr = 0;
int_dynarr *ul_pos_dynarr = 0;
- int sub;
+ int sub = 0;
int speccount;
CHECK_STRING (replacement);
}
else
{
- if (NILP (strbuffer))
- sub = 0;
- else
+ if (!NILP (strbuffer))
{
CHECK_INT (strbuffer);
sub = XINT (strbuffer);
{
/* Decide how to casify by examining the matched text. */
- last = search_regs.end[0];
+ last = search_regs.end[sub];
prevc = '\n';
case_action = all_caps;
some_nonuppercase_initial = 0;
some_uppercase = 0;
- for (pos = search_regs.start[0]; pos < last; pos++)
+ for (pos = search_regs.start[sub]; pos < last; pos++)
{
if (NILP (string))
c = BUF_FETCH_CHAR (buf, pos);
return concat3 (before, replacement, after);
}
- mc_count = begin_multiple_change (buf, search_regs.start[0],
- search_regs.end[0]);
+ mc_count = begin_multiple_change (buf, search_regs.start[sub],
+ search_regs.end[sub]);
/* begin_multiple_change() records an unwind-protect, so we need to
record this value now. */
delete the original text. This means that markers at the
beginning or end of the original will float to the corresponding
position in the replacement. */
- BUF_SET_PT (buf, search_regs.start[0]);
+ BUF_SET_PT (buf, search_regs.start[sub]);
if (!NILP (literal))
Finsert (1, &replacement);
else
GCPRO1 (replacement);
for (strpos = 0; strpos < stlen; strpos++)
{
- Charcount offset = BUF_PT (buf) - search_regs.start[0];
+ /* on the first iteration assert(offset==0),
+ exactly complementing BUF_SET_PT() above.
+ During the loop, it keeps track of the amount inserted.
+ */
+ Charcount offset = BUF_PT (buf) - search_regs.start[sub];
c = string_char (XSTRING (replacement), strpos);
if (c == '\\' && strpos < stlen - 1)
{
+ /* XXX FIXME: replacing just a substring non-literally
+ using backslash refs to the match looks dangerous. But
+ <15366.18513.698042.156573@ns.caldera.de> from Torsten Duwe
+ <duwe@caldera.de> claims Finsert_buffer_substring already
+ handles this correctly.
+ */
c = string_char (XSTRING (replacement), ++strpos);
if (c == '&')
Finsert_buffer_substring
UNGCPRO;
}
- inslen = BUF_PT (buf) - (search_regs.start[0]);
- buffer_delete_range (buf, search_regs.start[0] + inslen, search_regs.end[0] +
- inslen, 0);
+ inslen = BUF_PT (buf) - (search_regs.start[sub]);
+ buffer_delete_range (buf, search_regs.start[sub] + inslen,
+ search_regs.end[sub] + inslen, 0);
if (case_action == all_caps)
Fupcase_region (make_int (BUF_PT (buf) - inslen),
#define Status int
#endif
#include <mmsystem.h>
+#include <shlobj.h>
#include <shellapi.h>
#include <ddeml.h>
#endif
#define PHYSICALOFFSETY 113
#endif
+/* shlobj.h defines. */
+#ifndef BIF_EDITBOX
+#define BIF_EDITBOX 0x10
+#endif
+#ifndef BIF_VALIDATE
+#define BIF_VALIDATE 0x20
+#endif
+#ifndef BFFM_VALIDATEFAILED
+#define BFFM_VALIDATEFAILED 3
+#endif
+
/* windows.h defines. */
#if defined (CYGWIN) && (CYGWIN_VERSION_DLL_MAJOR < 20)
typedef NMHDR *LPNMHDR;
#define LOCAL_TO_WIN32_FILE_FORMAT(path, pathout) \
do { \
Lisp_Object ltwff1 = (path); \
- int ltwff2 = \
- cygwin_posix_to_win32_path_list_buf_size (XSTRING_DATA (ltwff1)); \
- pathout = (Bufbyte *) alloca (ltwff2); \
- cygwin_posix_to_win32_path_list (XSTRING_DATA (ltwff1), pathout); \
+ Bufbyte* ltwffp = XSTRING_DATA (ltwff1); \
+ if (isalpha (ltwffp[0]) && (IS_DEVICE_SEP (ltwffp[1]))) \
+ pathout = ltwffp; \
+ else { \
+ int ltwff2 = \
+ cygwin_posix_to_win32_path_list_buf_size (ltwffp); \
+ pathout = (Bufbyte *) alloca (ltwff2); \
+ cygwin_posix_to_win32_path_list (ltwffp, pathout); \
+ } \
} while (0)
#else
#define LOCAL_TO_WIN32_FILE_FORMAT(path, pathout) \
/* Encode filename and current directory. */
Lisp_Object current_dir = Ffile_name_directory (document);
char* path = NULL;
+#ifdef CYGWIN
+ char* fname1, *fname2;
+ int pos, sz;
+#endif
char* doc = NULL;
- Extbyte* f=0;
int ret;
struct gcpro gcpro1, gcpro2;
/* Use mule and cygwin-safe APIs top get at file data. */
if (STRINGP (current_dir))
{
- TO_EXTERNAL_FORMAT (LISP_STRING, current_dir,
- C_STRING_ALLOCA, f,
- Qfile_name);
-#ifdef CYGWIN
- CYGWIN_WIN32_PATH (f, path);
-#else
- path = f;
-#endif
+ LOCAL_TO_WIN32_FILE_FORMAT (current_dir, path);
}
if (STRINGP (document))
{
- TO_EXTERNAL_FORMAT (LISP_STRING, document,
- C_STRING_ALLOCA, f,
- Qfile_name);
+ doc = XSTRING_DATA (document);
#ifdef CYGWIN
- CYGWIN_WIN32_PATH (f, doc);
-#else
- doc = f;
+ if ((fname1 = strchr (doc, ':')) != NULL
+ && *++fname1 == '/' && *++fname1 == '/')
+ {
+ fname1++;
+ pos = fname1 - doc;
+ if (!(isalpha (fname1[0]) && (IS_DEVICE_SEP (fname1[1]))))
+ {
+ sz = cygwin_posix_to_win32_path_list_buf_size (fname1);
+ fname2 = alloca (sz + pos);
+ strncpy (fname2, doc, pos);
+ doc = fname2;
+ fname2 += pos;
+ cygwin_posix_to_win32_path_list (fname1, fname2);
+ }
+ }
+ else {
+ LOCAL_TO_WIN32_FILE_FORMAT (document, doc);
+ }
#endif
}
return Qnil;
}
+#ifdef CYGWIN
+DEFUN ("mswindows-cygwin-to-win32-path", Fmswindows_cygwin_to_win32_path, 1, 1, 0, /*
+Get the cygwin environment to convert the Unix PATH to win32 format.
+No expansion is performed, all conversion is done by the cygwin runtime.
+*/
+ (path))
+{
+ Extbyte* f;
+ Bufbyte* p;
+ CHECK_STRING (path);
+
+ /* There appears to be a bug in the cygwin conversion routines in
+ that they are not idempotent. */
+ p = XSTRING_DATA (path);
+ if (isalpha (p[0]) && (IS_DEVICE_SEP (p[1])))
+ return path;
+
+ /* Use mule and cygwin-safe APIs top get at file data. */
+ LOCAL_TO_WIN32_FILE_FORMAT (path, f);
+ return build_ext_string (f, Qnative);
+}
+#endif
+
\f
/*--------------------------------------------------------------------*/
/* Async timers */
syms_of_win32 (void)
{
DEFSUBR (Fmswindows_shell_execute);
+#ifdef CYGWIN
+ DEFSUBR (Fmswindows_cygwin_to_win32_path);
+#endif
}
void
/* List of freed window configurations with 1 - 10 windows. */
static Lisp_Object Vwindow_configuration_free_list[10];
+Lisp_Object Qtruncate_partial_width_windows;
+
#define SET_LAST_MODIFIED(w, cache_too) \
do { \
(w)->last_modified[CURRENT_DISP] = Qzero; \
/* If truncate_partial_width_windows is true and the window is not
the full width of the frame it is truncated. */
- if (truncate_partial_width_windows
+ if (!NILP (symbol_value_in_buffer (Qtruncate_partial_width_windows,
+ w->buffer))
&& !(window_is_leftmost (w) && window_is_rightmost (w)))
return 1;
We can't just wait until we hit the first window again,
because it might be deleted. */
- last_window = Fprevious_window (w, mini ? Qt : Qnil, frame_arg, Qt);
+ last_window = Fprevious_window (w, mini ? Qt : Qnil, frame_arg, device);
best_window = Qnil;
for (;;)
/* Given the outstanding quality of the rest of this code,
I feel no shame about putting this piece of shit in. */
if (++lose_lose >= 500)
- return Qnil;
+ {
+ /* Call to abort() added by Darryl Okahata (16 Nov. 2001),
+ at Ben's request, to catch any remaining bugs.
+
+ If you find that XEmacs is aborting here, and you
+ need to be up and running ASAP, it should be safe to
+ comment out the following abort(), as long as you
+ leave the "break;" alone. */
+ abort();
+ break; /* <--- KEEP THIS HERE! Do not delete! */
+ }
/* Note that we do not pay attention here to whether
the frame is visible, since Fnext_window skips non-visible frames
case UNDEDICATE_BUFFER:
{
- if ((XBUFFER (p->buffer) == XBUFFER (obj)) && (p->dedicated))
+ if ((XBUFFER (p->buffer) == XBUFFER (obj)))
p->dedicated = Qnil;
break;
}
/* Qother in general.c */
#endif
+ DEFSYMBOL (Qtruncate_partial_width_windows);
+
DEFSUBR (Fselected_window);
DEFSUBR (Flast_nonminibuf_window);
DEFSUBR (Fminibuffer_window);
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.4.6 "Common Lisp" is released.
+
2001-10-23 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.4.5 "Civil Service" is released.
emacs_is_beta=
emacs_major_version=21
emacs_minor_version=4
-emacs_beta_version=5
-xemacs_codename="Civil Service"
+emacs_beta_version=6
+xemacs_codename="Common Lisp"
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
projects / chise / xemacs-chise.git / commitdiff