[AC21.5] Modularize Canna support
19 years, 2 months
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
This patch moves the Canna C API support out of src and into a new
canna module. It has been thoroughly tested in use as a module, and
builds have been done (for X11 on Mac OS X 10.3.9) with modules
enabled and disabled, and with mc-alloc enabled and disabled. All
combinations work correctly.
Like all modules, this one has the following benefits:
Users: don't need to plan ahead to use Canna, acquiring the libraries
and headers before building XEmacs. With a module, you can build
XEmacs and acquire the rest of the code and add Canna later.
Developers: can rebuild Canna support without rebuilding XEmacs.
Distro maintainers: can distribute XEmacs binaries with Canna support
in a module, allowing the dependency on Canna libraries to be
removed. Of course, those who want to use Canna must install the
Canna libraries, but those who don't don't need them.
The diff for modules/canna/install-sh is omitted; it's just a copy of
the same utility from modules/canna/ldap. The diff for
src/mule-canna.c is omitted; the file was removed.
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.459
diff -u -r1.459 ChangeLog
--- ChangeLog 19 Sep 2005 00:36:01 -0000 1.459
+++ ChangeLog 4 Oct 2005 17:26:02 -0000
＠＠ -0,0 +1,6 ＠＠
+2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (Canna): Configure as module if appropriate.
+
+ * Makefile.in.in (modules/canna): Add dependency on lib-src (ellcc).
+
Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.676
diff -u -r1.676 ChangeLog
--- lisp/ChangeLog 4 Oct 2005 16:43:34 -0000 1.676
+++ lisp/ChangeLog 4 Oct 2005 17:26:06 -0000
＠＠ -0,0 +1,17 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * mule/canna-leim.el: Rename canna_api to canna-api.
+
+2005-09-30 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * mule/canna-leim.el (canna-activate): Fix typo in error symbol.
+ Improve docstring.
+
+2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * mule/canna-leim.el: Add comment on autoloading strategy.
+ (canna-activate): Handle CANNA in ELL.
+
+ * dumped-lisp.el (preloaded-file-list): Remove dependency of
+ canna-leim on CANNA. Canna may be an ELL.
+
Index: modules/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.42
diff -u -r1.42 ChangeLog
--- modules/ChangeLog 14 Sep 2005 05:30:08 -0000 1.42
+++ modules/ChangeLog 4 Oct 2005 17:26:06 -0000
＠＠ -0,0 +1,21 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * canna/Makefile.in.in (MODVER): Bump to 0.5.
+
+ * canna/canna-api.c:
+ * canna/Makefile.in.in (MODNAME,SRCS):
+ Rename module from canna_api to canna-api.
+
+2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * canna: New module.
+
+ * canna/canna_api.c: Move from $srcdir/src/mule-canna.c. Add module
+ initialization function and some boilerplate. Change name to
+ canna_api to reflect changed role.
+
+ * canna/configure.ac:
+ * canna/Makefile.in.in:
+ * canna/install-sh:
+ Standard module boilerplate, adapted to Canna.
+
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.865
diff -u -r1.865 ChangeLog
--- src/ChangeLog 30 Sep 2005 02:15:06 -0000 1.865
+++ src/ChangeLog 4 Oct 2005 17:26:11 -0000
＠＠ -0,0 +1,16 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * Makefile.in.in (mule_canna_objs): Use correct name of .o.
+
+2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * Makefile.in.in (HAVE_CANNA): Handle Canna as a module.
+
+ * emacs.c (main_1): Update Canna initializers to *_canna_api names.
+
+ * mule-canna.c: Moved to modules/canna/canna_api.c.
+
+ * symsinit.h (syms_of_mule_canna):
+ (vars_of_mule_canna):
+ Rename to *_of_canna_api.
+
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v
retrieving revision 1.25
diff -u -r1.25 Makefile.in.in
--- Makefile.in.in 8 Apr 2005 23:10:02 -0000 1.25
+++ Makefile.in.in 4 Oct 2005 17:26:02 -0000
＠＠ -313,7 +313,8 ＠＠
cd ./$＠ && $(MAKE) $(RECURSIVE_MAKE_ARGS) all
## Building modules depends on ellcc, found in lib-src.
-modules/sample modules/ldap modules/zlib modules/base64 modules/postgresql: lib-src
+modules/sample modules/ldap modules/zlib modules/base64: lib-src
+modules/postgresql modules/canna: lib-src
Makefile: ${srcdir}/Makefile.in.in config.status
./config.status
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.13
diff -u -r1.13 configure.ac
--- configure.ac 19 Sep 2005 00:36:02 -0000 1.13
+++ configure.ac 4 Oct 2005 17:26:03 -0000
＠＠ -4201,6 +4201,10 ＠＠
AC_DEFINE(HAVE_DEFAULT_EOL_DETECTION)
fi
+dnl initialize _libs variables for possible modules at top level
+canna_libs=
+wnn_libs=
+
if test "$enable_mule" = "yes" ; then
AC_CHECKING([for Mule-related features])
AC_DEFINE(MULE)
＠＠ -4277,6 +4281,7 ＠＠
fi
dnl Autodetect canna
+ dnl canna_libs variable is initialized at toplevel
canna_includes_found=no
if test "$with_canna" != "no"; then
AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes)
＠＠ -4298,8 +4303,14 ＠＠
test -z "$with_canna" && with_canna=yes
if test "$with_canna" = "yes"; then
AC_DEFINE(HAVE_CANNA)
- XE_PREPEND(-lcanna -lRKC, libs_x)
+ XE_APPEND(modules/canna, MAKE_SUBDIR)
+ need_modules_common=yes
+ if test "$with_modules" = "yes"; then
+ XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR)
+ fi
+ XE_PREPEND(-lcanna -lRKC, canna_libs)
fi
+AC_SUBST(canna_libs)
else dnl "$enable_mule" = "no"
for feature in xim canna wnn; do
＠＠ -5150,7 +5161,7 ＠＠
if test "$enable_modules" = "yes"; then
ld_libs_module=
else
- XE_SPACE(ld_libs_module, $ldap_libs $postgresql_libs)
+ XE_SPACE(ld_libs_module, $ldap_libs $postgresql_libs $canna_libs)
fi
XE_SPACE(CFLAGS, $CFLAGS)
Index: lisp/dumped-lisp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/dumped-lisp.el,v
retrieving revision 1.55
diff -u -r1.55 dumped-lisp.el
--- lisp/dumped-lisp.el 26 Jun 2005 18:04:49 -0000 1.55
+++ lisp/dumped-lisp.el 4 Oct 2005 17:26:06 -0000
＠＠ -218,7 +218,7 ＠＠
))
;; Specialized language support
- (when (featurep '(and mule CANNA)) "mule/canna-leim")
+ (when (featurep 'mule) "mule/canna-leim")
;; Egg/Its is now a package
; (when (featurep '(and mule wnn))
; '("egg-leim" "egg-kwnn-leim" "egg-cwnn-leim"))
Index: lisp/mule/canna-leim.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/canna-leim.el,v
retrieving revision 1.7
diff -u -r1.7 canna-leim.el
--- lisp/mule/canna-leim.el 16 Mar 2002 10:39:05 -0000 1.7
+++ lisp/mule/canna-leim.el 4 Oct 2005 17:26:06 -0000
＠＠ -35,10 +35,22 ＠＠
(globally-declare-boundp 'canna:*japanese-mode*)
(globally-declare-fboundp '(canna canna-toggle-japanese-mode))
+;; use (locate-file "canna/canna-api" module-load-path module-extensions)
+;; to locate the module without loading it.
+;; then we could autoload canna-activate and dump and/or autoload:
+;; (and (locate-file "canna/canna-api" module-load-path module-extensions)
+;; (locate-library "canna")
+;; (register-input-method 'japanese-canna "Japanese" 'canna-activate nil
+;; "Canna - a kana to kanji conversion program"))
+
(defun canna-activate (&optional name)
- (if (featurep 'CANNA)
- (require 'canna)
- (error "Canna is not built into this XEmacs"))
+ ;; XEmacs 21.5.10 and later have 3-argument require.
+ (unless (require 'CANNA "canna/canna-api" 'no-error)
+ (error 'file-error
+ "No Canna API support!? See M-x describe-installation & C-h v module-load-path."))
+ (unless (require 'canna nil 'no-error)
+ (error 'file-error
+ "Canna LISP support not found. Is the mule-base package missing?"))
(setq inactivate-current-input-method-function 'canna-inactivate)
(unless (featurep 'leim-canna-initialized)
(canna)
Index: modules/canna/Makefile.in.in
===================================================================
RCS file: modules/canna/Makefile.in.in
diff -N modules/canna/Makefile.in.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/canna/Makefile.in.in 4 Oct 2005 17:26:06 -0000
＠＠ -0,0 +1,36 ＠＠
+## Makefile for the sample module in XEmacs.
+## Copyright (C) 2002 Jerry James.
+
+## 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: Not synched with FSF.
+
+## This is more complicated than would normally be the case, as this makefile
+## has been tailored to work both inside and independently of the XEmacs
+## source tree, and to support both module and non-module building inside the
+## source tree.
+
+### Specialize this part for your module
+MODNAME=canna-api
+MODVER=0.5.0
+MODTITLE="Module wrapping Canna libraries for XEmacs"
+CFLAGS=＠CFLAGS＠
+LDFLAGS=＠LDFLAGS＠ ＠ld_switch_all＠ ＠canna_libs＠
+SRCS=canna-api.c
+
+## Note: modules/common/Makefile.common will be appended by configure
Index: modules/canna/canna-api.c
===================================================================
RCS file: modules/canna/canna-api.c
diff -N modules/canna/canna-api.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/canna/canna-api.c 4 Oct 2005 17:26:06 -0000
＠＠ -0,0 +1,1988 ＠＠
+/* CANNA interface -*- coding: euc-jp -*-
+
+ Copyright (C) 1995 Free Software Foundation, Inc.
+ Copyright (C) 1995 Sun Microsystems, Inc.
+
+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: Mule 2.3. Not in FSF. */
+
+/* Japanese comments were translated 2000-12-06 by Stephen Turnbull
+ <stephen(a)xemacs.org>. I haven't verified that the Japanese comments
+ were correct. YMMV, NO WARRANTY, not even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. (^^;;; as the
+ Japanese say. */
+
+/*
+
+ Authors: Akira Kon (kon(a)uxd.fc.nec.co.jp)
+ Ichiro Hirakura (hirakura(a)uxd.fc.nec.co.jp)
+
+ Functions defined in this file are
+
+ (canna-key-proc key)
+ key: single STRING
+ RETURNS:
+ Length of converted string if no error occurs.
+ Error string if error occurs.
+ DESCRIPTION:
+ Convert a key input to a set of strings. The
+ strings contain both well-formed string and a
+ intermediate result to show the translation
+ information to a user. converted strings are
+ stored in specific variables.
+
+ (canna-initialize)
+ RETURNS:
+ List of the following things:
+ - list of keys to toggle Japanese-mode
+ - error message
+ - list of warning messages
+ DESCRIPTION:
+ Initialize ``canna'', which is a kana-to-kanji
+ converter for XEmacs. The first arg
+ specifies if inserting space character between
+ BUNSETSU when candidates are displayed. The
+ second arg specifies server. The third arg
+ specifies a file which will be used as a
+ customization description. If nil is
+ specified for each arg, the default value will
+ be used.
+
+ (canna-finalize)
+ RETURNS:
+ list of warning messages
+ DESCRIPTION:
+ finalize ``canna'', which is a kana-to-kanji
+ converter for XEmacs. This cause to write
+ miscellaneous informations to kana-to-kanji
+ dictionary.
+
+ (canna-touroku-string string)
+ string:
+ String to register to a dictionary.
+ RETURNS:
+ The same thing returns as canna-key-proc does.
+ DESCRIPTION:
+ Register Kanji words into kana-to-kanji
+ conversion dictionary.
+
+ (canna-set-width width)
+ width:
+ Column width of the place where the candidates
+ of kana-to-kanji conversion will be shown.
+ RETURNS:
+ nil
+ DESCRIPTION:
+ Set status-line width information, which is
+ used to display kanji candidates.
+
+ (canna-change-mode num)
+ num:
+ The mode number of Canna.
+ RETURNS:
+ The same thing returns as canna-key-proc does.
+ DESCRIPTION:
+ Change Japanese pre-edit mode.
+
+ (canna-store-yomi yomi roma)
+ yomi:
+ ``Yomi'' to be stored.
+ roma:
+ ``Romaji'' which corresponds to the ``Yomi''.
+ RETURNS:
+ The same thing returns as canna-key-proc does.
+ DESCRIPTION:
+ Store yomi characters as a YOMI of
+ kana-to-kanji conversion.
+
+ (canna-do-function num ch)
+ num:
+ A function number to be called.
+ ch:
+ A character will be specified in order to feed
+ the character to the function if the function
+ needs a input character.
+ RETURNS:
+ The same thing returns as canna-key-proc does.
+ DESCRIPTION:
+ Do specified function at current mode.
+
+ (canna-parse string)
+ string:
+ To be parsed.
+ RETURNS:
+ List of warning messages.
+ DESCRIPTION:
+ Parse customize string.
+
+ (canna-query-mode)
+ RETURNS:
+ A string which indicate the current mode.
+ DESCRIPTION:
+ Get current mode string.
+
+ Functions below are used for KKCP compatible library. These
+ functions provides a base kana-to-kanji conversion system for EGG.
+ These functions may be used when users want to change the engine
+ from Wnn to Canna without changing user interface of Japanese input.
+
+ (canna-henkan-begin)
+ (canna-henkan-next)
+ (canna-bunsetu-henkou)
+ (canna-henkan-kakutei)
+ (canna-henkan-end)
+ (canna-henkan-quit)
+
+ */
+
+#include <config.h>
+#include "lisp.h"
+#ifdef HAVE_SHLIB
+#include "emodules.h"
+#endif
+
+#include "buffer.h"
+#include "file-coding.h"
+
+#ifdef CANNA2
+#define IROHA_BC
+#define CANNA_NEW_WCHAR_AWARE
+#include "canna/jrkanji.h"
+#include "canna/RK.h"
+#else /* !CANNA2 */
+#include "iroha/jrkanji.h"
+#include "iroha/RK.h"
+#endif /* !CANNA2 */
+extern char *jrKanjiError;
+
+extern int (*jrBeepFunc) (void);
+
+/* #### is this global really necessary? */
+#define KEYTOSTRSIZE 2048
+static char key_buffer[KEYTOSTRSIZE];
+static char **warning;
+
+static int canna_empty_info, canna_through_info;
+static int canna_underline;
+static int canna_inhibit_hankakukana;
+
+static Lisp_Object Vcanna_kakutei_string;
+static Lisp_Object Vcanna_kakutei_yomi;
+static Lisp_Object Vcanna_kakutei_romaji;
+static Lisp_Object Vcanna_henkan_string;
+static Fixnum canna_henkan_length;
+static Fixnum canna_henkan_revPos;
+static Fixnum canna_henkan_revLen;
+static Lisp_Object Vcanna_ichiran_string;
+static Fixnum canna_ichiran_length;
+static Fixnum canna_ichiran_revPos;
+static Fixnum canna_ichiran_revLen;
+static Lisp_Object Vcanna_mode_string;
+
+static int IRCP_context;
+
+static Lisp_Object storeResults (char *, int, jrKanjiStatus *);
+static Lisp_Object kanjiYomiList (int, int);
+static Lisp_Object CANNA_mode_keys (void);
+
+#ifdef CANNA_MULE
+static void m2c (unsigned char *, int, unsigned char *);
+static Lisp_Object mule_make_string (unsigned char *, int);
+static int mule_strlen (unsigned char *, int);
+static void count_char (unsigned char *,int, int, int, Fixnum *, Fixnum *, Fixnum *);
+#define make_string mule_make_string
+#endif
+
+/* Lisp functions definition */
+
+DEFUN ("canna-key-proc", Fcanna_key_proc, 1, 1, 0, /*
+Translate a key input to a set of strings. The strings contain both
+well-formed string and intermediate result to show the translation
+information to a user. Converted strings are stored in specific
+variables.
+*/
+ (ch))
+{
+ jrKanjiStatus ks;
+ int len;
+
+ CHECK_CHAR_COERCE_INT (ch);
+ len = jrKanjiString (0, XCHAR (ch), key_buffer, KEYTOSTRSIZE, &ks);
+ return storeResults (key_buffer, len, &ks);
+}
+
+static Lisp_Object
+storeResults (char *buf, int len, jrKanjiStatus *ks)
+{
+ Lisp_Object val = Qnil;
+
+ if (len < 0)
+ { /* Error detected */
+ val = make_string ((unsigned char*) jrKanjiError, strlen (jrKanjiError));
+ }
+ else
+ {
+ /* ³ÎÄꤷ¤¿Ê¸»úÎó (the confirmed string) */
+ Vcanna_kakutei_string = make_string ((unsigned char *) buf, len);
+ val = make_int (len);
+ /* ³ÎÄꤷ¤¿Ê¸»úÎó¤ÎÆɤߤξðÊó...
+ (info about the reading of the confirmed string) */
+ Vcanna_kakutei_yomi = Vcanna_kakutei_romaji = Qnil;
+ if (ks->info & KanjiYomiInfo)
+ {
+ char *p = buf + len + 1;
+ int yomilen = strlen (p);
+
+ if (len + yomilen + 1 < KEYTOSTRSIZE)
+ {
+ int yomilen2;
+
+ Vcanna_kakutei_yomi =
+ make_string ((unsigned char *) p, yomilen); /* ÆÉ¤ß (reading) */
+ p += yomilen + 1;
+ yomilen2 = strlen (p);
+ if (len + yomilen + yomilen2 + 2 < KEYTOSTRSIZE)
+ {
+ Vcanna_kakutei_romaji =
+ make_string ((unsigned char *) p, yomilen2);
+ /* ¥í¡¼¥Þ»ú (romanization) */
+ }
+ }
+ }
+
+
+ /* ¸õÊäɽ¼¨¤Îʸ»úÎó¤Ç¤¹¡£
+ (string for displaying candidate translations) */
+ Vcanna_henkan_string = Qnil;
+ if (ks->length >= 0)
+ {
+ Vcanna_henkan_string = make_string (ks->echoStr, ks->length);
+#ifndef CANNA_MULE
+ canna_henkan_length = ks->length;
+ canna_henkan_revPos = ks->revPos;
+ canna_henkan_revLen = ks->revLen;
+#else /* CANNA_MULE */
+ if (canna_underline)
+ {
+ canna_henkan_length = mule_strlen (ks->echoStr,ks->length);
+ canna_henkan_revPos = mule_strlen (ks->echoStr,ks->revPos);
+ canna_henkan_revLen = mule_strlen (ks->echoStr+ks->revPos,
+ ks->revLen);
+ }
+ else
+ {
+ count_char (ks->echoStr, ks->length, ks->revPos, ks->revLen,
+ &canna_henkan_length, &canna_henkan_revPos,
+ &canna_henkan_revLen);
+ }
+#endif /* CANNA_MULE */
+ }
+
+ /* °ìÍ÷¤Î¾ðÊó (information about the echo area menu) */
+ Vcanna_ichiran_string = Qnil;
+ if (ks->info & KanjiGLineInfo && ks->gline.length >= 0)
+ {
+ Vcanna_ichiran_string = make_string (ks->gline.line,
+ ks->gline.length);
+#ifndef CANNA_MULE
+ canna_ichiran_length = ks->gline.length;
+ canna_ichiran_revPos = ks->gline.revPos;
+ canna_ichiran_revLen = ks->gline.revLen;
+#else /* CANNA_MULE */
+ count_char (ks->gline.line, ks->gline.length,
+ ks->gline.revPos, ks->gline.revLen,
+ &canna_ichiran_length,
+ &canna_ichiran_revPos, &canna_ichiran_revLen);
+#endif /* CANNA_MULE */
+ }
+
+ /* ¥â¡¼¥É¤Î¾ðÊó (mode information) */
+ Vcanna_mode_string = Qnil;
+ if (ks->info & KanjiModeInfo)
+ {
+ Vcanna_mode_string =
+ make_string (ks->mode, strlen ((const char *) ks->mode));
+ }
+
+ /* ¤½¤Î¾¤Î¾ðÊó (other information) */
+ canna_empty_info = (ks->info & KanjiEmptyInfo) ? 1 : 0;
+ canna_through_info = (ks->info & KanjiThroughInfo) ? 1 : 0;
+ }
+
+ return val;
+}
+
+DEFUN ("canna-set-bunsetsu-kugiri", Fcanna_set_bunsetsu, 0, 1, 0, /*
+This function sets the clause separator.
+If non-nil value is specified, the white space separator will be used.
+No separator will be used otherwise.
+*/
+ (num))
+{
+ int kugiri; /* ʸÀá¶èÀÚ¤ê¤ò¤¹¤ë¤«¡© (display clause separator?) */
+
+ kugiri = NILP (num) ? 0 : 1;
+
+ jrKanjiControl (0, KC_SETBUNSETSUKUGIRI, (char *) kugiri);
+
+ return Qnil;
+}
+
+/* For whatever reason, calling Fding directly from libCanna loses */
+static int
+call_Fding (void)
+{
+ Fding (Qnil, Qnil, Qnil);
+ return 0;
+}
+
+DEFUN ("canna-initialize", Fcanna_initialize, 0, 3, 0, /*
+Initialize ``canna'', which is a kana-to-kanji converter for XEmacs.
+The first arg specifies if inserting space character between BUNSETSU when
+candidates are displayed.
+The second arg specifies server.
+The third arg specifies a file which will be used as a customization
+description.
+If nil is specified for each arg, the default value will be used.
+*/
+ (num, server, rcfile))
+{
+ Lisp_Object val;
+ int res;
+ unsigned char **p, **q;
+
+ int kugiri; /* ʸÀá¶èÀÚ¤ê¤ò¤¹¤ë¤«¡© (display clause separator?) */
+
+ IRCP_context = -1;
+
+ if (NILP (num))
+ {
+ kugiri = 1;
+ }
+ else
+ {
+ CHECK_INT (num);
+ kugiri = XINT (num);
+ kugiri = (kugiri == 1) ? 1 : 0;
+ }
+
+ if (NILP (server))
+ {
+ jrKanjiControl (0, KC_SETSERVERNAME, (char *) 0);
+ }
+ else
+ {
+ char servername[256];
+
+ CHECK_STRING (server);
+ strncpy (servername, (const char *) XSTRING_DATA (server),
+ XSTRING_LENGTH (server));
+ servername[XSTRING_LENGTH (server)] = '\0';
+ jrKanjiControl (0, KC_SETSERVERNAME, servername);
+ }
+
+ if (NILP (rcfile))
+ {
+ jrKanjiControl (0, KC_SETINITFILENAME, (char *) 0);
+ }
+ else
+ {
+ char rcname[256];
+
+ CHECK_STRING (rcfile);
+ strncpy (rcname, (const char *) XSTRING_DATA (rcfile),
+ XSTRING_LENGTH (rcfile));
+ rcname[XSTRING_LENGTH (rcfile)] = '\0';
+ jrKanjiControl (0, KC_SETINITFILENAME, rcname);
+ }
+
+ warning = (char **) 0;
+#ifdef nec_ews_svr4
+ stop_polling ();
+#endif /* nec_ews_svr4 */
+ res = jrKanjiControl (0, KC_INITIALIZE, (char *)&warning);
+#ifdef nec_ews_svr4
+ start_polling ();
+#endif /* nec_ews_svr4 */
+ val = Qnil;
+ if (warning)
+ {
+ for (p = q = (unsigned char **) warning ; *q ; q++)
+ ;
+ while (p < q)
+ {
+ q--;
+ val = Fcons (make_string (*q, strlen ((const char *) *q)), val);
+ }
+ }
+ val = Fcons (val, Qnil);
+
+ if (res == -1)
+ {
+ val = Fcons (make_string ((unsigned char *) jrKanjiError,
+ strlen (jrKanjiError)), val);
+ /* ¥¤¥Ë¥·¥ã¥é¥¤¥º¤Ç¼ºÇÔ¤·¤¿¾ì¹ç¡£ (on initialization failure) */
+ return Fcons (Qnil, val);
+ }
+ else
+ {
+ jrBeepFunc = call_Fding;
+
+#ifdef KC_SETAPPNAME
+#ifndef CANNA_MULE
+ jrKanjiControl (0, KC_SETAPPNAME, "nemacs");
+#else /* CANNA_MULE */
+ jrKanjiControl (0, KC_SETAPPNAME, "mule");
+#endif /* CANNA_MULE */
+#endif /* KC_SETAPPNAME */
+
+ jrKanjiControl (0, KC_SETBUNSETSUKUGIRI, (char *) kugiri);
+ jrKanjiControl (0, KC_SETWIDTH, (char *) 78);
+#ifndef CANNA_MULE
+ jrKanjiControl (0, KC_INHIBITHANKAKUKANA, (char *) 1);
+#else
+ /* mule ¤À¤Ã¤¿¤éȾ³Ñ¥«¥¿¥«¥Ê¤â»È¤¨¤ë
+ (Mule can use half-width katakana) */
+ if (canna_inhibit_hankakukana)
+ jrKanjiControl (0, KC_INHIBITHANKAKUKANA, (char *) 1);
+#endif
+ jrKanjiControl (0, KC_YOMIINFO, (char *) 2); /* ¢¨£²: ¥í¡¼¥Þ»ú¤Þ¤ÇÊÖ¤¹
+ (*2: return to
+ romanized form) */
+ val = Fcons (Qnil, val);
+ return Fcons (CANNA_mode_keys (), val);
+ }
+}
+
+DEFUN ("canna-finalize", Fcanna_finalize, 0, 0, 0, /*
+finalize ``canna'', which is a kana-to-kanji converter for XEmacs.
+This cause to write miscellaneous informations to kana-to-kanji dictionary.
+*/
+ ())
+{
+ Lisp_Object val;
+ unsigned char **p;
+
+ jrKanjiControl (0, KC_FINALIZE, (char *)&warning);
+
+ val = Qnil;
+ if (warning)
+ {
+ for (p = (unsigned char**) warning ; *p ; p++)
+ {
+ val = Fcons (make_string (*p, strlen ((const char *) *p)), val);
+ }
+ }
+ val = Fcons (val, Qnil);
+ IRCP_context = -1;
+ return val;
+}
+
+DEFUN ("canna-touroku-string", Fcanna_touroku_string, 1, 1, 0, /*
+Register Kanji words into kana-to-kanji conversion dictionary.
+*/
+ (str))
+{
+ jrKanjiStatusWithValue ksv;
+ jrKanjiStatus ks;
+#ifdef CANNA_MULE
+ unsigned char cbuf[4096];
+#endif
+
+ CHECK_STRING (str);
+ ksv.buffer = (unsigned char *) key_buffer;
+ ksv.bytes_buffer = KEYTOSTRSIZE;
+#ifndef CANNA_MULE
+ ks.echoStr = XSTRING_DATA (str);
+ ks.length = XSTRING_LENGTH (str);
+#else /* CANNA_MULE */
+ m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), cbuf);
+ ks.echoStr = cbuf;
+ ks.length = strlen ((const char *) cbuf);
+#endif /* CANNA_MULE */
+ ksv.ks = &ks;
+ jrKanjiControl (0, KC_DEFINEKANJI, (char *)&ksv);
+ return storeResults (key_buffer, ksv.val, ksv.ks);
+}
+
+DEFUN ("canna-set-width", Fcanna_set_width, 1, 1, 0, /*
+Set status-line width information, which is used to display
+kanji candidates.
+*/
+ (num))
+{
+ CHECK_INT (num);
+
+ jrKanjiControl (0, KC_SETWIDTH, (char *) XINT (num));
+ return Qnil;
+}
+
+DEFUN ("canna-change-mode", Fcanna_change_mode, 1, 1, 0, /*
+Change Japanese pre-edit mode.
+*/
+ (num))
+{
+ jrKanjiStatusWithValue ksv;
+ jrKanjiStatus ks;
+
+ CHECK_INT (num);
+
+ ksv.buffer = (unsigned char *) key_buffer;
+ ksv.bytes_buffer = KEYTOSTRSIZE;
+ ksv.ks = &ks;
+ ksv.val = XINT (num);
+ jrKanjiControl (0, KC_CHANGEMODE, (char *)&ksv);
+ return storeResults (key_buffer, ksv.val, ksv.ks);
+}
+
+static Lisp_Object
+CANNA_mode_keys (void)
+{
+#define CANNAWORKBUFSIZE 32
+ char xxx[CANNAWORKBUFSIZE];
+ Lisp_Object val;
+ int i, n;
+
+ n = jrKanjiControl (0, KC_MODEKEYS, xxx);
+ val = Qnil;
+ for (i = n ; i > 0 ;)
+ {
+ --i;
+ /* !!#### something fucked here */
+ val = Fcons (make_char ((int)(0xFF & (unsigned char) xxx[i])), val);
+ }
+ return val;
+}
+
+DEFUN ("canna-store-yomi", Fcanna_store_yomi, 1, 2, 0, /*
+Store yomi characters as a YOMI of kana-to-kanji conversion.
+*/
+ (yomi, roma))
+{
+ jrKanjiStatusWithValue ksv;
+ jrKanjiStatus ks;
+
+ CHECK_STRING (yomi);
+#ifndef CANNA_MULE
+ strncpy (key_buffer, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi));
+ ks.length = XSTRING_LENGTH (yomi);
+ key_buffer[ks.length] = '\0';
+#else /* CANNA_MULE */
+ m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi),
+ (unsigned char *) key_buffer);
+ ks.length = strlen (key_buffer);
+#endif /* CANNA_MULE */
+
+ if (NILP (roma))
+ {
+ ks.mode = 0;
+ }
+ else
+ {
+ CHECK_STRING (roma);
+
+#ifndef CANNA_MULE
+ strncpy (key_buffer + XSTRING_LENGTH (yomi) + 1, XSTRING_DATA (roma),
+ XSTRING_LENGTH (roma));
+ key_buffer[XSTRING_LENGTH (yomi) + 1 + XSTRING_LENGTH (roma)] = '\0';
+ ks.mode = (unsigned char *)(key_buffer + XSTRING_LENGTH (yomi) + 1);
+#else /* CANNA_MULE */
+ ks.mode = (unsigned char *)(key_buffer + ks.length + 1);
+ m2c (XSTRING_DATA (roma), XSTRING_LENGTH (roma),
+ (unsigned char *) ks.mode);
+#endif /* CANNA_MULE */
+ }
+
+ ks.echoStr = (unsigned char *) key_buffer;
+ ksv.buffer = (unsigned char *) key_buffer; /* ÊÖÃÍÍÑ (return value) */
+ ksv.bytes_buffer = KEYTOSTRSIZE;
+ ksv.ks = &ks;
+
+ jrKanjiControl (0, KC_STOREYOMI, (char *)&ksv);
+
+ return storeResults (key_buffer, ksv.val, ksv.ks);
+}
+
+DEFUN ("canna-do-function", Fcanna_do_function, 1, 2, 0, /*
+Do specified function at current mode.
+*/
+ (num, ch))
+{
+ jrKanjiStatusWithValue ksv;
+ jrKanjiStatus ks;
+
+ CHECK_INT (num);
+
+ if (NILP (ch))
+ {
+ *key_buffer = '＠';
+ }
+ else
+ {
+ CHECK_CHAR (ch);
+ *key_buffer = XCHAR (ch);
+ }
+
+ ksv.buffer = (unsigned char *) key_buffer;
+ ksv.bytes_buffer = KEYTOSTRSIZE;
+ ksv.ks = &ks;
+ ksv.val = XINT (num);
+ jrKanjiControl (0, KC_DO, (char *) &ksv);
+ return storeResults (key_buffer, ksv.val, ksv.ks);
+}
+
+DEFUN ("canna-parse", Fcanna_parse, 1, 1, 0, /*
+Parse customize string.
+*/
+ (str))
+{
+ Lisp_Object val;
+ unsigned char **p;
+ int n;
+
+ CHECK_STRING (str);
+
+#ifndef CANNA_MULE
+ strncpy (key_buffer, XSTRING_DATA (str), XSTRING_LENGTH (str));
+ key_buffer[XSTRING_LENGTH (str)] = '\0';
+#else /* CANNA_MULE */
+ m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), (unsigned char *) key_buffer);
+#endif /* CANNA_MULE */
+ p = (unsigned char**) key_buffer;
+ n = jrKanjiControl (0, KC_PARSE, (char *) &p);
+ val = Qnil;
+ while (n > 0)
+ {
+ n--;
+ val = Fcons (make_string (p[n], strlen ((const char *) p[n])), val);
+ }
+ return val;
+}
+
+DEFUN ("canna-query-mode", Fcanna_query_mode, 0, 0, 0, /*
+Get current mode string.
+*/
+ ())
+{
+ char buf[256];
+
+ jrKanjiControl (0, KC_QUERYMODE, buf);
+ return make_string ((unsigned char *) buf, strlen (buf));
+}
+
+/*
+ * Functions following this line are for KKCP interface compatible
+ * library. These functions may be used by MILK system.
+ */
+
+#define RKBUFSIZE 1024
+
+static unsigned char yomibuf[RKBUFSIZE];
+static short kugiri[RKBUFSIZE / 2];
+
+static int
+confirmContext (void)
+{
+ if (IRCP_context < 0)
+ {
+ int context;
+
+ if ((context = jrKanjiControl (0, KC_GETCONTEXT, (char *) 0)) == -1)
+ {
+ return 0;
+ }
+ IRCP_context = context;
+ }
+ return 1;
+}
+
+static int
+byteLen (int bun, int len)
+{
+ int i = 0, offset = 0, ch;
+
+ if (0 <= bun && bun < RKBUFSIZE)
+ {
+ offset = kugiri[bun];
+ }
+
+ while (len-- > 0 && (ch = (int) yomibuf[offset + i]))
+ {
+ i++;
+ if (ch & 0x80)
+ {
+ i++;
+ }
+ }
+ return i;
+}
+
+DEFUN ("canna-henkan-begin", Fcanna_henkan_begin, 1, 1, 0, /*
+Return the result of kana-to-kanji conversion.
+Clause separator is set.
+*/
+ (yomi))
+{
+ int nbun;
+
+ CHECK_STRING (yomi);
+ if (confirmContext () == 0)
+ {
+ return Qnil;
+ }
+#ifndef CANNA_MULE
+ strncpy (yomibuf, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi));
+ yomibuf[XSTRING_LENGTH (yomi)] = '\0';
+ nbun = RkBgnBun (IRCP_context, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi),
+ (RK_XFER << RK_XFERBITS) | RK_KFER);
+#else /* CANNA_MULE */
+ m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), yomibuf);
+ nbun = RkBgnBun (IRCP_context, (char *) yomibuf,
+ strlen ((const char *) yomibuf),
+ (RK_XFER << RK_XFERBITS) | RK_KFER);
+#endif /* CANNA_MULE */
+
+ return kanjiYomiList (IRCP_context, nbun);
+}
+
+static Lisp_Object
+kanjiYomiList (int context, int nbun)
+{
+ Lisp_Object val, res = Qnil;
+ unsigned char RkBuf[RKBUFSIZE];
+ int len, i, total;
+
+ for (i = nbun ; i > 0 ; )
+ {
+ i--;
+ RkGoTo (context, i);
+ len = RkGetKanji (context, RkBuf, RKBUFSIZE);
+ val = make_string (RkBuf, len);
+ len = RkGetYomi (context, RkBuf, RKBUFSIZE);
+ res = Fcons (Fcons (val, make_string (RkBuf, len)), res);
+ if (i < RKBUFSIZE / 2)
+ {
+ kugiri[i] = len;
+ }
+ }
+ for (i = 0, total = 0 ; i < nbun ; i++)
+ {
+ int temp = kugiri[i];
+ kugiri[i] = total;
+ total += temp;
+ }
+ return res;
+}
+
+DEFUN ("canna-henkan-next", Fcanna_henkan_next, 1, 1, 0, /*
+Return the list of candidates.
+*/
+ (bunsetsu))
+{
+ int i, slen, len;
+ unsigned char *p, RkBuf[RKBUFSIZE];
+ Lisp_Object res = Qnil;
+
+ CHECK_INT (bunsetsu);
+ if (confirmContext () == 0)
+ {
+ return Qnil;
+ }
+ RkGoTo (IRCP_context, XINT (bunsetsu));
+ len = RkGetKanjiList (IRCP_context, RkBuf, RKBUFSIZE);
+ p = RkBuf;
+ for (i = 0 ; i < len ; i++)
+ {
+ slen = strlen ((const char *) p);
+ if (NILP(res))
+ {
+ res = Fcons (make_string (p, slen), Qnil);
+ }
+ else
+ {
+ XCDR (res) = Fcons (make_string (p, slen), Qnil);
+ }
+ p += slen + 1;
+ }
+ return res;
+}
+
+DEFUN ("canna-bunsetu-henkou", Fcanna_bunsetu_henkou, 2, 2, 0, /*
+Specify the length of a clause.
+*/
+ (bunsetsu, bunlen))
+{
+ int nbun, len;
+
+ CHECK_INT (bunsetsu);
+ CHECK_INT (bunlen);
+
+ nbun = XINT (bunsetsu);
+ if (confirmContext () == 0)
+ {
+ return Qnil;
+ }
+ RkGoTo (IRCP_context, nbun);
+ len = byteLen (nbun, XINT (bunlen));
+ return kanjiYomiList (IRCP_context, RkResize (IRCP_context, len));
+}
+
+DEFUN ("canna-henkan-kakutei", Fcanna_henkan_kakutei, 2, 2, 0, /*
+Select a candidate.
+*/
+ (bun, kouho))
+{
+ int nbun, nkouho;
+
+ if (confirmContext () == 0)
+ {
+ return Qnil;
+ }
+ nbun = XINT(bun);
+ RkGoTo (IRCP_context, nbun);
+
+ nkouho = XINT(kouho);
+ RkXfer (IRCP_context, nkouho);
+ return Qt;
+}
+
+DEFUN ("canna-henkan-end", Fcanna_henkan_end, 0, 0, 0, /*
+End conversion.
+*/
+ ())
+{
+ if (confirmContext () == 0)
+ {
+ return Qnil;
+ }
+ RkEndBun (IRCP_context, 1); /* ³Ø½¬¤Ï¤¤¤Ä¤Ç¤â¹Ô¤Ã¤ÆÎɤ¤¤â¤Î¤Ê¤Î¤«¡©
+ (is it OK to invoke learning function
+ at arbitrary times?) */
+ return Qt;
+}
+
+DEFUN ("canna-henkan-quit", Fcanna_henkan_quit, 0, 0, 0, /*
+Quit conversion.
+*/
+ ())
+{
+ if (confirmContext () == 0)
+ {
+ return Qnil;
+ }
+ RkEndBun (IRCP_context, 0);
+ return Qt;
+}
+
+/* variables below this line is constants of Canna */
+
+static Fixnum canna_mode_AlphaMode;
+static Fixnum canna_mode_EmptyMode;
+static Fixnum canna_mode_KigoMode;
+static Fixnum canna_mode_YomiMode;
+static Fixnum canna_mode_JishuMode;
+static Fixnum canna_mode_TankouhoMode;
+static Fixnum canna_mode_IchiranMode;
+static Fixnum canna_mode_YesNoMode;
+static Fixnum canna_mode_OnOffMode;
+#ifdef CANNA_MODE_AdjustBunsetsuMode
+static Fixnum canna_mode_AdjustBunsetsuMode;
+#endif
+#ifdef CANNA_MODE_ChikujiYomiMode
+static Fixnum canna_mode_ChikujiYomiMode;
+static Fixnum canna_mode_ChikujiTanMode;
+#endif
+
+static Fixnum canna_mode_HenkanMode;
+#ifdef CANNA_MODE_HenkanNyuryokuMode
+static Fixnum canna_mode_HenkanNyuryokuMode;
+#endif
+#ifdef CANNA_MODE_ZenHiraHenkanMode
+static Fixnum canna_mode_ZenHiraHenkanMode;
+#ifdef CANNA_MODE_HanHiraHenkanMode
+static Fixnum canna_mode_HanHiraHenkanMode;
+#endif
+static Fixnum canna_mode_ZenKataHenkanMode;
+static Fixnum canna_mode_HanKataHenkanMode;
+static Fixnum canna_mode_ZenAlphaHenkanMode;
+static Fixnum canna_mode_HanAlphaHenkanMode;
+#endif
+static Fixnum canna_mode_ZenHiraKakuteiMode;
+#ifdef CANNA_MODE_HanHiraKakuteiMode
+static Fixnum canna_mode_HanHiraKakuteiMode;
+#endif
+static Fixnum canna_mode_ZenKataKakuteiMode;
+static Fixnum canna_mode_HanKataKakuteiMode;
+static Fixnum canna_mode_ZenAlphaKakuteiMode;
+static Fixnum canna_mode_HanAlphaKakuteiMode;
+static Fixnum canna_mode_HexMode;
+static Fixnum canna_mode_BushuMode;
+static Fixnum canna_mode_ExtendMode;
+static Fixnum canna_mode_RussianMode;
+static Fixnum canna_mode_GreekMode;
+static Fixnum canna_mode_LineMode;
+static Fixnum canna_mode_ChangingServerMode;
+static Fixnum canna_mode_HenkanMethodMode;
+static Fixnum canna_mode_DeleteDicMode;
+static Fixnum canna_mode_TourokuMode;
+static Fixnum canna_mode_TourokuEmptyMode;
+static Fixnum canna_mode_TourokuHinshiMode;
+static Fixnum canna_mode_TourokuDicMode;
+static Fixnum canna_mode_QuotedInsertMode;
+static Fixnum canna_mode_BubunMuhenkanMode;
+static Fixnum canna_mode_MountDicMode;
+
+static Fixnum canna_fn_SelfInsert;
+static Fixnum canna_fn_FunctionalInsert;
+static Fixnum canna_fn_QuotedInsert;
+static Fixnum canna_fn_JapaneseMode;
+static Fixnum canna_fn_AlphaMode;
+static Fixnum canna_fn_HenkanNyuryokuMode;
+static Fixnum canna_fn_Forward;
+static Fixnum canna_fn_Backward;
+static Fixnum canna_fn_Next;
+static Fixnum canna_fn_Prev;
+static Fixnum canna_fn_BeginningOfLine;
+static Fixnum canna_fn_EndOfLine;
+static Fixnum canna_fn_DeleteNext;
+static Fixnum canna_fn_DeletePrevious;
+static Fixnum canna_fn_KillToEndOfLine;
+static Fixnum canna_fn_Henkan;
+static Fixnum canna_fn_Kakutei;
+static Fixnum canna_fn_Extend;
+static Fixnum canna_fn_Shrink;
+#ifdef CANNA_FN_AdjustBunsetsu
+static Fixnum canna_fn_AdjustBunsetsu;
+#endif
+static Fixnum canna_fn_Quit;
+static Fixnum canna_fn_ConvertAsHex;
+static Fixnum canna_fn_ConvertAsBushu;
+static Fixnum canna_fn_KouhoIchiran;
+static Fixnum canna_fn_BubunMuhenkan;
+static Fixnum canna_fn_Zenkaku;
+static Fixnum canna_fn_Hankaku;
+static Fixnum canna_fn_ToUpper;
+static Fixnum canna_fn_Capitalize;
+static Fixnum canna_fn_ToLower;
+static Fixnum canna_fn_Hiragana;
+static Fixnum canna_fn_Katakana;
+static Fixnum canna_fn_Romaji;
+#ifdef CANNA_FN_BaseHiragana
+static Fixnum canna_fn_BaseHiragana;
+static Fixnum canna_fn_BaseKatakana;
+static Fixnum canna_fn_BaseEisu;
+static Fixnum canna_fn_BaseZenkaku;
+static Fixnum canna_fn_BaseHankaku;
+static Fixnum canna_fn_BaseKana;
+static Fixnum canna_fn_BaseKakutei;
+static Fixnum canna_fn_BaseHenkan;
+static Fixnum canna_fn_BaseHiraKataToggle;
+static Fixnum canna_fn_BaseZenHanToggle;
+static Fixnum canna_fn_BaseKanaEisuToggle;
+static Fixnum canna_fn_BaseKakuteiHenkanToggle;
+static Fixnum canna_fn_BaseRotateForward;
+static Fixnum canna_fn_BaseRotateBackward;
+#endif
+static Fixnum canna_fn_ExtendMode;
+static Fixnum canna_fn_Touroku;
+static Fixnum canna_fn_HexMode;
+static Fixnum canna_fn_BushuMode;
+static Fixnum canna_fn_KigouMode;
+#ifdef CANNA_FN_Mark
+static Fixnum canna_fn_Mark;
+#endif
+#ifdef CANNA_FN_TemporalMode
+static Fixnum canna_fn_TemporalMode;
+#endif
+
+static Fixnum canna_key_Nfer;
+static Fixnum canna_key_Xfer;
+static Fixnum canna_key_Up;
+static Fixnum canna_key_Left;
+static Fixnum canna_key_Right;
+static Fixnum canna_key_Down;
+static Fixnum canna_key_Insert;
+static Fixnum canna_key_Rollup;
+static Fixnum canna_key_Rolldown;
+static Fixnum canna_key_Home;
+static Fixnum canna_key_Help;
+static Fixnum canna_key_KP_Key;
+static Fixnum canna_key_Shift_Nfer;
+static Fixnum canna_key_Shift_Xfer;
+static Fixnum canna_key_Shift_Up;
+static Fixnum canna_key_Shift_Left;
+static Fixnum canna_key_Shift_Right;
+static Fixnum canna_key_Shift_Down;
+static Fixnum canna_key_Cntrl_Nfer;
+static Fixnum canna_key_Cntrl_Xfer;
+static Fixnum canna_key_Cntrl_Up;
+static Fixnum canna_key_Cntrl_Left;
+static Fixnum canna_key_Cntrl_Right;
+static Fixnum canna_key_Cntrl_Down;
+
+Lisp_Object VCANNA; /* by MORIOKA Tomohiko <morioka(a)jaist.ac.jp>
+ 1996/6/7 */
+
+/*
+ * Each dynamically loaded Emacs module is given a name at compile
+ * time. This is a short name, and must be a valid part of a C
+ * identifier. This name is used to construct the name of several
+ * functions which must appear in the module source code.
+ * The first such function, modules_of_XXXX, should load in any dependent
+ * modules. This function is optional, and the module will still load if
+ * it is not present in the module.
+ *
+ * The second function, which is NOT optional, is syms_of_XXXX, in which
+ * all functions that the module will be provided are declared. This
+ * function will contain calls to DEFSUBR().
+ *
+ * The third function, which is also NOT optional, is vars_of_XXXX, in
+ * which you declare all variables that the module provides. This
+ * function will contain calls to DEFVAR_LISP(), DEFVAR_BOOL() etc.
+ *
+ * When declaring functions and variables in the syms_of_XXXX and
+ * vars_of_XXXX functions, you use the exact same syntax that you
+ * would as if this module were being compiled into the pure Emacs.
+ *
+ * The fourth function, which is optional, is unload_XXXX, in which actions
+ * that must be taken to unload the module are listed. XEmacs will unbind
+ * functions and variables for you. Anything else that must be done should
+ * appear in this function.
+ *
+ * All four of these functions are declared as void functions,
+ * taking no parameters. Since this sample module is called 'sample',
+ * the functions will be named 'modules_of_sample', 'syms_of_sample',
+ * 'vars_of_sample', and 'unload_sample'.
+ */
+
+#if 0
+void
+modules_of_canna_api (void)
+{
+ /*
+ * This function isn't actually required as we will not be loading
+ * in any dependent modules, but if we were, we would do something like:
+ * emodules_load ("dependent.ell", "canna2", "1.0.0");
+ */
+}
+#endif
+
+void
+syms_of_canna_api (void)
+{
+ DEFSUBR (Fcanna_key_proc);
+ DEFSUBR (Fcanna_initialize);
+ DEFSUBR (Fcanna_finalize);
+ DEFSUBR (Fcanna_touroku_string);
+ DEFSUBR (Fcanna_set_width);
+ DEFSUBR (Fcanna_change_mode);
+ DEFSUBR (Fcanna_store_yomi);
+ DEFSUBR (Fcanna_do_function);
+ DEFSUBR (Fcanna_parse);
+ DEFSUBR (Fcanna_query_mode);
+ DEFSUBR (Fcanna_set_bunsetsu);
+
+ DEFSUBR (Fcanna_henkan_begin);
+ DEFSUBR (Fcanna_henkan_next);
+ DEFSUBR (Fcanna_bunsetu_henkou);
+ DEFSUBR (Fcanna_henkan_kakutei);
+ DEFSUBR (Fcanna_henkan_end);
+ DEFSUBR (Fcanna_henkan_quit);
+}
+
+void
+vars_of_canna_api (void)
+{
+ DEFVAR_LISP ("CANNA", &VCANNA); /* hir＠nec, 1992.5.21 */
+ VCANNA = Qt; /* hir＠nec, 1992.5.21 */
+
+ DEFVAR_LISP ("canna-kakutei-string", &Vcanna_kakutei_string /*
+
+*/ );
+ Vcanna_kakutei_string = Qnil;
+
+ DEFVAR_LISP ("canna-kakutei-yomi", &Vcanna_kakutei_yomi /*
+
+*/ );
+ Vcanna_kakutei_yomi = Qnil;
+
+ DEFVAR_LISP ("canna-kakutei-romaji", &Vcanna_kakutei_romaji /*
+
+*/ );
+ Vcanna_kakutei_romaji = Qnil;
+
+ DEFVAR_LISP ("canna-henkan-string", &Vcanna_henkan_string /*
+
+*/ );
+ Vcanna_henkan_string = Qnil;
+
+ DEFVAR_INT ("canna-henkan-length", &canna_henkan_length /*
+
+*/ );
+ canna_henkan_length = 0;
+
+ DEFVAR_INT ("canna-henkan-revpos", &canna_henkan_revPos /*
+
+*/ );
+ canna_henkan_revPos = 0;
+
+ DEFVAR_INT ("canna-henkan-revlen", &canna_henkan_revLen /*
+
+*/ );
+ canna_henkan_revLen = 0;
+
+ DEFVAR_LISP ("canna-ichiran-string", &Vcanna_ichiran_string /*
+
+*/ );
+ Vcanna_ichiran_string = Qnil;
+
+ DEFVAR_INT ("canna-ichiran-length", &canna_ichiran_length /*
+
+*/ );
+ canna_ichiran_length = 0;
+
+ DEFVAR_INT ("canna-ichiran-revpos", &canna_ichiran_revPos /*
+
+*/ );
+ canna_ichiran_revPos = 0;
+
+ DEFVAR_INT ("canna-ichiran-revlen", &canna_ichiran_revLen /*
+
+*/ );
+ canna_ichiran_revLen = 0;
+
+ DEFVAR_LISP ("canna-mode-string", &Vcanna_mode_string /*
+
+*/ );
+ Vcanna_mode_string = Qnil;
+
+ DEFVAR_BOOL ("canna-empty-info", &canna_empty_info /*
+For canna
+*/ );
+ canna_empty_info = 0;
+
+ DEFVAR_BOOL ("canna-through-info", &canna_through_info /*
+For canna
+*/ );
+ canna_through_info = 0;
+
+ DEFVAR_BOOL ("canna-underline", &canna_underline /*
+For canna
+*/ );
+ canna_underline = 0;
+
+ DEFVAR_BOOL ("canna-inhibit-hankakukana", &canna_inhibit_hankakukana /*
+For canna
+*/ );
+ canna_inhibit_hankakukana = 0;
+
+ DEFVAR_INT ("canna-mode-alpha-mode", &canna_mode_AlphaMode /*
+
+*/ );
+ canna_mode_AlphaMode = IROHA_MODE_AlphaMode;
+
+ DEFVAR_INT ("canna-mode-empty-mode", &canna_mode_EmptyMode /*
+
+*/ );
+ canna_mode_EmptyMode = IROHA_MODE_EmptyMode;
+
+ DEFVAR_INT ("canna-mode-kigo-mode", &canna_mode_KigoMode /*
+
+*/ );
+ canna_mode_KigoMode = IROHA_MODE_KigoMode;
+
+ DEFVAR_INT ("canna-mode-yomi-mode", &canna_mode_YomiMode /*
+
+*/ );
+ canna_mode_YomiMode = IROHA_MODE_YomiMode;
+
+ DEFVAR_INT ("canna-mode-jishu-mode", &canna_mode_JishuMode /*
+
+*/ );
+ canna_mode_JishuMode = IROHA_MODE_JishuMode;
+
+ DEFVAR_INT ("canna-mode-tankouho-mode", &canna_mode_TankouhoMode /*
+
+*/ );
+ canna_mode_TankouhoMode = IROHA_MODE_TankouhoMode;
+
+ DEFVAR_INT ("canna-mode-ichiran-mode", &canna_mode_IchiranMode /*
+
+*/ );
+ canna_mode_IchiranMode = IROHA_MODE_IchiranMode;
+
+ DEFVAR_INT ("canna-mode-yes-no-mode", &canna_mode_YesNoMode /*
+
+*/ );
+ canna_mode_YesNoMode = IROHA_MODE_YesNoMode;
+
+ DEFVAR_INT ("canna-mode-on-off-mode", &canna_mode_OnOffMode /*
+
+*/ );
+ canna_mode_OnOffMode = IROHA_MODE_OnOffMode;
+
+#ifdef CANNA_MODE_AdjustBunsetsuMode
+ DEFVAR_INT ("canna-mode-adjust-bunsetsu-mode",
+ &canna_mode_AdjustBunsetsuMode /*
+
+*/ );
+ canna_mode_AdjustBunsetsuMode = CANNA_MODE_AdjustBunsetsuMode;
+#endif
+#ifdef CANNA_MODE_ChikujiYomiMode
+ DEFVAR_INT ("canna-mode-chikuji-yomi-mode", &canna_mode_ChikujiYomiMode /*
+
+*/ );
+ canna_mode_ChikujiYomiMode = CANNA_MODE_ChikujiYomiMode;
+
+ DEFVAR_INT ("canna-mode-chikuji-bunsetsu-mode",
+ &canna_mode_ChikujiTanMode /*
+
+*/ );
+ canna_mode_ChikujiTanMode = CANNA_MODE_ChikujiTanMode;
+#endif
+
+ DEFVAR_INT ("canna-mode-henkan-mode", &canna_mode_HenkanMode /*
+
+*/ );
+ canna_mode_HenkanMode = IROHA_MODE_HenkanMode;
+
+#ifdef CANNA_MODE_HenkanNyuryokuMode
+ DEFVAR_INT ("canna-mode-henkan-nyuuryoku-mode",
+ &canna_mode_HenkanNyuryokuMode /*
+
+*/ );
+ canna_mode_HenkanNyuryokuMode = CANNA_MODE_HenkanNyuryokuMode;
+#endif
+#ifdef CANNA_MODE_ZenHiraHenkanMode
+ DEFVAR_INT ("canna-mode-zen-hira-henkan-mode",
+ &canna_mode_ZenHiraHenkanMode /*
+
+*/ );
+ canna_mode_ZenHiraHenkanMode = CANNA_MODE_ZenHiraHenkanMode;
+#ifdef CANNA_MODE_HanHiraHenkanMode
+ DEFVAR_INT ("canna-mode-han-hira-henkan-mode",
+ &canna_mode_HanHiraHenkanMode /*
+
+*/ );
+ canna_mode_HanHiraHenkanMode = CANNA_MODE_HanHiraHenkanMode;
+#endif
+ DEFVAR_INT ("canna-mode-zen-kata-henkan-mode",
+ &canna_mode_ZenKataHenkanMode /*
+
+*/ );
+ canna_mode_ZenKataHenkanMode = CANNA_MODE_ZenKataHenkanMode;
+
+ DEFVAR_INT ("canna-mode-han-kata-henkan-mode",
+ &canna_mode_HanKataHenkanMode /*
+
+*/ );
+ canna_mode_HanKataHenkanMode = CANNA_MODE_HanKataHenkanMode;
+
+ DEFVAR_INT ("canna-mode-zen-alpha-henkan-mode",
+ &canna_mode_ZenAlphaHenkanMode /*
+
+*/ );
+ canna_mode_ZenAlphaHenkanMode = CANNA_MODE_ZenAlphaHenkanMode;
+
+ DEFVAR_INT ("canna-mode-han-alpha-henkan-mode",
+ &canna_mode_HanAlphaHenkanMode /*
+
+*/ );
+ canna_mode_HanAlphaHenkanMode = CANNA_MODE_HanAlphaHenkanMode;
+#endif
+ DEFVAR_INT ("canna-mode-zen-hira-kakutei-mode",
+ &canna_mode_ZenHiraKakuteiMode /*
+
+*/ );
+ canna_mode_ZenHiraKakuteiMode = IROHA_MODE_ZenHiraKakuteiMode;
+#ifdef CANNA_MODE_HanHiraKakuteiMode
+ DEFVAR_INT ("canna-mode-han-hira-kakutei-mode",
+ &canna_mode_HanHiraKakuteiMode /*
+
+*/ );
+ canna_mode_HanHiraKakuteiMode = CANNA_MODE_HanHiraKakuteiMode;
+#endif
+ DEFVAR_INT ("canna-mode-zen-kata-kakutei-mode",
+ &canna_mode_ZenKataKakuteiMode /*
+
+*/ );
+ canna_mode_ZenKataKakuteiMode = IROHA_MODE_ZenKataKakuteiMode;
+
+ DEFVAR_INT ("canna-mode-han-kata-kakutei-mode",
+ &canna_mode_HanKataKakuteiMode /*
+
+*/ );
+ canna_mode_HanKataKakuteiMode = IROHA_MODE_HanKataKakuteiMode;
+
+ DEFVAR_INT ("canna-mode-zen-alpha-kakutei-mode",
+ &canna_mode_ZenAlphaKakuteiMode /*
+
+*/ );
+ canna_mode_ZenAlphaKakuteiMode = IROHA_MODE_ZenAlphaKakuteiMode;
+
+ DEFVAR_INT ("canna-mode-han-alpha-kakutei-mode",
+ &canna_mode_HanAlphaKakuteiMode /*
+
+*/ );
+ canna_mode_HanAlphaKakuteiMode = IROHA_MODE_HanAlphaKakuteiMode;
+
+ DEFVAR_INT ("canna-mode-hex-mode", &canna_mode_HexMode /*
+
+*/ );
+ canna_mode_HexMode = IROHA_MODE_HexMode;
+
+ DEFVAR_INT ("canna-mode-bushu-mode", &canna_mode_BushuMode /*
+
+*/ );
+ canna_mode_BushuMode = IROHA_MODE_BushuMode;
+
+ DEFVAR_INT ("canna-mode-extend-mode", &canna_mode_ExtendMode /*
+
+*/ );
+ canna_mode_ExtendMode = IROHA_MODE_ExtendMode;
+
+ DEFVAR_INT ("canna-mode-russian-mode", &canna_mode_RussianMode /*
+
+*/ );
+ canna_mode_RussianMode = IROHA_MODE_RussianMode;
+
+ DEFVAR_INT ("canna-mode-greek-mode", &canna_mode_GreekMode /*
+
+*/ );
+ canna_mode_GreekMode = IROHA_MODE_GreekMode;
+
+ DEFVAR_INT ("canna-mode-line-mode", &canna_mode_LineMode /*
+
+*/ );
+ canna_mode_LineMode = IROHA_MODE_LineMode;
+
+ DEFVAR_INT ("canna-mode-changing-server-mode",
+ &canna_mode_ChangingServerMode /*
+
+*/ );
+ canna_mode_ChangingServerMode = IROHA_MODE_ChangingServerMode;
+
+ DEFVAR_INT ("canna-mode-henkan-method-mode",
+ &canna_mode_HenkanMethodMode /*
+
+*/ );
+ canna_mode_HenkanMethodMode = IROHA_MODE_HenkanMethodMode;
+
+ DEFVAR_INT ("canna-mode-delete-dic-mode", &canna_mode_DeleteDicMode /*
+
+*/ );
+ canna_mode_DeleteDicMode = IROHA_MODE_DeleteDicMode;
+
+ DEFVAR_INT ("canna-mode-touroku-mode", &canna_mode_TourokuMode /*
+
+*/ );
+ canna_mode_TourokuMode = IROHA_MODE_TourokuMode;
+
+ DEFVAR_INT ("canna-mode-touroku-empty-mode",
+ &canna_mode_TourokuEmptyMode /*
+
+*/ );
+ canna_mode_TourokuEmptyMode = IROHA_MODE_TourokuEmptyMode;
+
+ DEFVAR_INT ("canna-mode-touroku-hinshi-mode",
+ &canna_mode_TourokuHinshiMode /*
+
+*/ );
+ canna_mode_TourokuHinshiMode = IROHA_MODE_TourokuHinshiMode;
+
+ DEFVAR_INT ("canna-mode-touroku-dic-mode", &canna_mode_TourokuDicMode /*
+
+*/ );
+ canna_mode_TourokuDicMode = IROHA_MODE_TourokuDicMode;
+
+ DEFVAR_INT ("canna-mode-quoted-insert-mode",
+ &canna_mode_QuotedInsertMode /*
+
+*/ );
+ canna_mode_QuotedInsertMode = IROHA_MODE_QuotedInsertMode;
+
+ DEFVAR_INT ("canna-mode-bubun-muhenkan-mode",
+ &canna_mode_BubunMuhenkanMode /*
+
+*/ );
+ canna_mode_BubunMuhenkanMode = IROHA_MODE_BubunMuhenkanMode;
+
+ DEFVAR_INT ("canna-mode-mount-dic-mode", &canna_mode_MountDicMode /*
+
+*/ );
+ canna_mode_MountDicMode = IROHA_MODE_MountDicMode;
+
+ DEFVAR_INT ("canna-func-self-insert", &canna_fn_SelfInsert /*
+
+*/ );
+ canna_fn_SelfInsert = IROHA_FN_SelfInsert;
+
+ DEFVAR_INT ("canna-func-functional-insert", &canna_fn_FunctionalInsert /*
+
+*/ );
+ canna_fn_FunctionalInsert = IROHA_FN_FunctionalInsert;
+
+ DEFVAR_INT ("canna-func-quoted-insert", &canna_fn_QuotedInsert /*
+
+*/ );
+ canna_fn_QuotedInsert = IROHA_FN_QuotedInsert;
+
+ DEFVAR_INT ("canna-func-japanese-mode", &canna_fn_JapaneseMode /*
+
+*/ );
+ canna_fn_JapaneseMode = IROHA_FN_JapaneseMode;
+
+ DEFVAR_INT ("canna-func-alpha-mode", &canna_fn_AlphaMode /*
+
+*/ );
+ canna_fn_AlphaMode = IROHA_FN_AlphaMode;
+
+ DEFVAR_INT ("canna-func-henkan-nyuryoku-mode",
+ &canna_fn_HenkanNyuryokuMode /*
+
+*/ );
+ canna_fn_HenkanNyuryokuMode = IROHA_FN_HenkanNyuryokuMode;
+
+ DEFVAR_INT ("canna-func-forward", &canna_fn_Forward /*
+
+*/ );
+ canna_fn_Forward = IROHA_FN_Forward;
+
+ DEFVAR_INT ("canna-func-backward", &canna_fn_Backward /*
+
+*/ );
+ canna_fn_Backward = IROHA_FN_Backward;
+
+ DEFVAR_INT ("canna-func-next", &canna_fn_Next /*
+
+*/ );
+ canna_fn_Next = IROHA_FN_Next;
+
+ DEFVAR_INT ("canna-func-previous", &canna_fn_Prev /*
+
+*/ );
+ canna_fn_Prev = IROHA_FN_Prev;
+
+ DEFVAR_INT ("canna-func-beginning-of-line", &canna_fn_BeginningOfLine /*
+
+*/ );
+ canna_fn_BeginningOfLine = IROHA_FN_BeginningOfLine;
+
+ DEFVAR_INT ("canna-func-end-of-line", &canna_fn_EndOfLine /*
+
+*/ );
+ canna_fn_EndOfLine = IROHA_FN_EndOfLine;
+
+ DEFVAR_INT ("canna-func-delete-next", &canna_fn_DeleteNext /*
+
+*/ );
+ canna_fn_DeleteNext = IROHA_FN_DeleteNext;
+
+ DEFVAR_INT ("canna-func-delete-previous", &canna_fn_DeletePrevious /*
+
+*/ );
+ canna_fn_DeletePrevious = IROHA_FN_DeletePrevious;
+
+ DEFVAR_INT ("canna-func-kill-to-end-of-line", &canna_fn_KillToEndOfLine /*
+
+*/ );
+ canna_fn_KillToEndOfLine = IROHA_FN_KillToEndOfLine;
+
+ DEFVAR_INT ("canna-func-henkan", &canna_fn_Henkan /*
+
+*/ );
+ canna_fn_Henkan = IROHA_FN_Henkan;
+
+ DEFVAR_INT ("canna-func-kakutei", &canna_fn_Kakutei /*
+
+*/ );
+ canna_fn_Kakutei = IROHA_FN_Kakutei;
+
+ DEFVAR_INT ("canna-func-extend", &canna_fn_Extend /*
+
+*/ );
+ canna_fn_Extend = IROHA_FN_Extend;
+
+ DEFVAR_INT ("canna-func-shrink", &canna_fn_Shrink /*
+
+*/ );
+ canna_fn_Shrink = IROHA_FN_Shrink;
+
+#ifdef CANNA_FN_AdjustBunsetsu
+ DEFVAR_INT ("canna-func-adjust-bunsetsu", &canna_fn_AdjustBunsetsu /*
+
+*/ );
+ canna_fn_AdjustBunsetsu = CANNA_FN_AdjustBunsetsu;
+#endif
+ DEFVAR_INT ("canna-func-quit", &canna_fn_Quit /*
+
+*/ );
+ canna_fn_Quit = IROHA_FN_Quit;
+
+ DEFVAR_INT ("canna-func-convert-as-hex", &canna_fn_ConvertAsHex /*
+
+*/ );
+ canna_fn_ConvertAsHex = IROHA_FN_ConvertAsHex;
+
+ DEFVAR_INT ("canna-func-convert-as-bushu", &canna_fn_ConvertAsBushu /*
+
+*/ );
+ canna_fn_ConvertAsBushu = IROHA_FN_ConvertAsBushu;
+
+ DEFVAR_INT ("canna-func-kouho-ichiran", &canna_fn_KouhoIchiran /*
+
+*/ );
+ canna_fn_KouhoIchiran = IROHA_FN_KouhoIchiran;
+
+ DEFVAR_INT ("canna-func-bubun-muhenkan", &canna_fn_BubunMuhenkan /*
+
+*/ );
+ canna_fn_BubunMuhenkan = IROHA_FN_BubunMuhenkan;
+
+ DEFVAR_INT ("canna-func-zenkaku", &canna_fn_Zenkaku /*
+
+*/ );
+ canna_fn_Zenkaku = IROHA_FN_Zenkaku;
+
+ DEFVAR_INT ("canna-func-hankaku", &canna_fn_Hankaku /*
+
+*/ );
+ canna_fn_Hankaku = IROHA_FN_Hankaku;
+
+ DEFVAR_INT ("canna-func-to-upper", &canna_fn_ToUpper /*
+
+*/ );
+ canna_fn_ToUpper = IROHA_FN_ToUpper;
+
+ DEFVAR_INT ("canna-func-capitalize", &canna_fn_Capitalize /*
+
+*/ );
+ canna_fn_Capitalize = IROHA_FN_Capitalize;
+
+ DEFVAR_INT ("canna-func-to-lower", &canna_fn_ToLower /*
+
+*/ );
+ canna_fn_ToLower = IROHA_FN_ToLower;
+
+ DEFVAR_INT ("canna-func-hiragana", &canna_fn_Hiragana /*
+
+*/ );
+ canna_fn_Hiragana = IROHA_FN_Hiragana;
+
+ DEFVAR_INT ("canna-func-katakana", &canna_fn_Katakana /*
+
+*/ );
+ canna_fn_Katakana = IROHA_FN_Katakana;
+
+ DEFVAR_INT ("canna-func-romaji", &canna_fn_Romaji /*
+
+*/ );
+ canna_fn_Romaji = IROHA_FN_Romaji;
+
+#ifdef CANNA_FN_BaseHiragana
+ DEFVAR_INT ("canna-func-base-hiragana", &canna_fn_BaseHiragana /*
+
+*/ );
+ canna_fn_BaseHiragana = CANNA_FN_BaseHiragana;
+
+ DEFVAR_INT ("canna-func-base-katakana", &canna_fn_BaseKatakana /*
+
+*/ );
+ canna_fn_BaseKatakana = CANNA_FN_BaseKatakana;
+
+ DEFVAR_INT ("canna-func-base-eisu", &canna_fn_BaseEisu /*
+
+*/ );
+ canna_fn_BaseEisu = CANNA_FN_BaseEisu;
+
+ DEFVAR_INT ("canna-func-base-zenkaku", &canna_fn_BaseZenkaku /*
+
+*/ );
+ canna_fn_BaseZenkaku = CANNA_FN_BaseZenkaku;
+
+ DEFVAR_INT ("canna-func-base-hankaku", &canna_fn_BaseHankaku /*
+
+*/ );
+ canna_fn_BaseHankaku = CANNA_FN_BaseHankaku;
+
+ DEFVAR_INT ("canna-func-base-kana", &canna_fn_BaseKana /*
+
+*/ );
+ canna_fn_BaseKana = CANNA_FN_BaseKana;
+
+ DEFVAR_INT ("canna-func-base-kakutei", &canna_fn_BaseKakutei /*
+
+*/ );
+ canna_fn_BaseKakutei = CANNA_FN_BaseKakutei;
+
+ DEFVAR_INT ("canna-func-base-henkan", &canna_fn_BaseHenkan /*
+
+*/ );
+ canna_fn_BaseHenkan = CANNA_FN_BaseHenkan;
+
+ DEFVAR_INT ("canna-func-base-hiragana-katakana-toggle",
+ &canna_fn_BaseHiraKataToggle /*
+
+*/ );
+ canna_fn_BaseHiraKataToggle = CANNA_FN_BaseHiraKataToggle;
+
+ DEFVAR_INT ("canna-func-base-zenkaku-hankaku-toggle",
+ &canna_fn_BaseZenHanToggle /*
+
+*/ );
+ canna_fn_BaseZenHanToggle = CANNA_FN_BaseZenHanToggle;
+
+ DEFVAR_INT ("canna-func-base-kana-eisu-toggle",
+ &canna_fn_BaseKanaEisuToggle /*
+
+*/ );
+ canna_fn_BaseKanaEisuToggle = CANNA_FN_BaseKanaEisuToggle;
+
+ DEFVAR_INT ("canna-func-base-kakutei-henkan-toggle",
+ &canna_fn_BaseKakuteiHenkanToggle /*
+
+*/ );
+ canna_fn_BaseKakuteiHenkanToggle = CANNA_FN_BaseKakuteiHenkanToggle;
+
+ DEFVAR_INT ("canna-func-base-rotate-forward",
+ &canna_fn_BaseRotateForward /*
+
+*/ );
+ canna_fn_BaseRotateForward = CANNA_FN_BaseRotateForward;
+
+ DEFVAR_INT ("canna-func-base-rotate-backward",
+ &canna_fn_BaseRotateBackward /*
+
+*/ );
+ canna_fn_BaseRotateBackward = CANNA_FN_BaseRotateBackward;
+
+#endif
+ DEFVAR_INT ("canna-func-extend-mode", &canna_fn_ExtendMode /*
+
+*/ );
+ canna_fn_ExtendMode = IROHA_FN_ExtendMode;
+
+ DEFVAR_INT ("canna-func-touroku", &canna_fn_Touroku /*
+
+*/ );
+ canna_fn_Touroku = IROHA_FN_Touroku;
+
+ DEFVAR_INT ("canna-func-hex-mode", &canna_fn_HexMode /*
+
+*/ );
+ canna_fn_HexMode = IROHA_FN_HexMode;
+
+ DEFVAR_INT ("canna-func-bushu-mode", &canna_fn_BushuMode /*
+
+*/ );
+ canna_fn_BushuMode = IROHA_FN_BushuMode;
+
+ DEFVAR_INT ("canna-func-kigo-mode", &canna_fn_KigouMode /*
+
+*/ );
+ canna_fn_KigouMode = IROHA_FN_KigouMode;
+
+#ifdef CANNA_FN_Mark
+ DEFVAR_INT ("canna-func-mark", &canna_fn_Mark /*
+
+*/ );
+ canna_fn_Mark = CANNA_FN_Mark;
+#endif
+#ifdef CANNA_FN_TemporalMode
+ DEFVAR_INT ("canna-func-temporal-mode", &canna_fn_TemporalMode /*
+
+*/ );
+ canna_fn_TemporalMode = CANNA_FN_TemporalMode;
+#endif
+
+ DEFVAR_INT ("canna-key-nfer", &canna_key_Nfer /*
+
+*/ );
+ canna_key_Nfer = IROHA_KEY_Nfer;
+
+ DEFVAR_INT ("canna-key-xfer", &canna_key_Xfer /*
+
+*/ );
+ canna_key_Xfer = IROHA_KEY_Xfer;
+
+ DEFVAR_INT ("canna-key-up", &canna_key_Up /*
+
+*/ );
+ canna_key_Up = IROHA_KEY_Up;
+
+ DEFVAR_INT ("canna-key-left", &canna_key_Left /*
+
+*/ );
+ canna_key_Left = IROHA_KEY_Left;
+
+ DEFVAR_INT ("canna-key-right", &canna_key_Right /*
+
+*/ );
+ canna_key_Right = IROHA_KEY_Right;
+
+ DEFVAR_INT ("canna-key-down", &canna_key_Down /*
+
+*/ );
+ canna_key_Down = IROHA_KEY_Down;
+
+ DEFVAR_INT ("canna-key-insert", &canna_key_Insert /*
+
+*/ );
+ canna_key_Insert = IROHA_KEY_Insert;
+
+ DEFVAR_INT ("canna-key-rollup", &canna_key_Rollup /*
+
+*/ );
+ canna_key_Rollup = IROHA_KEY_Rollup;
+
+ DEFVAR_INT ("canna-key-rolldown", &canna_key_Rolldown /*
+
+*/ );
+ canna_key_Rolldown = IROHA_KEY_Rolldown;
+
+ DEFVAR_INT ("canna-key-home", &canna_key_Home /*
+
+*/ );
+ canna_key_Home = IROHA_KEY_Home;
+
+ DEFVAR_INT ("canna-key-help", &canna_key_Help /*
+
+*/ );
+ canna_key_Help = IROHA_KEY_Help;
+
+ DEFVAR_INT ("canna-key-kp-key", &canna_key_KP_Key /*
+
+*/ );
+ canna_key_KP_Key = IROHA_KEY_KP_Key;
+
+ DEFVAR_INT ("canna-key-shift-nfer", &canna_key_Shift_Nfer /*
+
+*/ );
+ canna_key_Shift_Nfer = IROHA_KEY_Shift_Nfer;
+
+ DEFVAR_INT ("canna-key-shift-xfer", &canna_key_Shift_Xfer /*
+
+*/ );
+ canna_key_Shift_Xfer = IROHA_KEY_Shift_Xfer;
+
+ DEFVAR_INT ("canna-key-shift-up", &canna_key_Shift_Up /*
+
+*/ );
+ canna_key_Shift_Up = IROHA_KEY_Shift_Up;
+
+ DEFVAR_INT ("canna-key-shift-left", &canna_key_Shift_Left /*
+
+*/ );
+ canna_key_Shift_Left = IROHA_KEY_Shift_Left;
+
+ DEFVAR_INT ("canna-key-shift-right", &canna_key_Shift_Right /*
+
+*/ );
+ canna_key_Shift_Right = IROHA_KEY_Shift_Right;
+
+ DEFVAR_INT ("canna-key-shift-down", &canna_key_Shift_Down /*
+
+*/ );
+ canna_key_Shift_Down = IROHA_KEY_Shift_Down;
+
+ DEFVAR_INT ("canna-key-control-nfer", &canna_key_Cntrl_Nfer /*
+
+*/ );
+ canna_key_Cntrl_Nfer = IROHA_KEY_Cntrl_Nfer;
+
+ DEFVAR_INT ("canna-key-control-xfer", &canna_key_Cntrl_Xfer /*
+
+*/ );
+ canna_key_Cntrl_Xfer = IROHA_KEY_Cntrl_Xfer;
+
+ DEFVAR_INT ("canna-key-control-up", &canna_key_Cntrl_Up /*
+
+*/ );
+ canna_key_Cntrl_Up = IROHA_KEY_Cntrl_Up;
+
+ DEFVAR_INT ("canna-key-control-left", &canna_key_Cntrl_Left /*
+
+*/ );
+ canna_key_Cntrl_Left = IROHA_KEY_Cntrl_Left;
+
+ DEFVAR_INT ("canna-key-control-right", &canna_key_Cntrl_Right /*
+
+*/ );
+ canna_key_Cntrl_Right = IROHA_KEY_Cntrl_Right;
+
+ DEFVAR_INT ("canna-key-control-down", &canna_key_Cntrl_Down /*
+
+*/ );
+ canna_key_Cntrl_Down = IROHA_KEY_Cntrl_Down;
+
+ Fprovide (intern ("CANNA"));
+}
+
+#if 0
+#ifdef HAVE_SHLIB
+void unload_canna_api (void);
+void
+unload_canna_api (void)
+{
+ /* We don't need to do anything here in the sample case. However, if you
+ create any new types with INIT_LRECORD_IMPLEMENTATION (sample_type), then
+ UNDEF_LRECORD_IMPLEMENTATION (sample_type) must appear here. Also, any
+ symbols declared with DEFSYMBOL (Qsample_var), or one of its variants,
+ must have a corresponding unstaticpro_nodump (&Qsample_var) here. */
+}
+#endif
+#endif
+
+#ifdef CANNA_MULE
+/* To handle MULE internal code and EUC.
+ I assume CANNA can handle only Japanese EUC. */
+
+/* EUC multibyte string to MULE internal string */
+
+static void
+c2mu (unsigned char *cp, int l, unsigned char *mp)
+{
+ unsigned char ch, *ep = cp+l;
+
+ while ((cp < ep) && (ch = *cp))
+ {
+ if ((unsigned char) ch == ISO_CODE_SS2)
+ {
+ *mp++ = LEADING_BYTE_KATAKANA_JISX0201;
+ cp++;
+ }
+ else if ((unsigned char) ch == ISO_CODE_SS3)
+ {
+ *mp++ = LEADING_BYTE_JAPANESE_JISX0212;
+ cp++;
+ *mp++ = *cp++;
+ }
+ else if (ch & 0x80)
+ {
+ *mp++ = LEADING_BYTE_JAPANESE_JISX0208;
+ *mp++ = *cp++;
+ }
+ *mp++ = *cp++;
+ }
+ *mp = 0;
+}
+
+/* MULE internal string to EUC multibyte string */
+
+static void
+m2c (unsigned char *mp, int l, unsigned char *cp)
+{
+ unsigned char ch, *ep = mp + l;
+
+ while ((mp < ep) && (ch = *mp++))
+ {
+ switch (ch)
+ {
+ case LEADING_BYTE_KATAKANA_JISX0201:
+ *cp++ = ISO_CODE_SS2;
+ *cp++ = *mp++;
+ break;
+ case LEADING_BYTE_JAPANESE_JISX0212:
+ *cp++ = ISO_CODE_SS3;
+ case LEADING_BYTE_JAPANESE_JISX0208:
+ *cp++ = *mp++;
+ *cp++ = *mp++;
+ break;
+ default:
+ *cp++ = ch;
+ break;
+ }
+ }
+ *cp = 0;
+}
+
+#undef make_string
+
+/* make_string after converting EUC string to MULE internal string */
+static Lisp_Object
+mule_make_string (unsigned char *p, int l)
+{
+ unsigned char cbuf[4096];
+
+ c2mu (p,l,cbuf);
+ return (make_string (cbuf, strlen ((const char *) cbuf)));
+}
+
+/* return the MULE internal string length of EUC string */
+/* Modified by sb to return a character count not byte count. */
+static int
+mule_strlen (unsigned char *p, int l)
+{
+ unsigned char ch, *cp = p;
+ int len = 0;
+
+ while ((cp < p + l) && (ch = *cp))
+ {
+ if ((unsigned char) ch == ISO_CODE_SS2)
+ {
+ len++;
+ cp += 2;
+ }
+ else if ((unsigned char) ch == ISO_CODE_SS3)
+ {
+ len++;
+ cp += 3;
+ }
+ else if (ch & 0x80)
+ {
+ len++;
+ cp += 2;
+ }
+ else
+ {
+ len++;
+ cp++;
+ }
+ }
+ return (len);
+}
+
+/* count number of characters */
+static void
+count_char (unsigned char *p, int len, int pos, int rev,
+ Fixnum *clen, Fixnum *cpos, Fixnum *crev)
+{
+ unsigned char *q = p;
+
+ *clen = *cpos = *crev = 0;
+ if (len == 0) return;
+ while (q < p + pos)
+ {
+ (*clen)++;
+ (*cpos)++;
+ if (*q++ & 0x80) q++;
+ }
+ while (q < p + pos + rev)
+ {
+ (*clen)++;
+ (*crev)++;
+ if (*q++ & 0x80) q++;
+ }
+ while (q < p + len)
+ {
+ (*clen)++;
+ if (*q++ & 0x80) q++;
+ }
+}
+#endif /* CANNA_MULE */
Index: modules/canna/configure.ac
===================================================================
RCS file: modules/canna/configure.ac
diff -N modules/canna/configure.ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/canna/configure.ac 4 Oct 2005 17:26:06 -0000
＠＠ -0,0 +1,79 ＠＠
+# Process this file with autoconf to produce a configure script.
+# This is only used for independent module building.
+AC_INIT([Sample module], [1.0], [xemacs-beta(a)xemacs.org])
+AC_PREREQ(2.53)
+AC_REVISION($Revision: 1.1 $)
+AC_COPYRIGHT([Configuration script for the sample module.
+Copyright (C) 2002 Jerry James.
+
+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.])
+
+AC_CONFIG_SRCDIR([sample.c])
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_SUBST(CFLAGS)
+AC_SUBST(LDFLAGS)
+
+# Find ELLCC
+AC_ARG_VAR([ELLCC], [The path to the ellcc module compiler])
+AC_PATH_PROG([ELLCC], [ellcc], ["FAIL"])
+AS_IF([test "$ELLCC" = "FAIL"], [AS_ERROR([Cannot find ellcc])])
+
+# Insert autoconf macros here to find the headers, libraries, other
+# programs, etc. needed by your module. If other libraries will be linked
+# with your module, then after detecting them, use a line of this form last:
+
+# detect canna
+canna_includes_found=no
+if test "$with_canna" != "no"; then
+ AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes)
+fi
+if test "$canna_includes_found" = "no" -a "$with_canna" != "no" -a \
+ -d "/usr/local/canna/include"; then
+ save_c_switch_site="$c_switch_site"
+ c_switch_site="$c_switch_site -I/usr/local/canna/include"
+ AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes)
+ if test "$canna_includes_found" != "yes"; then
+ c_switch_site="$save_c_switch_site"
+ with_canna="no"
+ fi
+fi
+
+test -z "$with_canna" && { AC_CHECK_HEADER(canna/RK.h, , with_canna=no) }
+test -z "$with_canna" && { AC_CHECK_LIB(RKC, RkBgnBun, [:],with_canna=no) }
+test -z "$with_canna" && { AC_CHECK_LIB(canna,jrKanjiControl,[:],with_canna=no) }
+test -z "$with_canna" && with_canna=yes
+if test "$with_canna" = "yes"; then
+ AC_DEFINE(HAVE_CANNA)
+ LIBS="-lcanna -lRKC"
+fi
+
+AC_SUBST(canna_libs, "$LIBS")
+
+# This part should appear unchanged in every module configure.ac
+AC_SUBST(PROGNAME, "module")
+AC_SUBST(MOD_CC, "＠ELLCC＠")
+AC_SUBST(MODARCHDIR, "\$(shell ＠ELLCC＠ --mod-archdir)")
+AC_SUBST(MAKE_DOCFILE, "\$(MODARCHDIR)/make-docfile")
+AC_SUBST(MODCFLAGS, "\$(CFLAGS) --mode=compile --mod-output=\$＠ -I\$(MODARCHDIR)/include")
+AC_SUBST(INSTALLPATH, "\$(shell ＠ELLCC＠ --mod-site-location)")
+AC_SUBST(MOD_INSTALL_PROGRAM, "＠INSTALL_PROGRAM＠")
+AC_SUBST(OBJECT_TO_BUILD, "\$(MODNAME).ell")
+
+AC_CONFIG_FILES([Makefile.in Makefile])
+AC_OUTPUT
Index: modules/canna/install-sh
(diff omitted, file is identical to the utility of the same name in
the other module source directories.)
Index: src/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v
retrieving revision 1.117
diff -u -r1.117 Makefile.in.in
--- src/Makefile.in.in 27 Sep 2005 05:35:26 -0000 1.117
+++ src/Makefile.in.in 4 Oct 2005 17:26:11 -0000
＠＠ -196,8 +196,8 ＠＠
mule_objs=mule-ccl.o mule-charset.o mule-coding.o
#endif
-#ifdef HAVE_CANNA
-mule_canna_objs=mule-canna.o
+#if defined(HAVE_CANNA) && !defined(HAVE_SHLIB)
+mule_canna_objs=$(BLDMODULES)/canna/canna-api.o
#endif
#ifdef HAVE_WNN
Index: src/emacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v
retrieving revision 1.157
diff -u -r1.157 emacs.c
--- src/emacs.c 10 Apr 2005 00:47:57 -0000 1.157
+++ src/emacs.c 4 Oct 2005 17:26:12 -0000
＠＠ -1641,8 +1641,8 ＠＠
#ifdef HAVE_WNN
syms_of_mule_wnn ();
#endif
-#ifdef HAVE_CANNA
- syms_of_mule_canna ();
+#if defined(HAVE_CANNA) && !defined (HAVE_SHLIB)
+ syms_of_canna_api ();
#endif /* HAVE_CANNA */
#endif /* MULE */
＠＠ -2210,8 +2210,8 ＠＠
#ifdef HAVE_WNN
vars_of_mule_wnn ();
#endif
-#ifdef HAVE_CANNA
- vars_of_mule_canna ();
+#if defined(HAVE_CANNA) && !defined (HAVE_SHLIB)
+ vars_of_canna_api ();
#endif /* HAVE_CANNA */
#endif /* MULE */
Index: src/mule-canna.c
diff omitted; file was removed.
Index: src/symsinit.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symsinit.h,v
retrieving revision 1.52
diff -u -r1.52 symsinit.h
--- src/symsinit.h 8 Apr 2005 23:11:33 -0000 1.52
+++ src/symsinit.h 4 Oct 2005 17:26:13 -0000
＠＠ -149,7 +149,7 ＠＠
void syms_of_menubar_x (void);
void syms_of_minibuf (void);
void syms_of_module (void);
-void syms_of_mule_canna (void);
+void syms_of_canna_api (void);
void syms_of_mule_ccl (void);
void syms_of_mule_charset (void);
void syms_of_mule_coding (void);
＠＠ -387,7 +387,7 ＠＠
void reinit_vars_of_minibuf (void);
void vars_of_module (void);
void reinit_vars_of_module (void);
-void vars_of_mule_canna (void);
+void vars_of_canna_api (void);
void vars_of_mule_ccl(void);
void vars_of_mule_charset (void);
void vars_of_mule_coding (void);
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
- 1 participants
- 1 comments
[21.5 R build] Refactor build-report, add batch capability
19 years, 2 months
Stephen J. Turnbull
Stephen J. Turnbull
21.5 RECOMMEND build
Adrian, your comments would be appreciated.
The patch is a little confusing. What I did is move the computation
of the destination address out of the body of the function, let-bind
it to DESTINATION-ADDRESS, and move the rest of the body into
`build-report-create-report' as a block. Otherwise the logic and
implementation is unchanged; the reason for the size of the hunk is
that it's all leading whitespace changes.
Lightly tested.
`batch-build-report' is a wrapper around `build-report-create-report'.
Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.679
diff -u -U0 -r1.679 ChangeLog
--- lisp/ChangeLog 5 Oct 2005 04:32:44 -0000 1.679
+++ lisp/ChangeLog 5 Oct 2005 04:43:56 -0000
＠＠ -0,0 +1,8 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * build-report.el (build-report): Refactor into interactive
+ portion and `build-report-create-report'.
+ (build-report-create-report): New function.
+ (batch-build-report): Non-interactive version of `build-report'
+ using `build-report-create-report'.
+
Index: lisp/build-report.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/build-report.el,v
retrieving revision 1.12
diff -u -r1.12 build-report.el
--- lisp/build-report.el 5 Oct 2005 04:11:25 -0000 1.12
+++ lisp/build-report.el 5 Oct 2005 04:44:03 -0000
＠＠ -318,59 +318,85 ＠＠
(setq prompts (cdr prompts))
(setq arg (cons (read-string prompt "" 'hist) arg)))
arg)))
+ (let ((destination-address
+ ;; `build-report-destination' used to be a single string, so
+ ;; let's test if we really get a list of destinations.
+ (if (listp build-report-destination)
+ (read-string
+ "Build Report Destination: "
+ (car build-report-destination)
+ 'build-report-destination)
+ (read-string
+ "Build Report Destination: "
+ build-report-destination)
+ )))
+ (save-excursion
+ (build-report-create-report destination-address args))))
+
+;;;###autoload
+(defun batch-build-report (&optional status destination)
+ "Format a build report. Save it as \"./BUILD-REPORT\".
+If the file \"./BUILD-REPORT-COMMENT\" is readable, insert its contents.
+Optional STATUS is a string to insert in the subject. It defaults to
+\"Success\". \(This will be made customizable.)
+Optional DESTINATION is a string containing the destination mailbox. It
+defaults to \"XEmacs Build Reports <xemacs-buildreports(a)xemacs.org>\".
+\(This will be made customizable.)
+This function may be invoked as a command."
+ (interactive)
+ (unless (stringp status) (setq status "Success"))
+ (unless (stringp destination)
+ (setq destination "XEmacs Build Reports <xemacs-buildreports(a)xemacs.org>"))
(save-excursion
- (if (file-exists-p build-report-installation-file)
- (multiple-value-bind
- (major minor beta codename extraname configuration)
- (build-report-installation-data build-report-installation-file)
- (setq build-report-subject
- (format "[%%s] XEmacs %s.%s%s \"%s\" %s%s"
- major minor beta codename extraname configuration)))
+ (build-report-create-report destination
+ ;; #### listify in the internal function?
+ (list status)))
+ (when (file-readable-p "BUILD-REPORT-COMMENT")
+ (insert-file "BUILD-REPORT-COMMENT"))
+ (write-file "BUILD-REPORT"))
+
+(defun build-report-create-report (destination status)
+ "Format current buffer as an XEmacs build report to DESTINATION.
+
+DESTINATION is the mailbox to which the report will be submitted.
+STATUS is the status of the build.
+You probably don't want to use this function; see `build-report' for the
+interactive command, and `batch-build-report' for a command suitable for
+use in shell scripts and Makefiles."
+ (if (file-exists-p build-report-installation-file)
(multiple-value-bind
- (major minor beta codename extraname)
- (build-report-version-file-data build-report-version-file)
- (setq build-report-subject
- (format "[%%s] XEmacs %s.%s%s \"%s\" %s%s"
- major minor beta codename extraname system-configuration))))
- (compose-mail
- ;; `build-report-destination' used to be a single string, so
- ;; let's test if we really get a list of destinations.
- (if (listp build-report-destination)
- (read-string
- "Build Report Destination: "
- (car build-report-destination)
- 'build-report-destination)
- (read-string
- "Build Report Destination: "
- build-report-destination)
- )
- (apply 'format build-report-subject args)
- nil
- nil
- nil
- nil
- nil)
- (let* ((report-begin (point))
- (files (reverse (build-report-make-output-get)))
- (file (car files)))
- (while file
- (if (file-exists-p file)
- (insert (build-report-insert-make-output report-begin file))
- (insert (format "%s not found!\n" file)))
- (insert "\n")
- (setq files (cdr files))
- (setq file (car files)))
- (if (file-exists-p build-report-installation-file)
- (insert (build-report-insert-installation-file
- report-begin
- build-report-installation-insert-all))
- (insert (format "%s not found!\n" build-report-installation-file)))
-;;; (when (and (>= major 21) (>= minor 2) (or (null beta) (>= beta 32)))
-;;; (insert "\n")
-;;; (insert (build-report-insert-config-inc report-begin)))
+ (major minor beta codename extraname configuration)
+ (build-report-installation-data build-report-installation-file)
+ (setq build-report-subject
+ (format "[%%s] XEmacs %s.%s%s \"%s\" %s%s"
+ major minor beta codename extraname configuration)))
+ (multiple-value-bind
+ (major minor beta codename extraname)
+ (build-report-version-file-data build-report-version-file)
+ (setq build-report-subject
+ (format "[%%s] XEmacs %s.%s%s \"%s\" %s%s"
+ major minor beta codename extraname system-configuration))))
+ (compose-mail destination
+ (apply 'format build-report-subject status)
+ nil nil nil nil nil)
+ (let* ((report-begin (point))
+ (files (reverse (build-report-make-output-get)))
+ (file (car files)))
+ (while file
+ (if (file-exists-p file)
+ (insert (build-report-insert-make-output report-begin file))
+ (insert (format "%s not found!\n" file)))
(insert "\n")
- (insert (build-report-insert-header report-begin))
- (goto-char report-begin))))
+ (setq files (cdr files))
+ (setq file (car files)))
+ (if (file-exists-p build-report-installation-file)
+ (insert (build-report-insert-installation-file
+ report-begin
+ build-report-installation-insert-all))
+ (insert (format "%s not found!\n" build-report-installation-file)))
+ (insert "\n")
+ (insert (build-report-insert-header report-begin))
+ (goto-char report-begin)))
(defun build-report-insert-header (where)
"Inserts the build-report-header at the point specified by `where'."
--
Graduate School of Systems and Information Engineering University of Tsukuba
http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Economics of Information Communication and Computation Systems
Experimental Economics, Microeconomic Theory, Game Theory
- 2 participants
- 1 comments
new version of allout.el - whole file and ChangeLog entry
19 years, 2 months
Ken Manheimer
Ken Manheimer
hi, all!
attached is a new version of allout.el and a ChangeLog for a
substantial new revision of allout, emacs' alternative (and much more
extensive) outliner. i
think it's ready to replace the distributed version. (i'm the
original author of allout, and the maintainer of the gnu emacs
version.) this version adds topic encryption, using GPG. it also
includes several fixes and enhancements, described in the ChangeLog
entry
i've tested this version mostly in gnu emacs, but have tested (and
adjusted) it enough to establish that it works in xemacs 21.4.17,
including the new encryption capabilities.
i'm providing the .el file instead of a patch against the version that
comes with xemacs 21.4.7 because the version there is old, and the
patch is substantially larger than the elisp source (5740 lines for
the new source vs 6680 for the unified diff). i can provide the diff
if you prefer, however.
one important thing to note. the gnu emacs folk made some cosmetic
but extensive stylistic changes, including particularly migrating the
function name prefix from "outline-" to "allout-", and i adopted those
changes. i'm hoping it won't be disruptive to adopt those conventions
in the xemacs version, too. (i'd like to see allout continue to be
available from in both true emacs, but want to do what i can to
maintain only a single version...)
another important thing - the source i'm sending is slightly different
than the one i used to generate the patch i submitted to
emacs-devel(a)gnu.org earlier today. i discovered an xemacs
compatibility problem after submitting that version, which i fixed in
the version i'm sending to you. i can make sure to revise the patch i
submitted to the gnu list sooner rather than later, if you think
that's important.
please let me know whether or not i'm submitting this update the right way!
below is the synopsis of just the new encryption features, from the
ChangeLog entry.
- new subsystem supporting easy gpg topic encryption/decryption.
salient features:
- both public- and symmetric-key modes are supported.
- encryption being on a per-topic basis means you can
intersperse encrypted and clear-text data in a single file
to your heart's content.
- user-provided symmetric-key hints, with consistency
verification to help user avoid confusion
- time-limited key reuse, a la (and using) mailcrypt's
mc-passwd-timeout
- write-file-hook and auto-save-hook activities to support auto
encryption of pending topics on save; provision to skip
currently-edited topic to avoid editing disturbance
topic encryption functionality depends on both mailcrypt and
crypt++ packages. (non-encryption allout functionality is not
disrupted if either mailcrypt or crypt++ are absent.)
`allout-toggle-current-subtree-encryption' is the central
routine.
there are a five new encryption customization variables:
- allout-topic-encryption-bullet
- allout-default-encryption-scheme
- allout-key-verifier-handling
- allout-key-hint-handling
- allout-encrypt-unencrypted-on-saves
topic encryption is included in mouse menu
docstring for `allout-toggle-current-subtree-encryption'
and customization variables provide detailed description.
ken manheimer
ken.manheimer(a)gmail.com
- 4 participants
- 7 comments
[C] packages: Sync erc after cooperation with upstream
19 years, 2 months
Adrian Aichner
Adrian Aichner
COMMIT
Builds and runs locally.
This should make smoketests green again.
Best regards,
Adrian
packages ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: xemacs-packages/erc/ChangeLog
Index: xemacs-packages/erc/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog,v
retrieving revision 1.33
diff -u -U0 -r1.33 ChangeLog
--- xemacs-packages/erc/ChangeLog 15 Oct 2005 18:15:26 -0000 1.33
+++ xemacs-packages/erc/ChangeLog 20 Oct 2005 22:39:41 -0000
＠＠ -0,0 +1,22 ＠＠
+2005-10-21 Adrian Aichner <adrian(a)xemacs.org>
+
+ * Full sync with upstream revision 1.776.
+ * ChangeLog.upstream:
+ * Makefile (AUTHOR_VERSION):
+ * erc-compat.el:
+ * erc-compat.el (erc-compat-version):
+ * erc-compat.el (erc-make-obsolete): New.
+ * erc-compat.el (erc-make-obsolete-variable): New.
+ * erc-match.el:
+ * erc-match.el (erc-match-version):
+ * erc-match.el (erc-current-nick-highlight-type):
+ * erc-match.el (erc-beep-match-types): New.
+ * erc-match.el (erc-beep-on-match): New.
+ * erc-nets.el:
+ * erc-nets.el (erc-nets-version):
+ * erc-nets.el (erc-current-network):
+ * erc.el:
+ * erc.el (erc-version-string):
+ * erc.el (fboundp):
+ * erc.el (erc-send-command):
+
packages source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: xemacs-packages/erc/erc.el xemacs-packages/erc/erc-nets.el xemacs-packages/erc/erc-match.el xemacs-packages/erc/erc-compat.el xemacs-packages/erc/Makefile xemacs-packages/erc/ChangeLog.upstream
Index: xemacs-packages/erc/ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog.upstream,v
retrieving revision 1.8
diff -u -w -r1.8 ChangeLog.upstream
--- xemacs-packages/erc/ChangeLog.upstream 15 Oct 2005 18:15:26 -0000 1.8
+++ xemacs-packages/erc/ChangeLog.upstream 20 Oct 2005 22:37:52 -0000
＠＠ -1,3 +1,31 ＠＠
+2005-10-20 Diane Murray <disumu(a)x3y2z1.net>
+
+ * erc-match.el (erc-current-nick-highlight-type): Set to `keyword'
+ as default.
+ (erc-beep-match-types): New variable.
+ (erc-text-matched-hook): Doc fix. Added `erc-beep-on-match' to
+ customization options.
+ (erc-beep-on-match): New function. If the MATCH-TYPE is found in
+ `erc-beep-match-types', beep.
+
+ * erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
+ New functions to deal with the difference in the number of
+ arguments accepted by `make-obsolete' and `make-obsolete-variable'
+ in Emacs and XEmacs.
+
+ * erc.el, erc-nets.el: Use `erc-make-obsolete' and
+ `erc-make-obsolete-variable'.
+
+ * erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
+ Handle `wrong-number-of-arguments' error instead of checking for
+ xemacs feature as future versions of XEmacs might accept three
+ arguments.
+
+2005-10-18 Edward O'Connor <ted(a)oconnor.cx>
+
+ * erc.el: Tell emacs-lisp-mode how to font-lock define-erc-module
+ docstrings.
+
2005-10-08 Diane Murray <disumu(a)x3y2z1.net>
* AUTHORS, CREDITS, ChangeLog, ChangeLog.2002, ChangeLog.2004:
Index: xemacs-packages/erc/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/Makefile,v
retrieving revision 1.27
diff -u -w -r1.27 Makefile
--- xemacs-packages/erc/Makefile 15 Oct 2005 18:15:26 -0000 1.27
+++ xemacs-packages/erc/Makefile 20 Oct 2005 22:37:52 -0000
＠＠ -19,7 +19,7 ＠＠
VERSION = 0.17
-AUTHOR_VERSION = Version 5.0 Revision: 1.774
+AUTHOR_VERSION = Version 5.0 Revision: 1.776
MAINTAINER = Adrian Aichner <adrian(a)xemacs.org>
PACKAGE = erc
PKG_TYPE = regular
Index: xemacs-packages/erc/erc-compat.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-compat.el,v
retrieving revision 1.6
diff -u -w -r1.6 erc-compat.el
--- xemacs-packages/erc/erc-compat.el 15 Oct 2005 18:15:27 -0000 1.6
+++ xemacs-packages/erc/erc-compat.el 20 Oct 2005 22:37:53 -0000
＠＠ -1,6 +1,6 ＠＠
;;; erc-compat.el --- ERC compatibility code for XEmacs
-;; Copyright (C) 2002,2003 Free Software Foundation, Inc.
+;; Copyright (C) 2002,2003,2005 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex(a)gnu.org>
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
＠＠ -28,7 +28,7 ＠＠
;;; Code:
-(defconst erc-compat-version "$Revision: 1.23 $"
+(defconst erc-compat-version "$Revision: 1.25 $"
"ERC compat revision.")
;; erc-define-minor-mode: the easy-mmode-define-minor-mode available
＠＠ -256,6 +256,28 ＠＠
(delete-itimer timer))
(t
(error "Cannot find `cancel-timer' variant"))))
+
+;; Emacs accepts three arguments to `make-obsolete', `make-obsolete-variable'
+;; XEmacs only takes two arguments
+(defun erc-make-obsolete (old-name new-name when)
+ "Make the byte-compiler warn that OLD-NAME is obsolete.
+The warning will say that NEW-NAME should be used instead.
+WHEN should be a string indicating when the function was
+first made obsolete, either the file's revision number or an
+ERC release version number."
+ (condition-case nil
+ (make-obsolete old-name new-name when)
+ (wrong-number-of-arguments (make-obsolete old-name new-name))))
+
+(defun erc-make-obsolete-variable (old-name new-name when)
+ "Make the byte-compiler warn that OLD-NAME is obsolete.
+The warning will say that NEW-NAME should be used instead.
+WHEN should be a string indicating when the variable was
+first made obsolete, either the file's revision number or an
+ERC release version number."
+ (condition-case nil
+ (make-obsolete-variable old-name new-name when)
+ (wrong-number-of-arguments (make-obsolete-variable old-name new-name))))
(provide 'erc-compat)
Index: xemacs-packages/erc/erc-match.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-match.el,v
retrieving revision 1.9
diff -u -w -r1.9 erc-match.el
--- xemacs-packages/erc/erc-match.el 15 Oct 2005 18:15:28 -0000 1.9
+++ xemacs-packages/erc/erc-match.el 20 Oct 2005 22:37:53 -0000
＠＠ -1,6 +1,6 ＠＠
;;; erc-match.el --- Highlight messages matching certain regexps
-;; Copyright (C) 2002,2003,2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002,2003,2004,2005 Free Software Foundation, Inc.
;; Copyright (C) 2004 Jeremy Bertram Maitin-Shepard
;; Author: Andreas Fuchs <asf(a)void.at>
＠＠ -38,7 +38,7 ＠＠
;; Customisation:
-(defconst erc-match-version "$Revision: 1.45 $"
+(defconst erc-match-version "$Revision: 1.46 $"
"ERC match mode revision.")
(defgroup erc-match nil
＠＠ -85,7 +85,7 ＠＠
:group 'erc-match
:type '(repeat regexp))
-(defcustom erc-current-nick-highlight-type nil
+(defcustom erc-current-nick-highlight-type 'keyword
"*Determines how to highlight text in which your current nickname appears
\(does not apply to text sent by you\).
＠＠ -213,12 +213,25 ＠＠
:group 'erc-match
:type 'string)
+(defcustom erc-beep-match-types '(current-nick)
+ "Types of matches to beep for when a match occurs.
+The function `erc-beep-on-match' needs to be added to `erc-text-matched-hook'
+for beeping to work."
+:group 'erc-match
+:type '(choice (repeat :tag "Beep on match" (choice
+ (const current-nick)
+ (const keyword)
+ (const pal)
+ (const dangerous-host)
+ (const fool)))
+ (const :tag "Don't beep" nil)))
+
(defcustom erc-text-matched-hook '(erc-log-matches)
"Hook run when text matches a given match-type.
Functions in this hook are passed as arguments:
\(match-type nick!user＠host message) where MATCH-TYPE is a symbol of:
-keyword, pal, dangerous-host, fool"
-:options '(erc-log-matches erc-hide-fools)
+current-nick, keyword, pal, dangerous-host, fool"
+:options '(erc-log-matches erc-hide-fools erc-beep-on-match)
:group 'erc-match
:type 'hook)
＠＠ -625,6 +638,12 ＠＠
(erc-put-text-properties (point-min) (point-max)
'(invisible intangible)
(current-buffer))))
+
+(defun erc-beep-on-match (match-type nickuserhost message)
+ "Beep when text matches.
+This function is meant to be called from `erc-text-matched-hook'."
+ (when (member match-type erc-beep-match-types)
+ (beep)))
(provide 'erc-match)
Index: xemacs-packages/erc/erc-nets.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-nets.el,v
retrieving revision 1.7
diff -u -w -r1.7 erc-nets.el
--- xemacs-packages/erc/erc-nets.el 15 Oct 2005 18:15:29 -0000 1.7
+++ xemacs-packages/erc/erc-nets.el 20 Oct 2005 22:37:53 -0000
＠＠ -1,6 +1,6 ＠＠
;;; erc-nets.el --- IRC networks
-;; Copyright (C) 2002,2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002,2004,2005 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang(a)lexx.delysid.org>
;; Keywords: comm
＠＠ -27,7 +27,7 ＠＠
(require 'erc)
-(defconst erc-nets-version "$Revision: 1.20 $"
+(defconst erc-nets-version "$Revision: 1.21 $"
"ERC networks revision.")
;; Variables
＠＠ -726,11 +726,8 ＠＠
(with-current-buffer (erc-server-buffer)
(intern (downcase (symbol-name erc-network)))))
-(condition-case nil
- (make-obsolete 'erc-current-network 'erc-network
+(erc-make-obsolete 'erc-current-network 'erc-network
"Obsolete since erc-nets 1.5")
- (wrong-number-of-arguments (make-obsolete 'erc-current-network
- 'erc-network)))
(defun erc-network-name ()
"Returns the name of the current network as a string."
Index: xemacs-packages/erc/erc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc.el,v
retrieving revision 1.12
diff -u -w -r1.12 erc.el
--- xemacs-packages/erc/erc.el 15 Oct 2005 18:15:30 -0000 1.12
+++ xemacs-packages/erc/erc.el 20 Oct 2005 22:37:55 -0000
＠＠ -64,7 +64,7 ＠＠
;;; Code:
-(defconst erc-version-string "Version 5.0 (CVS) $Revision: 1.774 $"
+(defconst erc-version-string "Version 5.0 (CVS) $Revision: 1.776 $"
"ERC version. This is used by function `erc-version'.")
(require 'cl)
＠＠ -123,13 +123,13 ＠＠
(if (fboundp 'defvaralias)
(progn
(defvaralias 'erc-announced-server-name 'erc-server-announced-name)
- (make-obsolete-variable 'erc-announced-server-name
+ (erc-make-obsolete-variable 'erc-announced-server-name
'erc-server-announced-name
"ERC 5.1")
(defvaralias 'erc-process 'erc-server-process)
- (make-obsolete-variable 'erc-process 'erc-server-process "ERC 5.1")
+ (erc-make-obsolete-variable 'erc-process 'erc-server-process "ERC 5.1")
(defvaralias 'erc-default-coding-system 'erc-server-coding-system)
- (make-obsolete-variable 'erc-default-coding-system
+ (erc-make-obsolete-variable 'erc-default-coding-system
'erc-server-coding-system
"ERC 5.1"))
(message (concat "ERC: You're using an old version of Emacs; "
＠＠ -137,7 +137,7 ＠＠
"for old versions of ERC.")))
(defalias 'erc-send-command 'erc-server-send)
-(make-obsolete 'erc-send-command 'erc-server-send "ERC 5.1")
+(erc-make-obsolete 'erc-send-command 'erc-server-send "ERC 5.1")
;; tunable connection and authentication parameters
＠＠ -1206,6 +1206,8 ＠＠
(downcase (symbol-name alias)))))
(quote
,mode))))))
+
+(put 'define-erc-module 'doc-string-elt 3)
(defun erc-once-with-server-event (event &rest forms)
"Execute FORMS the next time EVENT occurs in the `current-buffer'.
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
- 1 participants
- 0 comments
Re: [AC] Aliasing --enable to --with.
19 years, 2 months
Malcolm Purvis
Malcolm Purvis
>>>>> "Malcolm" == Malcolm Purvis <malcolmp(a)xemacs.org> writes:
Malcolm> APPROVE COMMIT
Sorry about posting to the wrong group. It seems that for non-patcher
generated posts I'm setting the wrong reply headers.
Malcolm
--
Malcolm Purvis <malcolmp(a)xemacs.org>
- 1 participants
- 0 comments
Oils
19 years, 2 months
Julia
Julia
Can you get me some information on your peppermint oil. Is it natural. If so
what is your pricing for 60Kg?
Julia
Julia Swedak
Operations Manager
Suntrition Inc.
2835 Kew Drive. Unit 8
Windsor, Ontario N8T 3B7
(Tel)519-945-2030 (Fax)519-945-9185
julia(a)suntritioninc.com
- 1 participants
- 0 comments
[C] xemacsweb: Remove outdated secondary german ftp mirror
19 years, 2 months
Adrian Aichner
Adrian Aichner
COMMIT
As suggested by Joachim.
Thanks!
Adrian
xemacsweb ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: Download/ChangeLog
Index: Download/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/ChangeLog,v
retrieving revision 1.165
diff -u -U0 -r1.165 ChangeLog
--- Download/ChangeLog 17 Oct 2005 21:44:20 -0000 1.165
+++ Download/ChangeLog 17 Oct 2005 22:12:40 -0000
＠＠ -0,0 +1,4 ＠＠
+2005-10-18 Adrian Aichner <adrian(a)xemacs.org>
+
+ * index.content: Remove outdated secondary german ftp mirror.
+
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: Download/index.content
Index: Download/index.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/index.content,v
retrieving revision 1.66
diff -u -w -r1.66 index.content
--- Download/index.content 11 Jun 2005 22:05:46 -0000 1.66
+++ Download/index.content 17 Oct 2005 22:11:52 -0000
＠＠ -378,29 +378,9 ＠＠
><b>ftp.de.xemacs.org (FTP)</b></a></li>
<li><a href="http://ftp.de.xemacs.org/pub/ftp.xemacs.org/tux/xemacs/"
><b>ftp.de.xemacs.org (HTTP)</b></a></li>
- <li>
- <p></p>
- <h5>Secondary Mirrors</h5>
- <ul>
- <li><a href="ftp://ftp.tu-darmstadt.de/pub/editors/xemacs/"
- >ftp://ftp.tu-darmstadt.de/pub/editors/xemacs/</a></li>
-
- </ul></li>
- </ul>
- <p></p>
- </li>
- <!-- hu.xemacs.org doesn't have xemacs any more?
- <li>
- <h4>Hungary</h4>
- <ul>
- <li><a href="ftp://ftp.hu.xemacs.org/pub/packages/xemacs/"
- ><b>ftp.hu.xemacs.org (FTP)</b></a></li>
- <li><a href="http://ftp.hu.xemacs.org/ftp/packages/xemacs/"
- ><b>ftp.hu.xemacs.org (HTTP)</b></a></li>
</ul>
<p></p>
</li>
- -->
<li>
<h4>Iceland</h4>
<ul>
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
- 1 participants
- 0 comments
[C] xemacsweb: Update link to zlib site
19 years, 2 months
Adrian Aichner
Adrian Aichner
COMMIT
Finishing work started by Ben, addressing issues pointed out by Franz.
Thanks Franz!
Adrian
BTW, all three master websites updated automatically again from this
commit. shell.sourceforge.net refused ssh connection earlier today,
but is now functioning again.
xemacsweb ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: Download/ChangeLog
Index: Download/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/ChangeLog,v
retrieving revision 1.164
diff -u -U0 -r1.164 ChangeLog
--- Download/ChangeLog 15 Oct 2005 16:14:30 -0000 1.164
+++ Download/ChangeLog 17 Oct 2005 21:43:42 -0000
＠＠ -0,0 +1,5 ＠＠
+2005-10-17 Adrian Aichner <adrian(a)xemacs.org>
+
+ * optLibs.content: Update link to zlib, as suggested by Franz
+ Haeuslschmid.
+
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: Download/optLibs.content
Index: Download/optLibs.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/optLibs.content,v
retrieving revision 1.36
diff -u -w -r1.36 optLibs.content
--- Download/optLibs.content 15 Oct 2005 16:14:30 -0000 1.36
+++ Download/optLibs.content 17 Oct 2005 21:41:29 -0000
＠＠ -108,7 +108,7 ＠＠
encouraged when building XEmacs)</strong> is used by the PNG library.
A GZIP coding system is also available, in XEmacs 21.5 and onward.<br />
<a href="http://ftp.xemacs.org/pub/xemacs/aux/zlib-1.2.3.tar.gz">zlib-1.2.3.... />
- <a href="http://www.gzip.org/zlib/">http://www.gzip.org/zlib/</a><br />
+ <a href="http://www.zlib.net/">http://www.zlib.net/</a><br />
configure flag: <tt>--with-zlib</tt></p>
<p>
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
- 1 participants
- 0 comments
[C] xemacsweb: Add note about failing "cvs update" causing "make all" not to be run on master websites
19 years, 2 months
Adrian Aichner
Adrian Aichner
COMMIT
Is so happened due to a CVS conflict in Documentation/ChangeLog on
www.xemacs.org caused by me.
So I better document it.
Adrian
xemacsweb ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: About/ChangeLog
Index: About/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/ChangeLog,v
retrieving revision 1.189
diff -u -U0 -r1.189 ChangeLog
--- About/ChangeLog 17 Oct 2005 18:25:17 -0000 1.189
+++ About/ChangeLog 17 Oct 2005 19:21:14 -0000
＠＠ -2,0 +3,5 ＠＠
+ * Website.content: Add note about failing "cvs update" causing
+ "make all" not to be run on master websites.
+
+2005-10-17 Adrian Aichner <adrian(a)xemacs.org>
+
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: About/Website.content
Index: About/Website.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/Website.content,v
retrieving revision 1.68
diff -u -w -r1.68 Website.content
--- About/Website.content 20 Nov 2004 22:24:05 -0000 1.68
+++ About/Website.content 17 Oct 2005 19:20:36 -0000
＠＠ -298,6 +298,12 ＠＠
all</cite> run.</p>
<p>
+ Please note that a failing <cite>cvs update</cite> (e.g. due to a
+ CVS conflict) will cause <cite>make all</cite> not to be run! CVS
+ conflicts on our master websites really need to be fixed
+ anyway.</p>
+
+ <p>
Commits also cause a mail message to be sent to the list
<a href="http://list-archive.xemacs.org/xemacs-cvs/">xemacs-cvs</a>＠xemacs.org,
which is one of the XEmacs
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
- 1 participants
- 0 comments
[C] xemacsweb: linkmending created.content
19 years, 2 months
Adrian Aichner
Adrian Aichner
COMMIT
xemacsweb ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: About/ChangeLog
Index: About/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/ChangeLog,v
retrieving revision 1.188
diff -u -U0 -r1.188 ChangeLog
--- About/ChangeLog 2 Oct 2005 12:28:48 -0000 1.188
+++ About/ChangeLog 17 Oct 2005 18:25:07 -0000
＠＠ -0,0 +1,5 ＠＠
+2005-10-17 Adrian Aichner <adrian(a)xemacs.org>
+
+ * created.content: http://xarch.tu-graz.ac.at/autocad/ has been
+ failing for a long time.
+
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: About/created.content
Index: About/created.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/created.content,v
retrieving revision 1.85
diff -u -w -r1.85 created.content
--- About/created.content 12 Jun 2005 14:34:18 -0000 1.85
+++ About/created.content 17 Oct 2005 18:24:20 -0000
＠＠ -62,7 +62,13 ＠＠
<!-- http://www.astro.psu.edu/users/eschnett/index.html -->
<!-- could not connect to host -->
<!-- <li><a href="http://www.astro.psu.edu/users/eschnett/index.html">Erik Schnetter's fan out</a></li> -->
- <li><a href="http://xarch.tu-graz.ac.at/autocad/">xarch AutoCAD info + tools</a></li>
+ <!-- file: urlfailF.txt -->
+ <!-- date: Sat, 15 Oct 2005 03:11:03 (local) -->
+ <!-- /About/created.html -->
+ <!-- had 1 failed url -->
+ <!-- http://xarch.tu-graz.ac.at/autocad/ -->
+ <!-- not found (404) -->
+ <!-- <li><a href="http://xarch.tu-graz.ac.at/autocad/">xarch AutoCAD info + tools</a></li> -->
<!-- file: urlfailF.txt -->
<!-- date: Sat, 03 Nov 2001 20:04:03 (local) -->
<!-- Linklint version: 2.3.5 -->
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
- 1 participants
- 0 comments