*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index adfe483..356f97a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-22  Marius Vollmer  <mvo@zagadka.de>
+
+       * configure.in: Add AM_GNU_GETTEXT invocation.  From Bruno Haible.
+ 
 2004-09-21  Marius Vollmer  <mvo@zagadka.de>
 
        * acinclude.m4 (ACX_PTHREAD): New.

diff --git a/NEWS b/NEWS
index 218bc32..eea6542 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -664,6 +664,11 @@ code.
 Use scm_is_eq for new code, which fits better into the naming
 conventions.
 
+** The macros SCM_CONSP, SCM_NCONSP, SCM_NULLP, and SCM_NNULLP have
+   been discouraged.
+
+Use the function scm_is_pair or scm_is_null instead.
+
 ** The functions scm_round and scm_truncate have been deprecated and
    are now available as scm_c_round and scm_c_truncate, respectively.
 

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 8d04f00..bd90070 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,33 @@
+2004-09-22  Marius Vollmer  <mvo@zagadka.de>
+
+       From Jan Nieuwenhuizen <janneke@gnu.org> and Bruno Haible
+       <bruno@clisp.org>:
+
+       * i18n.c: Handle --disable-nls (thanks Bruno).
+
+       * posix.c (scm_init_posix): Add LC_PAPER, LC_NAME, LC_ADDRESS,
+       LC_TELEPHONE, LC_MEASUREMENT, LC_IDENTIFICATION.
+
+       * i18n.c (scm_i_to_lc_category): New name and export.  Support all
+       LC categories.
+
+       * posix.c (s_scm_setlocale): Use it.
+
+       * i18n.h, i18n.c (scm_textdomain, scm_bindtextdomain,
+       scm_bind_textdomain_codeset): Make wrappers similar to C function
+       they wrap.
+
+       * i18n.h: New file.
+       * i18n.c: New file.
+       * gettext.h: New file, taken from GNU gettext.
+       * init.c: Include libguile/i18n.h.
+       (scm_init_guile_1): Add call to scm_init_i18n().
+       * Makefile.am (libguile_la_SOURCES): Add i18n.c.
+       (DOT_X_FILES): Add i18n.x.
+       (DOT_DOC_FILES): Add i18n.doc.
+       (libguile_la_LDFLAGS): Add @LTLIBINTL@.
+       (modinclude_HEADERS): Add i18n.h.
+
 2004-09-22  Marius Vollmer  <mvo@zagadka.de>
 
        * gh_list.c: Replaced SCM_CAR, etc with scm_car, etc.