[PATCH] Rename xft_gauge to xft_gauges.
15 years, 8 months
The XEmacs Package Smoketest
The XEmacs Package Smoketest
Hi,
Fix typo. Changes to the generated configure is not included.
# HG changeset patch
# User Mats Lidell <matsl(a)xemacs.org>
# Date 1217798491 -7200
# Node ID f863b2ee146f38e65e5595bbfb8f9788c052ba3e
# Parent 772c80e0e18073f34cb1bb67cff333a852a07d37
Rename xft_gauge to xft_gauges.
diff -r 772c80e0e180 -r f863b2ee146f ChangeLog
--- a/ChangeLog Sun Aug 03 22:00:52 2008 +0200
+++ b/ChangeLog Sun Aug 03 23:21:31 2008 +0200
＠＠ -1,4 +1,6 ＠＠
2008-08-03 Mats Lidell <matsl(a)xemacs.org>
+
+ * configure.ac: Fix typo xft_gauge to xft_gauges
* configure.ac (XE_COMPLEX_ARG): Use different defaults for
with-xft and without-xft.
diff -r 772c80e0e180 -r f863b2ee146f configure.ac
--- a/configure.ac Sun Aug 03 22:00:52 2008 +0200
+++ b/configure.ac Sun Aug 03 23:21:31 2008 +0200
＠＠ -3541,7 +3541,7 ＠＠
AC_DEFINE(HAVE_FONTCONFIG)
AC_DEFINE(USE_XFT)
dnl Due to interactions with other libraries, must postpone AC_DEFINE
- dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE.
+ dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGES.
unset xft_includes_found
fi
fi
＠＠ -4430,11 +4430,11 ＠＠
fi
fi
dnl this is not in xft reloaded #3
-if test "$with_xft_gauge" != "no" ; then
+if test "$with_xft_gauges" != "no" ; then
if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
- with_xft_gauge="yes"
- else
- with_xft_gauge="no"
+ with_xft_gauges="yes"
+ else
+ with_xft_gauges="no"
fi
fi
＠＠ -4527,7 +4527,7 ＠＠
test "$with_xft_menubars" = "yes" && AC_DEFINE(USE_XFT_MENUBARS)
test "$with_xft_tabs" = "yes" && AC_DEFINE(USE_XFT_TABS)
-test "$with_xft_gauge" = "yes" && AC_DEFINE(USE_XFT_GAUGE)
+test "$with_xft_gauges" = "yes" && AC_DEFINE(USE_XFT_GAUGES)
dnl ----------------------
dnl Mule-dependent options
＠＠ -6079,7 +6079,7 ＠＠
echo " - Using Xft to render antialiased fonts in tab controls."
echo " WARNING: This feature will be replaced with a face."
fi
-if test "$with_xft_gauge" = "yes"; then
+if test "$with_xft_gauges" = "yes"; then
echo " - Using Xft to render antialiased fonts in progress bars."
echo " WARNING: This feature will be replaced with a face."
echo " WARNING: This feature not yet implemented; setting ignored."
diff -r 772c80e0e180 -r f863b2ee146f src/ChangeLog
--- a/src/ChangeLog Sun Aug 03 22:00:52 2008 +0200
+++ b/src/ChangeLog Sun Aug 03 23:21:31 2008 +0200
＠＠ -1,3 +1,8 ＠＠
+2008-08-03 Mats Lidell <matsl(a)xemacs.org>
+
+ * config.h.in: Renamed USE_XFT_GAUGE to USE_XFT_GAUGES in sync
+ with configure.ac.
+
2008-07-20 John Paul Wallington <jpw(a)pobox.com>
* nt.c (Fmswindows_short_file_name, Fmswindows_long_file_name):
diff -r 772c80e0e180 -r f863b2ee146f src/config.h.in
--- a/src/config.h.in Sun Aug 03 22:00:52 2008 +0200
+++ b/src/config.h.in Sun Aug 03 23:21:31 2008 +0200
＠＠ -225,7 +225,7 ＠＠
/* Per-widget stuff will go away? */
#undef USE_XFT_MENUBARS
#undef USE_XFT_TABS
-#undef USE_XFT_GAUGE
+#undef USE_XFT_GAUGES
/* Defines for building X applications */
#ifdef HAVE_X_WINDOWS
Yours
--
%% Mats
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 1 comments
commit: Rename xft_gauge to xft_gauges.
15 years, 8 months
Mats Lidell
Mats Lidell
changeset: 4497:f863b2ee146f38e65e5595bbfb8f9788c052ba3e
user: Mats Lidell <matsl(a)xemacs.org>
date: Sun Aug 03 23:21:31 2008 +0200
files: ChangeLog configure configure.ac src/ChangeLog src/config.h.in
description:
Rename xft_gauge to xft_gauges.
diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e ChangeLog
--- a/ChangeLog Sun Aug 03 22:00:52 2008 +0200
+++ b/ChangeLog Sun Aug 03 23:21:31 2008 +0200
＠＠ -1,4 +1,6 ＠＠ 2008-08-03 Mats Lidell <matsl(a)xemacs.o
2008-08-03 Mats Lidell <matsl(a)xemacs.org>
+
+ * configure.ac: Fix typo xft_gauge to xft_gauges
* configure.ac (XE_COMPLEX_ARG): Use different defaults for
with-xft and without-xft.
diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e configure
--- a/configure Sun Aug 03 22:00:52 2008 +0200
+++ b/configure Sun Aug 03 23:21:31 2008 +0200
＠＠ -27333,11 +27333,11 ＠＠ if test "$with_xft_tabs" != "no" ; then
with_xft_tabs="no"
fi
fi
-if test "$with_xft_gauge" != "no" ; then
+if test "$with_xft_gauges" != "no" ; then
if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
- with_xft_gauge="yes"
+ with_xft_gauges="yes"
else
- with_xft_gauge="no"
+ with_xft_gauges="no"
fi
fi
＠＠ -27529,8 +27529,8 ＠＠ test "$with_xft_tabs" = "yes" && cat >>
#define USE_XFT_TABS 1
_ACEOF
-test "$with_xft_gauge" = "yes" && cat >>confdefs.h <<\_ACEOF
-#define USE_XFT_GAUGE 1
+test "$with_xft_gauges" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define USE_XFT_GAUGES 1
_ACEOF
＠＠ -39583,7 +39583,7 ＠＠ if test "$with_xft_tabs" = "yes"; then
echo " - Using Xft to render antialiased fonts in tab controls."
echo " WARNING: This feature will be replaced with a face."
fi
-if test "$with_xft_gauge" = "yes"; then
+if test "$with_xft_gauges" = "yes"; then
echo " - Using Xft to render antialiased fonts in progress bars."
echo " WARNING: This feature will be replaced with a face."
echo " WARNING: This feature not yet implemented; setting ignored."
diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e configure.ac
--- a/configure.ac Sun Aug 03 22:00:52 2008 +0200
+++ b/configure.ac Sun Aug 03 23:21:31 2008 +0200
＠＠ -3541,7 +3541,7 ＠＠ extern Bool XRegisterIMInstantiateCallba
AC_DEFINE(HAVE_FONTCONFIG)
AC_DEFINE(USE_XFT)
dnl Due to interactions with other libraries, must postpone AC_DEFINE
- dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE.
+ dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGES.
unset xft_includes_found
fi
fi
＠＠ -4430,11 +4430,11 ＠＠ if test "$with_xft_tabs" != "no" ; then
fi
fi
dnl this is not in xft reloaded #3
-if test "$with_xft_gauge" != "no" ; then
+if test "$with_xft_gauges" != "no" ; then
if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
- with_xft_gauge="yes"
+ with_xft_gauges="yes"
else
- with_xft_gauge="no"
+ with_xft_gauges="no"
fi
fi
＠＠ -4527,7 +4527,7 ＠＠ test "$enable_widgets" = "motif" &&
test "$with_xft_menubars" = "yes" && AC_DEFINE(USE_XFT_MENUBARS)
test "$with_xft_tabs" = "yes" && AC_DEFINE(USE_XFT_TABS)
-test "$with_xft_gauge" = "yes" && AC_DEFINE(USE_XFT_GAUGE)
+test "$with_xft_gauges" = "yes" && AC_DEFINE(USE_XFT_GAUGES)
dnl ----------------------
dnl Mule-dependent options
＠＠ -6079,7 +6079,7 ＠＠ if test "$with_xft_tabs" = "yes"; then
echo " - Using Xft to render antialiased fonts in tab controls."
echo " WARNING: This feature will be replaced with a face."
fi
-if test "$with_xft_gauge" = "yes"; then
+if test "$with_xft_gauges" = "yes"; then
echo " - Using Xft to render antialiased fonts in progress bars."
echo " WARNING: This feature will be replaced with a face."
echo " WARNING: This feature not yet implemented; setting ignored."
diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e src/ChangeLog
--- a/src/ChangeLog Sun Aug 03 22:00:52 2008 +0200
+++ b/src/ChangeLog Sun Aug 03 23:21:31 2008 +0200
＠＠ -1,3 +1,8 ＠＠ 2008-07-20 John Paul Wallington <jpw＠p
+2008-08-03 Mats Lidell <matsl(a)xemacs.org>
+
+ * config.h.in: Renamed USE_XFT_GAUGE to USE_XFT_GAUGES in sync
+ with configure.ac.
+
2008-07-20 John Paul Wallington <jpw(a)pobox.com>
* nt.c (Fmswindows_short_file_name, Fmswindows_long_file_name):
diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e src/config.h.in
--- a/src/config.h.in Sun Aug 03 22:00:52 2008 +0200
+++ b/src/config.h.in Sun Aug 03 23:21:31 2008 +0200
＠＠ -225,7 +225,7 ＠＠ things are arranged in config.h.in. In
/* Per-widget stuff will go away? */
#undef USE_XFT_MENUBARS
#undef USE_XFT_TABS
-#undef USE_XFT_GAUGE
+#undef USE_XFT_GAUGES
/* Defines for building X applications */
#ifdef HAVE_X_WINDOWS
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: with-xft defaults to xft being used with a default setting.
15 years, 8 months
Mats Lidell
Mats Lidell
changeset: 4496:772c80e0e18073f34cb1bb67cff333a852a07d37
parent: 4488:6b0000935adc3f79cb189350d6014d4b4aff734e
user: Mats Lidell <matsl(a)xemacs.org>
date: Sun Aug 03 22:00:52 2008 +0200
files: ChangeLog configure configure.ac lib-src/config.values.in
description:
with-xft defaults to xft being used with a default setting.
If with-xft is not set it is equal to calling configure with-xft=no
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 ChangeLog
--- a/ChangeLog Sat Jul 26 13:50:27 2008 +0300
+++ b/ChangeLog Sun Aug 03 22:00:52 2008 +0200
＠＠ -1,3 +1,8 ＠＠ 2008-07-06 Ville Skyttä <scop(a)xemacs.o
+2008-08-03 Mats Lidell <matsl(a)xemacs.org>
+
+ * configure.ac (XE_COMPLEX_ARG): Use different defaults for
+ with-xft and without-xft.
+
2008-07-06 Ville Skyttä <scop(a)xemacs.org>
* configure.ac (xe_fst):
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 configure
--- a/configure Sat Jul 26 13:50:27 2008 +0300
+++ b/configure Sun Aug 03 22:00:52 2008 +0200
＠＠ -1538,7 +1538,8 ＠＠ Window-system options
`gauges'. Prefix component with `no' to disable its
use of Xft. Requires X11, Xft, Xrender, freetype,
and fontconfig support. Default is `noemacs,
- nomenubars, notabs, nogauges'.
+ nomenubars, notabs, nogauges'. The default when
+ selected is `emacs, nomenubars, notabs, nogauges'.
--with-gtk Support GTK on the X Window System. (EXPERIMENTAL)
--with-gnome Support GNOME on the X Window System. (EXPERIMENTAL)
--with-msw Support MS Windows as a window system (only under
＠＠ -2888,12 +2889,12 ＠＠ fi;
fi;
_xft_notfirst=""
-_xft_emacs_default=no
+_xft_emacs_default=yes
_xft_menubars_default=no
_xft_tabs_default=no
_xft_gauges_default=no
_xft_types="emacs menubars tabs gauges"
-_xft_default="noemacs,nomenubars,notabs,nogauges"
+_xft_default="emacs,nomenubars,notabs,nogauges"
# If --with-xft or --without-xft were given then copy the value to the
# equivalent enable_xft variable.
＠＠ -2970,7 +2971,7 ＠＠ for y in $_xft_types; do
eval "enable_xft_$y=\$_xft_${y}_default"
unset _xft_${y}_default
done
-
+with_xft_emacs=no
fi;
# If --with-gtk or --without-gtk were given then copy the value to the
# equivalent enable_gtk variable.
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 configure.ac
--- a/configure.ac Sat Jul 26 13:50:27 2008 +0300
+++ b/configure.ac Sun Aug 03 22:00:52 2008 +0200
＠＠ -690,9 +690,10 ＠＠ XE_COMPLEX_ARG([xft],
[Xft],
[`emacs' (buffers), `menubars', `tabs', and `gauges'],
[X11, Xft, Xrender, freetype, and fontconfig],
- [`noemacs, nomenubars, notabs, nogauges'])],
- [],[],
- [XE_COMPLEX_OPTION([emacs],[no]),
+ [`noemacs, nomenubars, notabs, nogauges'.
+ The default when selected is `emacs, nomenubars, notabs, nogauges'])],
+ [],[with_xft_emacs=no],
+ [XE_COMPLEX_OPTION([emacs],[yes]),
XE_COMPLEX_OPTION([menubars],[no]),
XE_COMPLEX_OPTION([tabs],[no]),
XE_COMPLEX_OPTION([gauges],[no])])
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 lib-src/config.values.in
--- a/lib-src/config.values.in Sat Jul 26 13:50:27 2008 +0300
+++ b/lib-src/config.values.in Sun Aug 03 22:00:52 2008 +0200
＠＠ -15,178 +15,6 ＠＠
;;; Variables defined in configure by AC_SUBST follow:
;;; (These are used in Makefiles)
-ALLOCA "＠ALLOCA＠"
-ARCHLIBDIR "＠ARCHLIBDIR＠"
-ARCHLIBDIR_USER_DEFINED "＠ARCHLIBDIR_USER_DEFINED＠"
-CC "＠CC＠"
-CFLAGS "＠CFLAGS＠"
-CPP "＠CPP＠"
-CPPFLAGS "＠CPPFLAGS＠"
-DEFS "＠DEFS＠"
-DOCDIR "＠DOCDIR＠"
-DOCDIR_USER_DEFINED "＠DOCDIR_USER_DEFINED＠"
-EARLY_PACKAGE_DIRECTORIES "＠EARLY_PACKAGE_DIRECTORIES＠"
-EARLY_PACKAGE_DIRECTORIES_USER_DEFINED "＠EARLY_PACKAGE_DIRECTORIES_USER_DEFINED＠"
-ECHO_C "＠ECHO_C＠"
-ECHO_N "＠ECHO_N＠"
-ECHO_T "＠ECHO_T＠"
-EGREP "＠EGREP＠"
-ETCDIR "＠ETCDIR＠"
-ETCDIR_USER_DEFINED "＠ETCDIR_USER_DEFINED＠"
-EXEC_PREFIX "＠EXEC_PREFIX＠"
-EXEC_PREFIX_USER_DEFINED "＠EXEC_PREFIX_USER_DEFINED＠"
-EXEEXT "＠EXEEXT＠"
-GTK_CONFIG "＠GTK_CONFIG＠"
-INFODIR "＠INFODIR＠"
-INFODIR_USER_DEFINED "＠INFODIR_USER_DEFINED＠"
-INFOPATH "＠INFOPATH＠"
-INFOPATH_USER_DEFINED "＠INFOPATH_USER_DEFINED＠"
-INSTALL "＠INSTALL＠"
-INSTALLPATH "＠INSTALLPATH＠"
-INSTALL_ARCH_DEP_SUBDIR "＠INSTALL_ARCH_DEP_SUBDIR＠"
-INSTALL_DATA "＠INSTALL_DATA＠"
-INSTALL_PROGRAM "＠INSTALL_PROGRAM＠"
-INSTALL_SCRIPT "＠INSTALL_SCRIPT＠"
-LAST_PACKAGE_DIRECTORIES "＠LAST_PACKAGE_DIRECTORIES＠"
-LAST_PACKAGE_DIRECTORIES_USER_DEFINED "＠LAST_PACKAGE_DIRECTORIES_USER_DEFINED＠"
-LATE_PACKAGE_DIRECTORIES "＠LATE_PACKAGE_DIRECTORIES＠"
-LATE_PACKAGE_DIRECTORIES_USER_DEFINED "＠LATE_PACKAGE_DIRECTORIES_USER_DEFINED＠"
-LDFLAGS "＠LDFLAGS＠"
-LIBOBJS "＠LIBOBJS＠"
-LIBS "＠LIBS＠"
-LIBSTDCPP "＠LIBSTDCPP＠"
-LISPDIR "＠LISPDIR＠"
-LISPDIR_USER_DEFINED "＠LISPDIR_USER_DEFINED＠"
-LN_S "＠LN_S＠"
-LTLIBOBJS "＠LTLIBOBJS＠"
-MAKE_DOCFILE "＠MAKE_DOCFILE＠"
-MAKE_SUBDIR "＠MAKE_SUBDIR＠"
-MODARCHDIR "＠MODARCHDIR＠"
-MODCFLAGS "＠MODCFLAGS＠"
-MODULEDIR "＠MODULEDIR＠"
-MODULEDIR_USER_DEFINED "＠MODULEDIR_USER_DEFINED＠"
-MOD_CC "＠MOD_CC＠"
-MOD_INSTALL_PROGRAM "＠MOD_INSTALL_PROGRAM＠"
-OBJECT_TO_BUILD "＠OBJECT_TO_BUILD＠"
-OBJEXT "＠OBJEXT＠"
-PACKAGE_BUGREPORT "＠PACKAGE_BUGREPORT＠"
-PACKAGE_NAME "＠PACKAGE_NAME＠"
-PACKAGE_PATH "＠PACKAGE_PATH＠"
-PACKAGE_PATH_USER_DEFINED "＠PACKAGE_PATH_USER_DEFINED＠"
-PACKAGE_STRING "＠PACKAGE_STRING＠"
-PACKAGE_TARNAME "＠PACKAGE_TARNAME＠"
-PACKAGE_VERSION "＠PACKAGE_VERSION＠"
-PATH_SEPARATOR "＠PATH_SEPARATOR＠"
-PREFIX "＠PREFIX＠"
-PREFIX_USER_DEFINED "＠PREFIX_USER_DEFINED＠"
-PROGNAME "＠PROGNAME＠"
-RANLIB "＠RANLIB＠"
-RECURSIVE_MAKE_ARGS "＠RECURSIVE_MAKE_ARGS＠"
-SET_MAKE "＠SET_MAKE＠"
-SHELL "＠SHELL＠"
-SITELISPDIR "＠SITELISPDIR＠"
-SITELISPDIR_USER_DEFINED "＠SITELISPDIR_USER_DEFINED＠"
-SITEMODULEDIR "＠SITEMODULEDIR＠"
-SITEMODULEDIR_USER_DEFINED "＠SITEMODULEDIR_USER_DEFINED＠"
-SRC_SUBDIR_DEPS "＠SRC_SUBDIR_DEPS＠"
-SUBDIR_MAKEFILES "＠SUBDIR_MAKEFILES＠"
-XEMACS_CC "＠XEMACS_CC＠"
-XE_CFLAGS "＠XE_CFLAGS＠"
-X_CFLAGS "＠X_CFLAGS＠"
-X_EXTRA_LIBS "＠X_EXTRA_LIBS＠"
-X_LIBS "＠X_LIBS＠"
-X_PRE_LIBS "＠X_PRE_LIBS＠"
-YACC "＠YACC＠"
-abs_builddir "＠abs_builddir＠"
-abs_srcdir "＠abs_srcdir＠"
-abs_top_builddir "＠abs_top_builddir＠"
-abs_top_srcdir "＠abs_top_srcdir＠"
-ac_ct_CC "＠ac_ct_CC＠"
-ac_ct_RANLIB "＠ac_ct_RANLIB＠"
-archlibdir "＠archlibdir＠"
-bindir "＠bindir＠"
-bitmapdir "＠bitmapdir＠"
-blddir "＠blddir＠"
-build "＠build＠"
-build_alias "＠build_alias＠"
-build_cpu "＠build_cpu＠"
-build_os "＠build_os＠"
-build_vendor "＠build_vendor＠"
-builddir "＠builddir＠"
-c_switch_all "＠c_switch_all＠"
-c_switch_general "＠c_switch_general＠"
-c_switch_window_system "＠c_switch_window_system＠"
-canna_libs "＠canna_libs＠"
-configuration "＠configuration＠"
-configure_input "＠configure_input＠"
-datadir "＠datadir＠"
-datarootdir "＠datarootdir＠"
-dll_cflags "＠dll_cflags＠"
-dll_ld "＠dll_ld＠"
-dll_ldflags "＠dll_ldflags＠"
-dll_ldo "＠dll_ldo＠"
-dll_post "＠dll_post＠"
-dnd_objs "＠dnd_objs＠"
-docdir "＠docdir＠"
-dynodump_arch "＠dynodump_arch＠"
-early_packages "＠early_packages＠"
-etcdir "＠etcdir＠"
-exec_prefix "＠exec_prefix＠"
-extra_includes "＠extra_includes＠"
-extra_objs "＠extra_objs＠"
-have_esd_config "＠have_esd_config＠"
-host_alias "＠host_alias＠"
-includedir "＠includedir＠"
-infodir "＠infodir＠"
-infopath "＠infopath＠"
-install_pp "＠install_pp＠"
-inststaticdir "＠inststaticdir＠"
-instvardir "＠instvardir＠"
-internal_makefile_list "＠internal_makefile_list＠"
-last_packages "＠last_packages＠"
-late_packages "＠late_packages＠"
-ld "＠ld＠"
-ld_dynamic_link_flags "＠ld_dynamic_link_flags＠"
-ld_libs_all "＠ld_libs_all＠"
-ld_libs_general "＠ld_libs_general＠"
-ld_libs_window_system "＠ld_libs_window_system＠"
-ld_switch_all "＠ld_switch_all＠"
-ld_switch_general "＠ld_switch_general＠"
-ld_switch_shared "＠ld_switch_shared＠"
-ld_switch_window_system "＠ld_switch_window_system＠"
-ldap_libs "＠ldap_libs＠"
-lib_gcc "＠lib_gcc＠"
-libdir "＠libdir＠"
-libexecdir "＠libexecdir＠"
-libs_xauth "＠libs_xauth＠"
-lispdir "＠lispdir＠"
-localstatedir "＠localstatedir＠"
-lwlib_objs "＠lwlib_objs＠"
-machfile "＠machfile＠"
-mandir "＠mandir＠"
-moduledir "＠moduledir＠"
-native_sound_lib "＠native_sound_lib＠"
-oldincludedir "＠oldincludedir＠"
-opsysfile "＠opsysfile＠"
-package_path "＠package_path＠"
-postgresql_libs "＠postgresql_libs＠"
-prefix "＠prefix＠"
-program_transform_name "＠program_transform_name＠"
-sbindir "＠sbindir＠"
-sharedstatedir "＠sharedstatedir＠"
-sitelispdir "＠sitelispdir＠"
-sitemoduledir "＠sitemoduledir＠"
-sound_cflags "＠sound_cflags＠"
-srcdir "＠srcdir＠"
-start_files "＠start_files＠"
-start_flags "＠start_flags＠"
-statedir "＠statedir＠"
-sysconfdir "＠sysconfdir＠"
-target_alias "＠target_alias＠"
-top_builddir "＠top_builddir＠"
-top_srcdir "＠top_srcdir＠"
-version "＠version＠"
-with_modules "＠with_modules＠"
;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow:
;;; (These are used in C code)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Correct a test failure now the XEmacs-specific Arabic charsets are gone.
15 years, 8 months
Aidan Kehoe
Aidan Kehoe
changeset: 4495:c95c06ee1e9daec9cd268f3603b1059d9068d656
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sun Aug 10 12:15:56 2008 +0200
files: etc/ChangeLog etc/HELLO tests/ChangeLog tests/automated/mule-tests.el
description:
Correct a test failure now the XEmacs-specific Arabic charsets are gone.
etc/ChangeLog addition:
2008-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
* HELLO: Add a coding cookie, now the UTF-8 sequences prevent the
file being recognised as ISO-2022-7 automatically.
tests/ChangeLog addition:
2008-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/mule-tests.el (featurep): Update the list of character
sets in etc/HELLO to reflect that we've deleted the
XEmacs-specific Arabic character sets.
diff -r ea66743ff20155e3a4e479120d7bd68bfe12ac9f -r c95c06ee1e9daec9cd268f3603b1059d9068d656 etc/ChangeLog
--- a/etc/ChangeLog Sun Aug 10 12:03:10 2008 +0200
+++ b/etc/ChangeLog Sun Aug 10 12:15:56 2008 +0200
＠＠ -1,3 +1,8 ＠＠ 2008-08-05 Aidan Kehoe <kehoea＠parhasa
+2008-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * HELLO: Add a coding cookie, now the UTF-8 sequences prevent the
+ file being recognised as ISO-2022-7 automatically.
+
2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
* HELLO: Encode the Arabic using UTF-8 sequences, not ISO-8859-6.
diff -r ea66743ff20155e3a4e479120d7bd68bfe12ac9f -r c95c06ee1e9daec9cd268f3603b1059d9068d656 etc/HELLO
--- a/etc/HELLO Sun Aug 10 12:03:10 2008 +0200
+++ b/etc/HELLO Sun Aug 10 12:15:56 2008 +0200
＠＠ -1,3 +1,5 ＠＠ You need many fonts to read all.
+-*- coding: iso-2022-7 -*-
+
You need many fonts to read all.
Please correct this incomplete list and add more!
diff -r ea66743ff20155e3a4e479120d7bd68bfe12ac9f -r c95c06ee1e9daec9cd268f3603b1059d9068d656 tests/ChangeLog
--- a/tests/ChangeLog Sun Aug 10 12:03:10 2008 +0200
+++ b/tests/ChangeLog Sun Aug 10 12:15:56 2008 +0200
＠＠ -1,3 +1,9 ＠＠ 2008-05-21 Aidan Kehoe <kehoea＠parhasa
+2008-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/mule-tests.el (featurep): Update the list of character
+ sets in etc/HELLO to reflect that we've deleted the
+ XEmacs-specific Arabic character sets.
+
2008-05-21 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/mule-tests.el (featurep):
diff -r ea66743ff20155e3a4e479120d7bd68bfe12ac9f -r c95c06ee1e9daec9cd268f3603b1059d9068d656 tests/automated/mule-tests.el
--- a/tests/automated/mule-tests.el Sun Aug 10 12:03:10 2008 +0200
+++ b/tests/automated/mule-tests.el Sun Aug 10 12:15:56 2008 +0200
＠＠ -527,20 +527,20 ＠＠ This is a naive implementation in Lisp.
;; irrelevant.
(sort (charsets-in-region (point-min) (point-max))
#'string<)
- '(arabic-1-column arabic-2-column ascii chinese-big5-1
- chinese-gb2312 cyrillic-iso8859-5 ethiopic greek-iso8859-7
- hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212
- katakana-jisx0201 korean-ksc5601 latin-iso8859-1
- latin-iso8859-2 thai-xtis vietnamese-viscii-lower)))
+ '(ascii chinese-big5-1 chinese-gb2312 cyrillic-iso8859-5
+ ethiopic greek-iso8859-7 hebrew-iso8859-8 japanese-jisx0208
+ japanese-jisx0212 jit-ucs-charset-0 katakana-jisx0201
+ korean-ksc5601 latin-iso8859-1 latin-iso8859-2 thai-xtis
+ vietnamese-viscii-lower)))
(Assert (equal
(sort (charsets-in-string (buffer-substring (point-min)
(point-max)))
#'string<)
- '(arabic-1-column arabic-2-column ascii chinese-big5-1
- chinese-gb2312 cyrillic-iso8859-5 ethiopic greek-iso8859-7
- hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212
- katakana-jisx0201 korean-ksc5601 latin-iso8859-1
- latin-iso8859-2 thai-xtis vietnamese-viscii-lower))))
+ '(ascii chinese-big5-1 chinese-gb2312 cyrillic-iso8859-5
+ ethiopic greek-iso8859-7 hebrew-iso8859-8 japanese-jisx0208
+ japanese-jisx0212 jit-ucs-charset-0 katakana-jisx0201
+ korean-ksc5601 latin-iso8859-1 latin-iso8859-2 thai-xtis
+ vietnamese-viscii-lower))))
;;---------------------------------------------------------------
;; Language environments, and whether the specified values are sane.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Remove mule/cyril-util.el from the 21.5 trunk.
15 years, 8 months
Aidan Kehoe
Aidan Kehoe
changeset: 4493:89406c31b12521258c83389d19f80440a3a7ce48
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sat Aug 09 12:13:19 2008 +0200
files: lisp/ChangeLog lisp/mule/cyril-util.el
description:
Remove mule/cyril-util.el from the 21.5 trunk.
2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/cyril-util.el: Remove. Use the version in packages instead.
diff -r 121aadac896ec8196ca90059f99e957c2ccef516 -r 89406c31b12521258c83389d19f80440a3a7ce48 lisp/ChangeLog
--- a/lisp/ChangeLog Fri Aug 08 21:28:13 2008 +0200
+++ b/lisp/ChangeLog Sat Aug 09 12:13:19 2008 +0200
＠＠ -1,3 +1,7 ＠＠ 2008-08-08 Aidan Kehoe <kehoea＠parhasa
+2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * mule/cyril-util.el: Remove. Use the version in packages instead.
+
2008-08-08 Aidan Kehoe <kehoea(a)parhasard.net>
* unicode.el:
diff -r 121aadac896ec8196ca90059f99e957c2ccef516 -r 89406c31b12521258c83389d19f80440a3a7ce48 lisp/mule/cyril-util.el
--- a/lisp/mule/cyril-util.el Fri Aug 08 21:28:13 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
＠＠ -1,193 +0,0 ＠＠
-;;; cyril-util.el --- utilities for Cyrillic scripts -*- coding: iso-2022-7bit; -*-
-
-;; Copyright (C) 1997 Free Software Foundation, Inc.
-;; Copyright (C) 2002 Ben Wing.
-
-;; Keywords: mule, multilingual, Cyrillic
-
-;; This file is part of XEmacs.
-
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
-
-;;; Synched up with: Emacs 21.1 (language/cyril-util.el).
-
-;;; Commentary:
-
-;;; #### Remove this, use the one in packages instead, but with the below
-;;; standard-display-cyrillic-translit. This file is unfortunately shadowed
-;;; if you have the Mule packages installed!
-
-;;; Code:
-
-
-;; Display
-
-;; Written by Valery Alexeev <valery(a)math.uga.edu>.
-
-(defvar cyrillic-language-alist
- '(("Belorussian") ("Bulgarian") ("Macedonian") ("Russian") ("Serbian")
- ("Ukrainian"))
- "*List of known Cyrillic languages")
-
-;;;###autoload
-(defun standard-display-cyrillic-translit (&optional cyrillic-language
- disable)
- "Display a cyrillic buffer using a transliteration.
-For readability, the table is slightly
-different from the one used for the input method `cyrillic-translit'.
-
-The argument is a string which specifies which language you are using;
-that affects the choice of transliterations slightly.
-Possible values are listed in 'cyrillic-language-alist'.
-
-Specifying a prefix arg, by preceding
-\\[standard-display-cyrillic-translit] with \\[universal-argument]
-turns off Cyrillic display. Noninteractively, the DISABLE argument
-does the same thing. "
- (interactive
- (list
- (let* ((completion-ignore-case t)
- (default-language (if (assoc-ignore-case
- current-language-environment
- cyrillic-language-alist)
- current-language-environment
- "Russian")))
- (or current-prefix-arg
- (completing-read
- (format "Cyrillic language (default %s): " default-language)
- cyrillic-language-alist nil t nil nil default-language)))))
- (frob-display-table
- (lambda (display-table)
- (if (or disable current-prefix-arg)
- (if (char-table-p display-table)
- (remove-char-table 'cyrillic-iso8859-5 display-table))
- (put-display-table ?,LP(B "a" display-table)
- (put-display-table ?,LQ(B "b" display-table)
- (put-display-table ?,LR(B "v" display-table)
- (put-display-table ?,LS(B "g" display-table)
- (put-display-table ?,LT(B "d" display-table)
- (put-display-table ?,LU(B "e" display-table)
- (put-display-table ?,Lq(B "yo" display-table)
- (put-display-table ?,LV(B "zh" display-table)
- (put-display-table ?,LW(B "z" display-table)
- (put-display-table ?,LX(B "i" display-table)
- (put-display-table ?,LY(B "j" display-table)
- (put-display-table ?,LZ(B "k" display-table)
- (put-display-table ?,L[(B "l" display-table)
- (put-display-table ?,L\(B "m" display-table)
- (put-display-table ?,L](B "n" display-table)
- (put-display-table ?,L^(B "o" display-table)
- (put-display-table ?,L_(B "p" display-table)
- (put-display-table ?,L`(B "r" display-table)
- (put-display-table ?,La(B "s" display-table)
- (put-display-table ?,Lb(B "t" display-table)
- (put-display-table ?,Lc(B "u" display-table)
- (put-display-table ?,Ld(B "f" display-table)
- (put-display-table ?,Le(B "kh" display-table)
- (put-display-table ?,Lf(B "ts" display-table)
- (put-display-table ?,Lg(B "ch" display-table)
- (put-display-table ?,Lh(B "sh" display-table)
- (put-display-table ?,Li(B "sch" display-table)
- (put-display-table ?,Lj(B "~" display-table)
- (put-display-table ?,Lk(B "y" display-table)
- (put-display-table ?,Ll(B "'" display-table)
- (put-display-table ?,Lm(B "e'" display-table)
- (put-display-table ?,Ln(B "yu" display-table)
- (put-display-table ?,Lo(B "ya" display-table)
- (put-display-table ?,L0(B "A" display-table)
- (put-display-table ?,L1(B "B" display-table)
- (put-display-table ?,L2(B "V" display-table)
- (put-display-table ?,L3(B "G" display-table)
- (put-display-table ?,L4(B "D" display-table)
- (put-display-table ?,L5(B "E" display-table)
- (put-display-table ?,L!(B "Yo" display-table)
- (put-display-table ?,L6(B "Zh" display-table)
- (put-display-table ?,L7(B "Z" display-table)
- (put-display-table ?,L8(B "I" display-table)
- (put-display-table ?,L9(B "J" display-table)
- (put-display-table ?,L:(B "K" display-table)
- (put-display-table ?,L;(B "L" display-table)
- (put-display-table ?,L<(B "M" display-table)
- (put-display-table ?,L=(B "N" display-table)
- (put-display-table ?,L>(B "O" display-table)
- (put-display-table ?,L?(B "P" display-table)
- (put-display-table ?,L＠(B "R" display-table)
- (put-display-table ?,LA(B "S" display-table)
- (put-display-table ?,LB(B "T" display-table)
- (put-display-table ?,LC(B "U" display-table)
- (put-display-table ?,LD(B "F" display-table)
- (put-display-table ?,LE(B "Kh" display-table)
- (put-display-table ?,LF(B "Ts" display-table)
- (put-display-table ?,LG(B "Ch" display-table)
- (put-display-table ?,LH(B "Sh" display-table)
- (put-display-table ?,LI(B "Sch" display-table)
- (put-display-table ?,LJ(B "~" display-table)
- (put-display-table ?,LK(B "Y" display-table)
- (put-display-table ?,LL(B "'" display-table)
- (put-display-table ?,LM(B "E'" display-table)
- (put-display-table ?,LN(B "Yu" display-table)
- (put-display-table ?,LO(B "Ya" display-table)
- (put-display-table ?,Lt(B "ie" display-table)
- (put-display-table ?,Lw(B "i" display-table)
- (put-display-table ?,L~(B "u" display-table)
- (put-display-table ?,Lr(B "dj" display-table)
- (put-display-table ?,L{(B "chj" display-table)
- (put-display-table ?,Ls(B "gj" display-table)
- (put-display-table ?,Lu(B "s" display-table)
- (put-display-table ?,L|(B "k" display-table)
- (put-display-table ?,Lv(B "i" display-table)
- (put-display-table ?,Lx(B "j" display-table)
- (put-display-table ?,Ly(B "lj" display-table)
- (put-display-table ?,Lz(B "nj" display-table)
- (put-display-table ?,L(B "dz" display-table)
- (put-display-table ?,L$(B "Ye" display-table)
- (put-display-table ?,L'(B "Yi" display-table)
- (put-display-table ?,L.(B "U" display-table)
- (put-display-table ?,L"(B "Dj" display-table)
- (put-display-table ?,L+(B "Chj" display-table)
- (put-display-table ?,L#(B "Gj" display-table)
- (put-display-table ?,L%(B "S" display-table)
- (put-display-table ?,L,(B "K" display-table)
- (put-display-table ?,L&(B "I" display-table)
- (put-display-table ?,L((B "J" display-table)
- (put-display-table ?,L)(B "Lj" display-table)
- (put-display-table ?,L*(B "Nj" display-table)
- (put-display-table ?,L/(B "Dj" display-table)
-
- (when (equal cyrillic-language "Bulgarian")
- (put-display-table ?,Li(B "sht" display-table)
- (put-display-table ?,LI(B "Sht" display-table)
- (put-display-table ?,Ln(B "iu" display-table)
- (put-display-table ?,LN(B "Iu" display-table)
- (put-display-table ?,Lo(B "ia" display-table)
- (put-display-table ?,LO(B "Ia" display-table))
-
- (when (equal cyrillic-language "Ukrainian") ; based on the official
- ; transliteration table
- (put-display-table ?,LX(B "y" display-table)
- (put-display-table ?,L8(B "Y" display-table)
- (put-display-table ?,LY(B "i" display-table)
- (put-display-table ?,L9(B "Y" display-table)
- (put-display-table ?,Ln(B "iu" display-table)
- (put-display-table ?,Lo(B "ia" display-table)))) nil))
-;;
-(provide 'cyril-util)
-
-;; Local Variables:
-;; coding: iso-2022-7bit
-;; End:
-
-;;; cyril-util.el ends here
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[COMMIT] Update packages cyril-util.el to the version from 21.5
15 years, 8 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
This will compile under 21.4, but it won’t run. That was true of the old
version of the code, too. To get it to run under 21.4, it would be necessary
to have #'make-display-table return a char table, and to provide
#'remove-char-table.
2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
* cyril-util.el: Move changes made in the mainline development
version here:
2008-05-11 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/cyril-util.el (standard-display-cyrillic-translit):
Make the selection of the default language more sensible; change
the API a little to make a sensible default Cyrillic language
available, checking current-language-environment.
2007-07-21 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/cyril-util.el:
* mule/cyril-util.el (cyrillic-encode-koi8-r-char): Removed.
* mule/cyril-util.el (cyrillic-encode-alternativnyj-char):
Removed. No-one uses these functions in google.com/codesearch,
GNU have a comment doubting their utility, and their
implementation is trivial.
* mule/cyril-util.el (cyrillic-language-alist):
Reformatted.
* mule/cyril-util.el (standard-display-table)): Removed. It wasn't
used anyway.
* mule/cyril-util.el (standard-display-cyrillic-translit):
Rewrite it to work with character tables as display tables, and
not to abort with an error.
2003-01-09 Stephen J. Turnbull <stephen(a)xemacs.org>
* mule/cyril-util.el (cyrillic-language-alist): There is no such
language as Serbo-Croatian, according to Hrvoje, who oughtta know.
XEmacs Packages source patch:
Diff command: cvs -q diff -Nu
Files affected: mule-packages/mule-base/cyril-util.el
===================================================================
RCS
Index: mule-packages/mule-base/cyril-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/cyril-util.el,v
retrieving revision 1.2
diff -u -u -r1.2 cyril-util.el
--- mule-packages/mule-base/cyril-util.el 1999/07/23 06:55:10 1.2
+++ mule-packages/mule-base/cyril-util.el 2008/08/09 09:49:39
＠＠ -1,6 +1,7 ＠＠
-;;; cyril-util.el --- utilities for Cyrillic scripts
+;;; cyril-util.el --- utilities for Cyrillic scripts -*- coding: iso-2022-7bit; -*-
;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 2002 Ben Wing.
;; Keywords: mule, multilingual, Cyrillic
＠＠ -21,38 +22,15 ＠＠
;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
;; 02111-1307, USA.
-;;; Code:
-
-;;;###autoload
-(defun setup-cyrillic-iso-environment ()
- "Setup multilingual environment (MULE) for Cyrillic ISO-8859-5 users."
- (interactive)
- (set-language-environment "Cyrillic-ISO"))
-
-;;;###autoload
-(defun setup-cyrillic-koi8-environment ()
- "Setup multilingual environment (MULE) for Cyrillic KOI8 users."
- (interactive)
- (set-language-environment "Cyrillic-KOI8"))
+;;; Synched up with: Emacs 21.1 (language/cyril-util.el).
-;;;###autoload
-(defun setup-cyrillic-alternativnyj-environment ()
- "Setup multilingual environment (MULE) for Cyrillic ALTERNATIVNYJ users."
- (interactive)
- (set-language-environment "Cyrillic-ALT"))
+;;; Commentary:
-;;;###autoload
-(defun cyrillic-encode-koi8-r-char (char)
- "Return KOI8-R external character code of CHAR if appropriate."
- (aref (char-table-extra-slot cyrillic-koi8-r-nonascii-translation-table 0)
- char))
+;;; #### Remove this, use the one in packages instead, but with the below
+;;; standard-display-cyrillic-translit. This file is unfortunately shadowed
+;;; if you have the Mule packages installed!
-;;;###autoload
-(defun cyrillic-encode-alternativnyj-char (char)
- "Return ALTERNATIVNYJ external character code of CHAR if appropriate."
- (aref (char-table-extra-slot
- cyrillic-alternativnyj-nonascii-translation-table 0)
- char))
+;;; Code:
;; Display
＠＠ -60,12 +38,13 ＠＠
;; Written by Valery Alexeev <valery(a)math.uga.edu>.
(defvar cyrillic-language-alist
- (list '("Belorussian") '("Bulgarian") '("Macedonian")
- '("Russian") '("Serbian") '("Ukrainian"))
- "*List of known cyrillic languages")
+ '(("Belorussian") ("Bulgarian") ("Macedonian") ("Russian") ("Serbian")
+ ("Ukrainian"))
+ "*List of known Cyrillic languages")
;;;###autoload
-(defun standard-display-cyrillic-translit (&optional cyrillic-language)
+(defun standard-display-cyrillic-translit (&optional cyrillic-language
+ disable)
"Display a cyrillic buffer using a transliteration.
For readability, the table is slightly
different from the one used for the input method `cyrillic-translit'.
＠＠ -73,142 +52,142 ＠＠
The argument is a string which specifies which language you are using;
that affects the choice of transliterations slightly.
Possible values are listed in 'cyrillic-language-alist'.
-If the argument is t, we use the default cyrillic transliteration.
-If the argument is nil, we return the display table to its standard state."
+
+Specifying a prefix arg, by preceding
+\\[standard-display-cyrillic-translit] with \\[universal-argument]
+turns off Cyrillic display. Noninteractively, the DISABLE argument
+does the same thing. "
(interactive
(list
- (let* ((completion-ignore-case t))
- (completing-read
- "Cyrillic language (default nil): "
- cyrillic-language-alist nil t nil nil nil))))
-
- (or standard-display-table
- (setq standard-display-table (make-display-table)))
-
- (if (equal cyrillic-language "")
- (setq cyrillic-language nil))
-
- (if (null cyrillic-language)
- (setq standard-display-table (make-display-table))
- (aset standard-display-table ?,LP(B [?a])
- (aset standard-display-table ?,LQ(B [?b])
- (aset standard-display-table ?,LR(B [?v])
- (aset standard-display-table ?,LS(B [?g])
- (aset standard-display-table ?,LT(B [?d])
- (aset standard-display-table ?,LU(B [?e])
- (aset standard-display-table ?,Lq(B [?y?o])
- (aset standard-display-table ?,LV(B [?z?h])
- (aset standard-display-table ?,LW(B [?z])
- (aset standard-display-table ?,LX(B [?i])
- (aset standard-display-table ?,LY(B [?j])
- (aset standard-display-table ?,LZ(B [?k])
- (aset standard-display-table ?,L[(B [?l])
- (aset standard-display-table ?,L\(B [?m])
- (aset standard-display-table ?,L](B [?n])
- (aset standard-display-table ?,L^(B [?o])
- (aset standard-display-table ?,L_(B [?p])
- (aset standard-display-table ?,L`(B [?r])
- (aset standard-display-table ?,La(B [?s])
- (aset standard-display-table ?,Lb(B [?t])
- (aset standard-display-table ?,Lc(B [?u])
- (aset standard-display-table ?,Ld(B [?f])
- (aset standard-display-table ?,Le(B [?k?h])
- (aset standard-display-table ?,Lf(B [?t?s])
- (aset standard-display-table ?,Lg(B [?c?h])
- (aset standard-display-table ?,Lh(B [?s?h])
- (aset standard-display-table ?,Li(B [?s?c?h])
- (aset standard-display-table ?,Lj(B [?~])
- (aset standard-display-table ?,Lk(B [?y])
- (aset standard-display-table ?,Ll(B [?'])
- (aset standard-display-table ?,Lm(B [?e?'])
- (aset standard-display-table ?,Ln(B [?y?u])
- (aset standard-display-table ?,Lo(B [?y?a])
+ (let* ((completion-ignore-case t)
+ (default-language (if (assoc-ignore-case
+ current-language-environment
+ cyrillic-language-alist)
+ current-language-environment
+ "Russian")))
+ (or current-prefix-arg
+ (completing-read
+ (format "Cyrillic language (default %s): " default-language)
+ cyrillic-language-alist nil t nil nil default-language)))))
+ (frob-display-table
+ (lambda (display-table)
+ (if (or disable current-prefix-arg)
+ (if (char-table-p display-table)
+ (remove-char-table 'cyrillic-iso8859-5 display-table))
+ (put-display-table ?,LP(B "a" display-table)
+ (put-display-table ?,LQ(B "b" display-table)
+ (put-display-table ?,LR(B "v" display-table)
+ (put-display-table ?,LS(B "g" display-table)
+ (put-display-table ?,LT(B "d" display-table)
+ (put-display-table ?,LU(B "e" display-table)
+ (put-display-table ?,Lq(B "yo" display-table)
+ (put-display-table ?,LV(B "zh" display-table)
+ (put-display-table ?,LW(B "z" display-table)
+ (put-display-table ?,LX(B "i" display-table)
+ (put-display-table ?,LY(B "j" display-table)
+ (put-display-table ?,LZ(B "k" display-table)
+ (put-display-table ?,L[(B "l" display-table)
+ (put-display-table ?,L\(B "m" display-table)
+ (put-display-table ?,L](B "n" display-table)
+ (put-display-table ?,L^(B "o" display-table)
+ (put-display-table ?,L_(B "p" display-table)
+ (put-display-table ?,L`(B "r" display-table)
+ (put-display-table ?,La(B "s" display-table)
+ (put-display-table ?,Lb(B "t" display-table)
+ (put-display-table ?,Lc(B "u" display-table)
+ (put-display-table ?,Ld(B "f" display-table)
+ (put-display-table ?,Le(B "kh" display-table)
+ (put-display-table ?,Lf(B "ts" display-table)
+ (put-display-table ?,Lg(B "ch" display-table)
+ (put-display-table ?,Lh(B "sh" display-table)
+ (put-display-table ?,Li(B "sch" display-table)
+ (put-display-table ?,Lj(B "~" display-table)
+ (put-display-table ?,Lk(B "y" display-table)
+ (put-display-table ?,Ll(B "'" display-table)
+ (put-display-table ?,Lm(B "e'" display-table)
+ (put-display-table ?,Ln(B "yu" display-table)
+ (put-display-table ?,Lo(B "ya" display-table)
+ (put-display-table ?,L0(B "A" display-table)
+ (put-display-table ?,L1(B "B" display-table)
+ (put-display-table ?,L2(B "V" display-table)
+ (put-display-table ?,L3(B "G" display-table)
+ (put-display-table ?,L4(B "D" display-table)
+ (put-display-table ?,L5(B "E" display-table)
+ (put-display-table ?,L!(B "Yo" display-table)
+ (put-display-table ?,L6(B "Zh" display-table)
+ (put-display-table ?,L7(B "Z" display-table)
+ (put-display-table ?,L8(B "I" display-table)
+ (put-display-table ?,L9(B "J" display-table)
+ (put-display-table ?,L:(B "K" display-table)
+ (put-display-table ?,L;(B "L" display-table)
+ (put-display-table ?,L<(B "M" display-table)
+ (put-display-table ?,L=(B "N" display-table)
+ (put-display-table ?,L>(B "O" display-table)
+ (put-display-table ?,L?(B "P" display-table)
+ (put-display-table ?,L＠(B "R" display-table)
+ (put-display-table ?,LA(B "S" display-table)
+ (put-display-table ?,LB(B "T" display-table)
+ (put-display-table ?,LC(B "U" display-table)
+ (put-display-table ?,LD(B "F" display-table)
+ (put-display-table ?,LE(B "Kh" display-table)
+ (put-display-table ?,LF(B "Ts" display-table)
+ (put-display-table ?,LG(B "Ch" display-table)
+ (put-display-table ?,LH(B "Sh" display-table)
+ (put-display-table ?,LI(B "Sch" display-table)
+ (put-display-table ?,LJ(B "~" display-table)
+ (put-display-table ?,LK(B "Y" display-table)
+ (put-display-table ?,LL(B "'" display-table)
+ (put-display-table ?,LM(B "E'" display-table)
+ (put-display-table ?,LN(B "Yu" display-table)
+ (put-display-table ?,LO(B "Ya" display-table)
+ (put-display-table ?,Lt(B "ie" display-table)
+ (put-display-table ?,Lw(B "i" display-table)
+ (put-display-table ?,L~(B "u" display-table)
+ (put-display-table ?,Lr(B "dj" display-table)
+ (put-display-table ?,L{(B "chj" display-table)
+ (put-display-table ?,Ls(B "gj" display-table)
+ (put-display-table ?,Lu(B "s" display-table)
+ (put-display-table ?,L|(B "k" display-table)
+ (put-display-table ?,Lv(B "i" display-table)
+ (put-display-table ?,Lx(B "j" display-table)
+ (put-display-table ?,Ly(B "lj" display-table)
+ (put-display-table ?,Lz(B "nj" display-table)
+ (put-display-table ?,L(B "dz" display-table)
+ (put-display-table ?,L$(B "Ye" display-table)
+ (put-display-table ?,L'(B "Yi" display-table)
+ (put-display-table ?,L.(B "U" display-table)
+ (put-display-table ?,L"(B "Dj" display-table)
+ (put-display-table ?,L+(B "Chj" display-table)
+ (put-display-table ?,L#(B "Gj" display-table)
+ (put-display-table ?,L%(B "S" display-table)
+ (put-display-table ?,L,(B "K" display-table)
+ (put-display-table ?,L&(B "I" display-table)
+ (put-display-table ?,L((B "J" display-table)
+ (put-display-table ?,L)(B "Lj" display-table)
+ (put-display-table ?,L*(B "Nj" display-table)
+ (put-display-table ?,L/(B "Dj" display-table)
- (aset standard-display-table ?,L0(B [?A])
- (aset standard-display-table ?,L1(B [?B])
- (aset standard-display-table ?,L2(B [?V])
- (aset standard-display-table ?,L3(B [?G])
- (aset standard-display-table ?,L4(B [?D])
- (aset standard-display-table ?,L5(B [?E])
- (aset standard-display-table ?,L!(B [?Y?o])
- (aset standard-display-table ?,L6(B [?Z?h])
- (aset standard-display-table ?,L7(B [?Z])
- (aset standard-display-table ?,L8(B [?I])
- (aset standard-display-table ?,L9(B [?J])
- (aset standard-display-table ?,L:(B [?K])
- (aset standard-display-table ?,L;(B [?L])
- (aset standard-display-table ?,L<(B [?M])
- (aset standard-display-table ?,L=(B [?N])
- (aset standard-display-table ?,L>(B [?O])
- (aset standard-display-table ?,L?(B [?P])
- (aset standard-display-table ?,L＠(B [?R])
- (aset standard-display-table ?,LA(B [?S])
- (aset standard-display-table ?,LB(B [?T])
- (aset standard-display-table ?,LC(B [?U])
- (aset standard-display-table ?,LD(B [?F])
- (aset standard-display-table ?,LE(B [?K?h])
- (aset standard-display-table ?,LF(B [?T?s])
- (aset standard-display-table ?,LG(B [?C?h])
- (aset standard-display-table ?,LH(B [?S?h])
- (aset standard-display-table ?,LI(B [?S?c?h])
- (aset standard-display-table ?,LJ(B [?~])
- (aset standard-display-table ?,LK(B [?Y])
- (aset standard-display-table ?,LL(B [?'])
- (aset standard-display-table ?,LM(B [?E?'])
- (aset standard-display-table ?,LN(B [?Y?u])
- (aset standard-display-table ?,LO(B [?Y?a])
-
- (aset standard-display-table ?,Lt(B [?i?e])
- (aset standard-display-table ?,Lw(B [?i])
- (aset standard-display-table ?,L~(B [?u])
- (aset standard-display-table ?,Lr(B [?d?j])
- (aset standard-display-table ?,L{(B [?c?h?j])
- (aset standard-display-table ?,Ls(B [?g?j])
- (aset standard-display-table ?,Lu(B [?s])
- (aset standard-display-table ?,L|(B [?k])
- (aset standard-display-table ?,Lv(B [?i])
- (aset standard-display-table ?,Lx(B [?j])
- (aset standard-display-table ?,Ly(B [?l?j])
- (aset standard-display-table ?,Lz(B [?n?j])
- (aset standard-display-table ?,L(B [?d?z])
-
- (aset standard-display-table ?,L$(B [?Y?e])
- (aset standard-display-table ?,L'(B [?Y?i])
- (aset standard-display-table ?,L.(B [?U])
- (aset standard-display-table ?,L"(B [?D?j])
- (aset standard-display-table ?,L+(B [?C?h?j])
- (aset standard-display-table ?,L#(B [?G?j])
- (aset standard-display-table ?,L%(B [?S])
- (aset standard-display-table ?,L,(B [?K])
- (aset standard-display-table ?,L&(B [?I])
- (aset standard-display-table ?,L((B [?J])
- (aset standard-display-table ?,L)(B [?L?j])
- (aset standard-display-table ?,L*(B [?N?j])
- (aset standard-display-table ?,L/(B [?D?j])
-
- (when (equal cyrillic-language "Bulgarian")
- (aset standard-display-table ?,Li(B [?s?h?t])
- (aset standard-display-table ?,LI(B [?S?h?t])
- (aset standard-display-table ?,Ln(B [?i?u])
- (aset standard-display-table ?,LN(B [?I?u])
- (aset standard-display-table ?,Lo(B [?i?a])
- (aset standard-display-table ?,LO(B [?I?a]))
-
- (when (equal cyrillic-language "Ukrainian") ; based on the official
- ; transliteration table
- (aset standard-display-table ?,LX(B [?y])
- (aset standard-display-table ?,L8(B [?Y])
- (aset standard-display-table ?,LY(B [?i])
- (aset standard-display-table ?,L9(B [?Y])
- (aset standard-display-table ?,Ln(B [?i?u])
- (aset standard-display-table ?,Lo(B [?i?a]))))
-
-
+ (when (equal cyrillic-language "Bulgarian")
+ (put-display-table ?,Li(B "sht" display-table)
+ (put-display-table ?,LI(B "Sht" display-table)
+ (put-display-table ?,Ln(B "iu" display-table)
+ (put-display-table ?,LN(B "Iu" display-table)
+ (put-display-table ?,Lo(B "ia" display-table)
+ (put-display-table ?,LO(B "Ia" display-table))
+
+ (when (equal cyrillic-language "Ukrainian") ; based on the official
+ ; transliteration table
+ (put-display-table ?,LX(B "y" display-table)
+ (put-display-table ?,L8(B "Y" display-table)
+ (put-display-table ?,LY(B "i" display-table)
+ (put-display-table ?,L9(B "Y" display-table)
+ (put-display-table ?,Ln(B "iu" display-table)
+ (put-display-table ?,Lo(B "ia" display-table)))) nil))
;;
(provide 'cyril-util)
-;;; cyril-util.el ends here
-
;; Local Variables:
-;; buffer-file-coding-system: iso-2022-7bit
+;; coding: iso-2022-7bit
;; End:
+
+;;; cyril-util.el ends here
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: error-sequence -> invalid-sequence
15 years, 8 months
Aidan Kehoe
Aidan Kehoe
changeset: 4490:67fbcaf3dbdc9290c478eba737521edbaa38e90c
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Fri Aug 08 21:17:08 2008 +0200
files: lisp/ChangeLog lisp/mule/cyrillic.el lisp/mule/greek.el lisp/mule/latin.el lisp/mule/mule-cmds.el lisp/unicode.el
description:
error-sequence -> invalid-sequence
2008-08-08 Aidan Kehoe <kehoea(a)parhasard.net>
* unicode.el:
* mule/mule-cmds.el:
* mule/latin.el:
* mule/cyrillic.el:
Rework the various identifiers using error-sequence to use
invalid-sequence instead.
diff -r b75b075a9041ab8969a6351fa85560e739dcdbbb -r 67fbcaf3dbdc9290c478eba737521edbaa38e90c lisp/ChangeLog
--- a/lisp/ChangeLog Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/ChangeLog Fri Aug 08 21:17:08 2008 +0200
＠＠ -1,3 +1,12 ＠＠ 2008-08-05 Aidan Kehoe <kehoea＠parhasa
+2008-08-08 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * unicode.el:
+ * mule/mule-cmds.el:
+ * mule/latin.el:
+ * mule/cyrillic.el:
+ Rework the various identifiers using error-sequence to use
+ invalid-sequence instead.
+
2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
* specifier.el (current-display-table): Initialise this here, not
diff -r b75b075a9041ab8969a6351fa85560e739dcdbbb -r 67fbcaf3dbdc9290c478eba737521edbaa38e90c lisp/mule/cyrillic.el
--- a/lisp/mule/cyrillic.el Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/mule/cyrillic.el Fri Aug 08 21:17:08 2008 +0200
＠＠ -370,7 +370,7 ＠＠ character of the opposite case). "
(coding-system koi8-r)
(native-coding-system koi8-r)
(coding-priority koi8-r)
- (error-sequence-coding-system koi8-r)
+ (invalid-sequence-coding-system koi8-r)
(input-method . "cyrillic-yawerty")
(features cyril-util)
(locale "ru")
＠＠ -544,7 +544,7 ＠＠ Russian in KOI8-R. "))
"Ukrainian" '((coding-system koi8-u)
(coding-priority koi8-u)
(locale "uk")
- (error-sequence-coding-system koi8-u)
+ (invalid-sequence-coding-system koi8-u)
(input-method . "cyrillic-ukrainian")
(documentation
. "Support for Ukrainian."))
＠＠ -691,7 +691,7 ＠＠ KOI-8R and its relatives don't, and has
(set-language-info-alist
"Bulgarian" '((coding-system windows-1251)
(coding-priority windows-1251)
- (error-sequence-coding-system windows-1251)
+ (invalid-sequence-coding-system windows-1251)
(input-method . "bulgarian-bds")
(locale "bg")
(documentation
＠＠ -702,7 +702,7 ＠＠ KOI-8R and its relatives don't, and has
(set-language-info-alist
"Belarusian" '((coding-system windows-1251)
(coding-priority windows-1251)
- (error-sequence-coding-system windows-1251)
+ (invalid-sequence-coding-system windows-1251)
(locale "be")
(input-method . "belarusian")
(documentation
＠＠ -849,7 +849,7 ＠＠ Byelorussian in the early 1990s.)"))
"Cyrillic-ALT" '((charset cyrillic-iso8859-5)
(coding-system alternativnyj)
(native-coding-system alternativnyj)
- (error-sequence-coding-system alternativnyj)
+ (invalid-sequence-coding-system alternativnyj)
(coding-priority alternativnyj)
(input-method . "cyrillic-yawerty")
(features cyril-util)
diff -r b75b075a9041ab8969a6351fa85560e739dcdbbb -r 67fbcaf3dbdc9290c478eba737521edbaa38e90c lisp/mule/greek.el
--- a/lisp/mule/greek.el Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/mule/greek.el Fri Aug 08 21:17:08 2008 +0200
＠＠ -328,7 +328,7 ＠＠ that latter standard is not used in Gree
(coding-system iso-8859-7)
(coding-priority iso-8859-7)
(native-coding-system iso-8859-7)
- (error-sequence-coding-system iso-8859-7)
+ (invalid-sequence-coding-system iso-8859-7)
(locale "el")
(input-method . "greek")
(sample-text . "Greek (,FGkk]mija(B) ,FCei\(B ,Fsar(B")
diff -r b75b075a9041ab8969a6351fa85560e739dcdbbb -r 67fbcaf3dbdc9290c478eba737521edbaa38e90c lisp/mule/latin.el
--- a/lisp/mule/latin.el Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/mule/latin.el Fri Aug 08 21:17:08 2008 +0200
＠＠ -957,7 +957,7 ＠＠ See also `iso-8859-2' and `window-1252'
for ((charset codesys default-input nice-charset-1 nice-charset-2
;; supported-langs is a list if the doc string is replaced
;; entirely
- supported-langs error-sequence-coding-system)
+ supported-langs invalid-sequence-coding-system)
langenvs) in
'(((latin-iso8859-1 iso-8859-1 "latin-1-prefix" "Latin-1" "ISO-8859-1"
" Danish, Dutch, English, Faeroese, Finnish, French, German, Icelandic,
＠＠ -1025,8 +1025,8 ＠＠ German (Deutsch S,A|(Bd) Gr,A|_(B Go
(coding-system ,codesys)
(coding-priority ,codesys)
(native-coding-system ,codesys)
- (error-sequence-coding-system ,(or error-sequence-coding-system
- codesys))
+ (invalid-sequence-coding-system ,(or invalid-sequence-coding-system
+ codesys))
(documentation . ,(if (listp supported-langs) (car supported-langs)
(format "\
Generic language environment for %s (%s)." nice-charset-1 nice-charset-2))))
diff -r b75b075a9041ab8969a6351fa85560e739dcdbbb -r 67fbcaf3dbdc9290c478eba737521edbaa38e90c lisp/mule/mule-cmds.el
--- a/lisp/mule/mule-cmds.el Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/mule/mule-cmds.el Fri Aug 08 21:17:08 2008 +0200
＠＠ -227,7 +227,7 ＠＠ Meaningful values for PROP include
locale is assumed to have the same name as the
language environment.
- error-sequence-coding-system
+ invalid-sequence-coding-system
VALUE is a fixed-width 8-bit coding system used to
display Unicode error sequences (using a face to make
it clear that the data is invalid). In Western Europe
＠＠ -768,20 +768,21 ＠＠ the language environment for the major l
(if (functionp func)
(funcall func)))
- (let ((error-sequence-coding-system
- (get-language-info language-name 'error-sequence-coding-system))
+ (let ((invalid-sequence-coding-system
+ (get-language-info language-name 'invalid-sequence-coding-system))
(disp-table (specifier-instance current-display-table))
glyph)
- (when (consp error-sequence-coding-system)
- (setq error-sequence-coding-system (car error-sequence-coding-system)))
+ (when (consp invalid-sequence-coding-system)
+ (setq invalid-sequence-coding-system
+ (car invalid-sequence-coding-system)))
(map-char-table
#'(lambda (key entry)
(setq glyph (make-glyph
(vector
'string :data
(decode-coding-string (string entry)
- error-sequence-coding-system))))
- (set-glyph-face glyph 'unicode-error-sequence-warning-face)
+ invalid-sequence-coding-system))))
+ (set-glyph-face glyph 'unicode-invalid-sequence-warning-face)
(put-char-table key glyph disp-table)
nil)
unicode-error-default-translation-table))
diff -r b75b075a9041ab8969a6351fa85560e739dcdbbb -r 67fbcaf3dbdc9290c478eba737521edbaa38e90c lisp/unicode.el
--- a/lisp/unicode.el Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/unicode.el Fri Aug 08 21:17:08 2008 +0200
＠＠ -526,7 +526,7 ＠＠ To transform XEmacs Unicode error sequen
To transform XEmacs Unicode error sequences to the Latin-1 characters that
correspond to the octets on disk, you can use this variable. ")
-(defvar unicode-error-sequence-regexp-range
+(defvar unicode-invalid-sequence-regexp-range
(and (featurep 'mule)
(format "%c%c-%c"
(aref (decode-coding-string "\xd8\x00\x00\x00" 'utf-16-be) 0)
＠＠ -564,7 +564,7 ＠＠ invalid octet. You can use this variabl
;; Comment out until the issue in
;; 18179.49815.622843.336527(a)parhasard.net is fixed.
(assert t ; (re-search-forward (concat "["
- ; unicode-error-sequence-regexp-range
+ ; unicode-invalid-sequence-regexp-range
; "]"))
nil
(format "Could not find char ?\\x%x in buffer" i))))
＠＠ -586,12 +586,12 ＠＠ such sequences. "
(setq begin
(progn
(skip-chars-forward
- (concat "^" unicode-error-sequence-regexp-range))
+ (concat "^" unicode-invalid-sequence-regexp-range))
(point))
end (and (not (= (point) (point-max)))
(progn
(skip-chars-forward
- unicode-error-sequence-regexp-range)
+ unicode-invalid-sequence-regexp-range)
(point))))
(if end
(funcall frob-function begin end))))))
＠＠ -612,7 +612,7 ＠＠ mapping from the error sequences to the
begin end buffer))
;; Sure would be nice to be able to use defface here.
-(copy-face 'highlight 'unicode-error-sequence-warning-face)
+(copy-face 'highlight 'unicode-invalid-sequence-warning-face)
(unless (featurep 'mule)
;; We do this in such a roundabout way--instead of having the above defun
＠＠ -622,8 +622,8 ＠＠ mapping from the error sequences to the
;; Lisp.
(mapcar #'unintern
'(ccl-encode-to-ucs-2 unicode-error-default-translation-table
- unicode-error-sequence-regexp-range
- frob-unicode-errors-region unicode-error-translate-region)))
+ unicode-invalid-regexp-range frob-unicode-errors-region
+ unicode-error-translate-region)))
;; #### UTF-7 is not yet implemented, and it's tricky to do. There's
;; an implementation in appendix A.1 of the Unicode Standard, Version
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Support displaying invalid UTF-8 in language-environment-specific ways.
15 years, 8 months
Aidan Kehoe
Aidan Kehoe
changeset: 4489:b75b075a9041ab8969a6351fa85560e739dcdbbb
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Tue Aug 05 09:06:41 2008 +0200
files: lisp/ChangeLog lisp/mule/cyrillic.el lisp/mule/greek.el lisp/mule/latin.el lisp/mule/mule-cmds.el lisp/specifier.el lisp/unicode.el lisp/x-init.el
description:
Support displaying invalid UTF-8 in language-environment-specific ways.
2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
* specifier.el (current-display-table): Initialise this here, not
in x-init.el, since we want it even on non-X builds to use the
support for displaying Unicode error sequences according to the
current locale.
* mule/mule-cmds.el (set-language-info):
Document error-sequence-coding-system, used to describe how to
display characters that are not valid Unicode on disk.
* mule/mule-cmds.el (finish-set-language-environment):
Implement error-sequence-coding-system.
* unicode.el (unicode-error-sequence-warning-face):
New face, to make it possible to distinguish invalid Unicode
sequences from the characters given by the valid Unicode
sequences.
* mule/cyrillic.el ("Russian"):
("Ukrainian"):
("Bulgarian"):
("Belarusian"):
("Cyrillic-ALT"): Add support for error-sequence-coding-system for
all these languages.
* mule/latin.el:
Add support for error-sequence-coding-system for the
Latin-alphabet language environments.
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r b75b075a9041ab8969a6351fa85560e739dcdbbb lisp/ChangeLog
--- a/lisp/ChangeLog Sat Jul 26 13:50:27 2008 +0300
+++ b/lisp/ChangeLog Tue Aug 05 09:06:41 2008 +0200
＠＠ -1,3 +1,28 ＠＠ 2008-07-26 Aidan Kehoe <kehoea＠parhasa
+2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * specifier.el (current-display-table): Initialise this here, not
+ in x-init.el, since we want it even on non-X builds to use the
+ support for displaying Unicode error sequences according to the
+ current locale.
+ * mule/mule-cmds.el (set-language-info):
+ Document error-sequence-coding-system, used to describe how to
+ display characters that are not valid Unicode on disk.
+ * mule/mule-cmds.el (finish-set-language-environment):
+ Implement error-sequence-coding-system.
+ * unicode.el (unicode-error-sequence-warning-face):
+ New face, to make it possible to distinguish invalid Unicode
+ sequences from the characters given by the valid Unicode
+ sequences.
+ * mule/cyrillic.el ("Russian"):
+ ("Ukrainian"):
+ ("Bulgarian"):
+ ("Belarusian"):
+ ("Cyrillic-ALT"): Add support for error-sequence-coding-system for
+ all these languages.
+ * mule/latin.el:
+ Add support for error-sequence-coding-system for the
+ Latin-alphabet language environments.
+
2008-07-26 Aidan Kehoe <kehoea(a)parhasard.net>
* x-init.el (x-initialize-compose):
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r b75b075a9041ab8969a6351fa85560e739dcdbbb lisp/mule/cyrillic.el
--- a/lisp/mule/cyrillic.el Sat Jul 26 13:50:27 2008 +0300
+++ b/lisp/mule/cyrillic.el Tue Aug 05 09:06:41 2008 +0200
＠＠ -370,6 +370,7 ＠＠ character of the opposite case). "
(coding-system koi8-r)
(native-coding-system koi8-r)
(coding-priority koi8-r)
+ (error-sequence-coding-system koi8-r)
(input-method . "cyrillic-yawerty")
(features cyril-util)
(locale "ru")
＠＠ -543,6 +544,7 ＠＠ Russian in KOI8-R. "))
"Ukrainian" '((coding-system koi8-u)
(coding-priority koi8-u)
(locale "uk")
+ (error-sequence-coding-system koi8-u)
(input-method . "cyrillic-ukrainian")
(documentation
. "Support for Ukrainian."))
＠＠ -689,6 +691,7 ＠＠ KOI-8R and its relatives don't, and has
(set-language-info-alist
"Bulgarian" '((coding-system windows-1251)
(coding-priority windows-1251)
+ (error-sequence-coding-system windows-1251)
(input-method . "bulgarian-bds")
(locale "bg")
(documentation
＠＠ -699,6 +702,7 ＠＠ KOI-8R and its relatives don't, and has
(set-language-info-alist
"Belarusian" '((coding-system windows-1251)
(coding-priority windows-1251)
+ (error-sequence-coding-system windows-1251)
(locale "be")
(input-method . "belarusian")
(documentation
＠＠ -845,6 +849,7 ＠＠ Byelorussian in the early 1990s.)"))
"Cyrillic-ALT" '((charset cyrillic-iso8859-5)
(coding-system alternativnyj)
(native-coding-system alternativnyj)
+ (error-sequence-coding-system alternativnyj)
(coding-priority alternativnyj)
(input-method . "cyrillic-yawerty")
(features cyril-util)
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r b75b075a9041ab8969a6351fa85560e739dcdbbb lisp/mule/greek.el
--- a/lisp/mule/greek.el Sat Jul 26 13:50:27 2008 +0300
+++ b/lisp/mule/greek.el Tue Aug 05 09:06:41 2008 +0200
＠＠ -328,6 +328,7 ＠＠ that latter standard is not used in Gree
(coding-system iso-8859-7)
(coding-priority iso-8859-7)
(native-coding-system iso-8859-7)
+ (error-sequence-coding-system iso-8859-7)
(locale "el")
(input-method . "greek")
(sample-text . "Greek (,FGkk]mija(B) ,FCei\(B ,Fsar(B")
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r b75b075a9041ab8969a6351fa85560e739dcdbbb lisp/mule/latin.el
--- a/lisp/mule/latin.el Sat Jul 26 13:50:27 2008 +0300
+++ b/lisp/mule/latin.el Tue Aug 05 09:06:41 2008 +0200
＠＠ -957,11 +957,12 ＠＠ See also `iso-8859-2' and `window-1252'
for ((charset codesys default-input nice-charset-1 nice-charset-2
;; supported-langs is a list if the doc string is replaced
;; entirely
- supported-langs)
+ supported-langs error-sequence-coding-system)
langenvs) in
'(((latin-iso8859-1 iso-8859-1 "latin-1-prefix" "Latin-1" "ISO-8859-1"
" Danish, Dutch, English, Faeroese, Finnish, French, German, Icelandic,
- Irish, Italian, Norwegian, Portuguese, Spanish, and Swedish.")
+ Irish, Italian, Norwegian, Portuguese, Spanish, and Swedish."
+ windows-1252)
(("Danish" "da")
("Dutch" "nl" "TUTORIAL.nl")
("Faeroese" "fo")
＠＠ -1024,6 +1025,8 ＠＠ German (Deutsch S,A|(Bd) Gr,A|_(B Go
(coding-system ,codesys)
(coding-priority ,codesys)
(native-coding-system ,codesys)
+ (error-sequence-coding-system ,(or error-sequence-coding-system
+ codesys))
(documentation . ,(if (listp supported-langs) (car supported-langs)
(format "\
Generic language environment for %s (%s)." nice-charset-1 nice-charset-2))))
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r b75b075a9041ab8969a6351fa85560e739dcdbbb lisp/mule/mule-cmds.el
--- a/lisp/mule/mule-cmds.el Sat Jul 26 13:50:27 2008 +0300
+++ b/lisp/mule/mule-cmds.el Tue Aug 05 09:06:41 2008 +0200
＠＠ -225,7 +225,15 ＠＠ Meaningful values for PROP include
If there is no value for this property, the MS Windows
locale is assumed to have the same name as the
- language environment."
+ language environment.
+
+ error-sequence-coding-system
+ VALUE is a fixed-width 8-bit coding system used to
+ display Unicode error sequences (using a face to make
+ it clear that the data is invalid). In Western Europe
+ this is normally windows-1252; in the Russia and the
+ former Soviet Union koi8-ru or windows-1251 makes more
+ sense."
(if (symbolp lang-env)
(setq lang-env (symbol-name lang-env)))
(let (lang-slot prop-slot)
＠＠ -759,6 +767,24 ＠＠ the language environment for the major l
(let ((func (get-language-info language-name 'setup-function)))
(if (functionp func)
(funcall func)))
+
+ (let ((error-sequence-coding-system
+ (get-language-info language-name 'error-sequence-coding-system))
+ (disp-table (specifier-instance current-display-table))
+ glyph)
+ (when (consp error-sequence-coding-system)
+ (setq error-sequence-coding-system (car error-sequence-coding-system)))
+ (map-char-table
+ #'(lambda (key entry)
+ (setq glyph (make-glyph
+ (vector
+ 'string :data
+ (decode-coding-string (string entry)
+ error-sequence-coding-system))))
+ (set-glyph-face glyph 'unicode-error-sequence-warning-face)
+ (put-char-table key glyph disp-table)
+ nil)
+ unicode-error-default-translation-table))
;; Fit the charsets preferences in unicode conversions for the
;; language environment.
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r b75b075a9041ab8969a6351fa85560e739dcdbbb lisp/specifier.el
--- a/lisp/specifier.el Sat Jul 26 13:50:27 2008 +0300
+++ b/lisp/specifier.el Tue Aug 05 09:06:41 2008 +0200
＠＠ -988,4 +988,18 ＠＠ proceed as if LOCALE were a domain."
(specifier-instance specifier domain))))
(list (cons nil inst))))))))))
+;; Character 160 (octal 0240) displays incorrectly under some X
+;; installations apparently due to a universally crocked font width
+;; specification. Display it as a space since that's what's expected.
+;;
+;; (make-char-table 'generic) instead of (make-display-table) because
+;; make-display-table isn't dumped, and this file is.
+;;
+;; We also want the global display table to be actually globally
+;; initialised; that's why this is here, and not in x-init.el, these days.
+
+(set-specifier current-display-table
+ #s(char-table type generic data (?\xA0 ?\x20))
+ 'global)
+
;;; specifier.el ends here
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r b75b075a9041ab8969a6351fa85560e739dcdbbb lisp/unicode.el
--- a/lisp/unicode.el Sat Jul 26 13:50:27 2008 +0300
+++ b/lisp/unicode.el Tue Aug 05 09:06:41 2008 +0200
＠＠ -611,6 +611,9 ＠＠ mapping from the error sequences to the
(translate-region start finish table))
begin end buffer))
+;; Sure would be nice to be able to use defface here.
+(copy-face 'highlight 'unicode-error-sequence-warning-face)
+
(unless (featurep 'mule)
;; We do this in such a roundabout way--instead of having the above defun
;; and defvar calls inside a (when (featurep 'mule) ...) form--to have
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r b75b075a9041ab8969a6351fa85560e739dcdbbb lisp/x-init.el
--- a/lisp/x-init.el Sat Jul 26 13:50:27 2008 +0300
+++ b/lisp/x-init.el Tue Aug 05 09:06:41 2008 +0200
＠＠ -312,15 +312,4 ＠＠ This function is a trivial wrapper aroun
(if (equal display "") (setq display nil))
(make-frame-on-device 'x display props))
-;; Character 160 (octal 0240) displays incorrectly under X apparently
-;; due to a universally crocked font width specification. Display it
-;; as a space since that's what seems to be expected.
-;;
-;; (make-char-table 'generic) instead of (make-display-table) because
-;; make-display-table isn't dumped, and this file is.
-
-(let ((tab (make-char-table 'generic)))
- (put-char-table 160 " " tab)
- (set-specifier current-display-table tab 'global 'x))
-
;;; x-init.el ends here
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
Re: [PATCH] Support displaying invalid UTF-8 in language-environment-specific ways.
15 years, 8 months
Aidan Kehoe
Aidan Kehoe
Ar an cúigiú lá de mí Lúnasa, scríobh Stephen J. Turnbull:
> Aidan Kehoe writes:
>
> > > > * mule/mule-cmds.el (finish-set-language-environment):
> > > > Implement error-sequence-coding-system.
> > >
> > > Please call this "invalid-character-coding-system" or something like
> > > that.
> >
> > Why do you find that clearer?
>
> Several reasons. "Error" is a signal in Lisp, but no error will be
> signaled here. "Error sequence" could be almost anything unexpected;
> people encountering these names will not necessarily have the context
> to realize that they refer to invalid encoding sequences. Even in
> that context, errors will by definition not be coding systematic, so
> it's sort of an oxymoron. In fact, my original thought was that
> e-s-c-s was the coding system that threw the error in the first place.
OK. I prefer “invalid-sequence” over “invalid-character”, though; each
invalid UTF-8 octet becomes a single valid XEmacs character, and a
collection of invalid octets may well correspond to a single incorrectly
encoded character. E.g. the output of
(decode-coding-string "\xC0\x8a" 'utf-8)
is a string with two XEmacs characters, but the source string is an overlong
encoding of a single Unicode character.
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
Re: [PATCH] Support displaying invalid UTF-8 in language-environment-specific ways.
15 years, 8 months
Aidan Kehoe
Aidan Kehoe
Ar an cúigiú lá de mí Lúnasa, scríobh Stephen J. Turnbull:
> Aidan Kehoe writes:
>
> > * mule/mule-cmds.el (finish-set-language-environment):
> > Implement error-sequence-coding-system.
>
> Please call this "invalid-character-coding-system" or something like
> that.
>
> > * unicode.el (unicode-error-sequence-warning-face):
>
> Ditto.
Why do you find that clearer?
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments