Author: yamakenz
Date: Mon Apr 28 18:39:34 2008
New Revision: 5466
Modified:
branches/1.5/NEWS
branches/1.5/RELNOTE
branches/1.5/doc/COMPATIBILITY
branches/1.5/make-dist.sh
branches/1.5/uim/uim.c
Log:
* branches/1.5
- Merge r5464, 5465 from trunk
Modified: branches/1.5/NEWS
==============================================================================
--- branches/1.5/NEWS (original)
+++ branches/1.5/NEWS Mon Apr 28 18:39:34 2008
@@ -1,5 +1,11 @@
-Overview of changes from 1.5.0-beta 1.5.0-beta2
-===============================================
+Overview of changes from 1.5.0-beta2 to 1.5.0
+=============================================
+* Fixes
+ - Fix absense of 'uim' feature provision in early initialization stages
+
+
+Overview of changes from 1.5.0-beta to 1.5.0-beta2
+==================================================
* Enhancements
- uim.el
* Improve candidates displaying on small window
@@ -36,8 +42,8 @@
* Plug memleak
-Overview of changes from 1.5.0-alpha 1.5.0-beta
-===============================================
+Overview of changes from 1.5.0-alpha to 1.5.0-beta
+==================================================
* New features
- Provide 'uim' on Scheme (See "Feature provision of 'uim'" of
doc/COMPATIBILITY for further information)
Modified: branches/1.5/RELNOTE
==============================================================================
--- branches/1.5/RELNOTE (original)
+++ branches/1.5/RELNOTE Mon Apr 28 18:39:34 2008
@@ -1,13 +1,10 @@
-uim 1.5.0-beta2 Release Note
-============================
+uim 1.5.0 Release Note
+======================
About This Release
------------------
-This distribution of uim 1.5.0-beta2 is a preview release for testing
-purpose. Since it may contain serious unknown problems, it should not
-be used for important work. For such situations, use our latest stable
-release uim 1.4.2.
+This distribution of uim 1.5.0 is latest stable release of uim.
This release achieved both considerable internal improvement and many
user-visible new feature additions.
Modified: branches/1.5/doc/COMPATIBILITY
==============================================================================
--- branches/1.5/doc/COMPATIBILITY (original)
+++ branches/1.5/doc/COMPATIBILITY Mon Apr 28 18:39:34 2008
@@ -60,9 +60,9 @@
Summary: Feature provision of 'uim'
Affects: uim developers, IM developers
Updates:
-Version: 1.5.0-beta
-Revision: ac5370
-Date: 2008-03-31
+Version: 1.5.0
+Revision: ac5370, ac5464
+Date: 2008-03-31, 2008-04-29
Modifier: YamaKen
Related:
URL:
Modified: branches/1.5/make-dist.sh
==============================================================================
--- branches/1.5/make-dist.sh (original)
+++ branches/1.5/make-dist.sh Mon Apr 28 18:39:34 2008
@@ -10,7 +10,7 @@
SSCM_URL="${TAGS_REPOSITORY}/sigscheme-0.8.3"
#LIBGCROOTS_URL="${LIBGCROOTS_REPOSITORY}"
LIBGCROOTS_URL="${TAGS_REPOSITORY}/libgcroots-0.2.1"
-RELEASE_SUFFIX="-beta2"
+RELEASE_SUFFIX=""
CONF_COMMON="--enable-maintainer-mode --disable-warnings-into-error"
CONF_NONE="$CONF_COMMON --disable-debug --disable-fep --disable-emacs
--disable-gnome-applet --disable-kde-applet --disable-pref
--disable-dict --without-anthy --without-canna --without-mana
--without-prime --without-m17nlib --without-scim --without-gtk2
--without-gnome2 --without-qt --without-qt-immodule
--disable-compat-scm --without-eb --without-libedit"
Modified: branches/1.5/uim/uim.c
==============================================================================
--- branches/1.5/uim/uim.c (original)
+++ branches/1.5/uim/uim.c Mon Apr 28 18:39:34 2008
@@ -125,6 +125,10 @@
uim_scm_gc_protect(&protected0);
uim_scm_gc_protect(&protected1);
+ /* To allow (cond-expand (uim ...)) in early initialization stages,
+ * provision of the "uim" should be performed as early as possible. */
+ uim_scm_callf("provide", "s", "uim");
+
uim_init_im_subrs();
uim_init_intl_subrs();
uim_init_posix_subrs();
@@ -152,7 +156,6 @@
uim_scm_set_lib_path(scm_files);
uim_scm_require_file("init.scm");
- uim_scm_callf("provide", "s", "uim");
uim_initialized = UIM_TRUE;
