September 2005 - xemacs-cvs＠xemacs.org - XEmacs Mailing List Archives

CVS update by stephent xemacs/src ... 18 years, 7 months

CVS Monitor

User: stephent Date: 05/09/24 16:02:41 Branch: xemacs sjt-xft xemacs/lisp sjt-xft xemacs/lisp/mule sjt-xft xemacs/modules sjt-xft xemacs/modules/canna sjt-xft xemacs/src sjt-xft sjt-xft Modified: xemacs/src ChangeLog Makefile.in.in emacs.c symsinit.h Added: xemacs/modules/canna Makefile.in.in canna_api.c configure.ac install-sh Removed: xemacs/src mule-canna.c Log: Convert Canna support to ELL. <878xxmefcp.fsf(a)tleepslib.sk.tsukuba.ac.jp> Revision Changes Path 1.418.2.17 +6 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418.2.16 retrieving revision 1.418.2.17 diff -u -p -r1.418.2.16 -r1.418.2.17 --- ChangeLog 2005/09/23 18:20:27 1.418.2.16 +++ ChangeLog 2005/09/24 14:02:11 1.418.2.17 ＠＠ -1,3 +1,9 ＠＠ +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). + 2005-09-18 Mike Alexander <mta(a)arbortext.com> * configure.ac: Fix the cygwin, non-X build by adding XPM header 1.22.2.4 +2 -1 XEmacs/xemacs/Makefile.in.in Index: Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v retrieving revision 1.22.2.3 retrieving revision 1.22.2.4 diff -u -p -r1.22.2.3 -r1.22.2.4 --- Makefile.in.in 2005/07/13 04:42:45 1.22.2.3 +++ Makefile.in.in 2005/09/24 14:02:12 1.22.2.4 ＠＠ -313,7 +313,8 ＠＠ ${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERAT 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 1.1.14.13 +8 -1 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.1.14.12 retrieving revision 1.1.14.13 diff -u -p -r1.1.14.12 -r1.1.14.13 --- configure.ac 2005/09/23 18:20:28 1.1.14.12 +++ configure.ac 2005/09/24 14:02:12 1.1.14.13 ＠＠ -4379,6 +4379,7 ＠＠ if test "$enable_mule" = "yes" ; then fi dnl Autodetect canna + canna_libs= canna_includes_found=no if test "$with_canna" != "no"; then AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes) ＠＠ -4400,8 +4401,14 ＠＠ if test "$enable_mule" = "yes" ; then 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 1.599.2.10 +8 -0 XEmacs/xemacs/lisp/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.599.2.9 retrieving revision 1.599.2.10 diff -u -p -r1.599.2.9 -r1.599.2.10 --- ChangeLog 2005/09/24 13:15:17 1.599.2.9 +++ ChangeLog 2005/09/24 14:02:18 1.599.2.10 ＠＠ -1,3 +1,11 ＠＠ +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. + 2005-09-21 Stephen J. Turnbull <stephen(a)xemacs.org> * mule/mule-cmds.el (input-method-alist, register-input-method): 1.49.2.4 +1 -1 XEmacs/xemacs/lisp/dumped-lisp.el Index: dumped-lisp.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/dumped-lisp.el,v retrieving revision 1.49.2.3 retrieving revision 1.49.2.4 diff -u -p -r1.49.2.3 -r1.49.2.4 --- dumped-lisp.el 2005/09/20 16:05:24 1.49.2.3 +++ dumped-lisp.el 2005/09/24 14:02:20 1.49.2.4 ＠＠ -220,7 +220,7 ＠＠ in dumped-lisp.el and is not itself list )) ;; 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")) 1.7.8.1 +15 -3 XEmacs/xemacs/lisp/mule/canna-leim.el Index: canna-leim.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/canna-leim.el,v retrieving revision 1.7 retrieving revision 1.7.8.1 diff -u -p -r1.7 -r1.7.8.1 --- canna-leim.el 2002/03/16 10:39:05 1.7 +++ canna-leim.el 2005/09/24 14:02:22 1.7.8.1 ＠＠ -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 + "Neither built-in nor ELL support for the Canna API was found.")) + (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) 1.36.2.4 +13 -0 XEmacs/xemacs/modules/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v retrieving revision 1.36.2.3 retrieving revision 1.36.2.4 diff -u -p -r1.36.2.3 -r1.36.2.4 --- ChangeLog 2005/09/20 16:05:48 1.36.2.3 +++ ChangeLog 2005/09/24 14:02:23 1.36.2.4 ＠＠ -1,3 +1,16 ＠＠ +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. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 1.1.2.1 +36 -0 XEmacs/xemacs/modules/canna/Attic/Makefile.in.in Index: Makefile.in.in =================================================================== RCS file: Makefile.in.in diff -N Makefile.in.in --- /dev/null Sat Sep 24 16:02:01 2005 +++ /tmp/cvsAAAZ3aOv5 Sat Sep 24 16:02:26 2005 ＠＠ -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.0.1 +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 1.1.2.1 +1988 -0 XEmacs/xemacs/modules/canna/Attic/canna_api.c Index: canna_api.c =================================================================== RCS file: canna_api.c diff -N canna_api.c --- /dev/null Sat Sep 24 16:02:01 2005 +++ /tmp/cvsAAAr9aiw5 Sat Sep 24 16:02:26 2005 ＠＠ -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 */ 1.1.2.1 +79 -0 XEmacs/xemacs/modules/canna/Attic/configure.ac Index: configure.ac =================================================================== RCS file: configure.ac diff -N configure.ac --- /dev/null Sat Sep 24 16:02:01 2005 +++ /tmp/cvsAAAwaaGw5 Sat Sep 24 16:02:26 2005 ＠＠ -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.2.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 1.1.2.1 +251 -0 XEmacs/xemacs/modules/canna/Attic/install-sh Index: install-sh =================================================================== RCS file: install-sh diff -N install-sh --- /dev/null Sat Sep 24 16:02:01 2005 +++ /tmp/cvsAAA0ea4w5 Sat Sep 24 16:02:26 2005 ＠＠ -0,0 +1,251 ＠＠ +#!/bin/sh +# +# install - install a program, script, or datafile +# This comes from X11R5 (mit/util/scripts/install.sh). +# +# Copyright 1991 by the Massachusetts Institute of Technology +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of M.I.T. not be used in advertising or +# publicity pertaining to distribution of the software without specific, +# written prior permission. M.I.T. makes no representations about the +# suitability of this software for any purpose. It is provided "as is" +# without express or implied warranty. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +transformbasename="" +transform_arg="" +instcmd="$mvprog" +chmodcmd="$chmodprog 0755" +chowncmd="" +chgrpcmd="" +stripcmd="" +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src="" +dst="" +dir_arg="" + +while [ x"$1" != x ]; do + case $1 in + -c) instcmd="$cpprog" + shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + -s) stripcmd="$stripprog" + shift + continue;; + + -t=*) transformarg=`echo $1 | sed 's/-t=//'` + shift + continue;; + + -b=*) transformbasename=`echo $1 | sed 's/-b=//'` + shift + continue;; + + *) if [ x"$src" = x ] + then + src=$1 + else + # this colon is to work around a 386BSD /bin/sh bug + : + dst=$1 + fi + shift + continue;; + esac +done + +if [ x"$src" = x ] +then + echo "install: no input file specified" + exit 1 +else + : +fi + +if [ x"$dir_arg" != x ]; then + dst=$src + src="" + + if [ -d $dst ]; then + instcmd=: + chmodcmd="" + else + instcmd=$mkdirprog + fi +else + +# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +# might cause directories to be created, which would be especially bad +# if $src (and thus $dsttmp) contains '*'. + + if [ -f "$src" ] || [ -d "$src" ] + then + : + else + echo "install: $src does not exist" + exit 1 + fi + + if [ x"$dst" = x ] + then + echo "install: no destination specified" + exit 1 + else + : + fi + +# If destination is a directory, append the input filename; if your system +# does not like double slashes in filenames, you may need to add some logic + + if [ -d $dst ] + then + dst="$dst"/`basename $src` + else + : + fi +fi + +## this sed command emulates the dirname command +dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + +# Make sure that the destination directory exists. +# this part is taken from Noah Friedman's mkinstalldirs script + +# Skip lots of stat calls in the usual case. +if [ ! -d "$dstdir" ]; then +defaultIFS=' + ' +IFS="${IFS-${defaultIFS}}" + +oIFS="${IFS}" +# Some sh's can't handle IFS=/ for some reason. +IFS='%' +set - `echo ${dstdir} | sed -e 's＠/＠%＠g' -e 's＠^%＠/＠'` +IFS="${oIFS}" + +pathcomp='' + +while [ $# -ne 0 ] ; do + pathcomp="${pathcomp}${1}" + shift + + if [ ! -d "${pathcomp}" ] ; + then + $mkdirprog "${pathcomp}" + else + : + fi + + pathcomp="${pathcomp}/" +done +fi + +if [ x"$dir_arg" != x ] +then + $doit $instcmd $dst && + + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi +else + +# If we're going to rename the final executable, determine the name now. + + if [ x"$transformarg" = x ] + then + dstfile=`basename $dst` + else + dstfile=`basename $dst $transformbasename | + sed $transformarg`$transformbasename + fi + +# don't allow the sed command to completely eliminate the filename + + if [ x"$dstfile" = x ] + then + dstfile=`basename $dst` + else + : + fi + +# Make a temp file name in the proper directory. + + dsttmp=$dstdir/#inst.$$# + +# Move or copy the file name to the temp name + + $doit $instcmd $src $dsttmp && + + trap "rm -f ${dsttmp}" 0 && + +# and set any options; do chmod last to preserve setuid bits + +# If any of these fail, we abort the whole thing. If we want to +# ignore errors from any of these, just make sure not to ignore +# errors from the above "$doit $instcmd $src $dsttmp" command. + + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && + +# Now rename the file to the real destination. + + $doit $rmcmd -f $dstdir/$dstfile && + $doit $mvcmd $dsttmp $dstdir/$dstfile + +fi && + + +exit 0 1.758.2.30 +12 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.29 retrieving revision 1.758.2.30 diff -u -p -r1.758.2.29 -r1.758.2.30 --- ChangeLog 2005/09/24 13:04:16 1.758.2.29 +++ ChangeLog 2005/09/24 14:02:28 1.758.2.30 ＠＠ -1,3 +1,15 ＠＠ +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. + 2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> * objects-x.c (x_find_charset_font): Give user more control of 1.112.2.5 +2 -2 XEmacs/xemacs/src/Makefile.in.in Index: Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v retrieving revision 1.112.2.4 retrieving revision 1.112.2.5 diff -u -p -r1.112.2.4 -r1.112.2.5 --- Makefile.in.in 2005/07/13 04:46:22 1.112.2.4 +++ Makefile.in.in 2005/09/24 14:02:34 1.112.2.5 ＠＠ -199,8 +199,8 ＠＠ ldap_objs=$(BLDMODULES)/ldap/eldap.o 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/cannamod.o #endif #ifdef HAVE_WNN 1.150.2.7 +4 -4 XEmacs/xemacs/src/emacs.c Index: emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.150.2.6 retrieving revision 1.150.2.7 diff -u -p -r1.150.2.6 -r1.150.2.7 --- emacs.c 2005/07/13 04:46:34 1.150.2.6 +++ emacs.c 2005/09/24 14:02:34 1.150.2.7 ＠＠ -1649,8 +1649,8 ＠＠ main_1 (int argc, Wexttext **argv, Wextt #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 */ ＠＠ -2223,8 +2223,8 ＠＠ main_1 (int argc, Wexttext **argv, Wextt #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 */ 1.50.2.5 +2 -2 XEmacs/xemacs/src/symsinit.h Index: symsinit.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symsinit.h,v retrieving revision 1.50.2.4 retrieving revision 1.50.2.5 diff -u -p -r1.50.2.4 -r1.50.2.5 --- symsinit.h 2005/07/13 04:47:02 1.50.2.4 +++ symsinit.h 2005/09/24 14:02:35 1.50.2.5 ＠＠ -149,7 +149,7 ＠＠ void syms_of_menubar_mswindows (void); 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); ＠＠ -388,7 +388,7 ＠＠ void vars_of_minibuf (void); 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);

1 participants
0 comments

CVS update by stephent xemacs/lisp/mule ... 18 years, 7 months

CVS Monitor

User: stephent Date: 05/09/24 15:15:23 Branch: xemacs/lisp sjt-xft xemacs/lisp/mule sjt-xft Modified: xemacs/lisp/mule mule-cmds.el Log: Improve register-input-method. <87ek7eehi4.fsf(a)tleepslib.sk.tsukuba.ac.jp> Revision Changes Path 1.599.2.9 +5 -0 XEmacs/xemacs/lisp/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.599.2.8 retrieving revision 1.599.2.9 diff -u -p -r1.599.2.8 -r1.599.2.9 --- ChangeLog 2005/09/20 16:05:22 1.599.2.8 +++ ChangeLog 2005/09/24 13:15:17 1.599.2.9 ＠＠ -1,3 +1,8 ＠＠ +2005-09-21 Stephen J. Turnbull <stephen(a)xemacs.org> + + * mule/mule-cmds.el (input-method-alist, register-input-method): + Improve docstrings and formal parameter names. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 1.24.2.1 +27 -30 XEmacs/xemacs/lisp/mule/mule-cmds.el Index: mule-cmds.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/mule-cmds.el,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -p -r1.24 -r1.24.2.1 --- mule-cmds.el 2004/11/04 23:06:02 1.24 +++ mule-cmds.el 2005/09/24 13:15:23 1.24.2.1 ＠＠ -347,44 +347,41 ＠＠ This function is called with no argument (put 'describe-current-input-method-function 'permanent-local t) (defvar input-method-alist nil - "Alist of input method names vs how to use them. -Each element has the form: - (INPUT-METHOD LANGUAGE-ENV ACTIVATE-FUNC TITLE DESCRIPTION ARGS...) -See the function `register-input-method' for the meanings of the elements.") + "Alist mapping input method names to information used by the LEIM API. +Elements have the form (METHOD LANGUAGE ACTIVATOR TITLE DESCRIPTION ARGS...). +Use `register-input-method' to add input methods to the database. See its +documentation for the meanings of the elements.") -(defun register-input-method (input-method lang-env &rest args) - "Register INPUT-METHOD as an input method for language environment ENV. -INPUT-METHOD and LANG-ENV are symbols or strings. +(defun register-input-method (method language + ;; #### shouldn't be optional, but need to + ;; audit callers + &optional activator title description + &rest args) + "Register METHOD as an input method for language environment LANGUAGE. -The remaining arguments are: - ACTIVATE-FUNC, TITLE, DESCRIPTION, and ARGS... -ACTIVATE-FUNC is a function to call to activate this method. +METHOD and LANGUAGE may be symbols or strings. +ACTIVATOR is the function called to activate this method. METHOD (the + invocation name) and ARGS are passed to the function on activation. TITLE is a string to show in the mode line when this method is active. DESCRIPTION is a string describing this method and what it is good for. -The ARGS, if any, are passed as arguments to ACTIVATE-FUNC. -All told, the arguments to ACTIVATE-FUNC are INPUT-METHOD and the ARGS. +Optional ARGS, if any, are stored and passed as arguments to ACTIVATOR. -This function is mainly used in the file \"leim-list.el\" which is -created at building time of emacs, registering all quail input methods -contained in the emacs distribution. +When registering a new Quail input method, the input method title should be +the one given in the third parameter of `quail-define-package' (if the values +are different, the string specified in this function takes precedence). -In case you want to register a new quail input method by yourself, be -careful to use the same input method title as given in the third -parameter of `quail-define-package' (if the values are different, the -string specified in this function takes precedence). - -The commands `describe-input-method' and `list-input-methods' need -this duplicated values to show some information about input methods -without loading the affected quail packages." - (if (symbolp lang-env) - (setq lang-env (symbol-name lang-env))) - (if (symbolp input-method) - (setq input-method (symbol-name input-method))) - (let ((info (cons lang-env args)) - (slot (assoc input-method input-method-alist))) +The information provided is registered in `input-method-alist'. The commands +`describe-input-method' and `list-input-methods' use this database to show +information about input methods without loading them." + (if (symbolp language) + (setq language (symbol-name language))) + (if (symbolp method) + (setq method (symbol-name method))) + (let ((info (append (list language activator title description) args)) + (slot (assoc method input-method-alist))) (if slot (setcdr slot info) - (setq slot (cons input-method info)) + (setq slot (cons method info)) (setq input-method-alist (cons slot input-method-alist))))) (defun read-input-method-name (prompt &optional default inhibit-null)

1 participants
0 comments

CVS update by stephent xemacs/src ... 18 years, 7 months

CVS Monitor

User: stephent Date: 05/09/24 15:04:24 Branch: xemacs/src sjt-xft Modified: xemacs/src ChangeLog objects-x.c Log: Comments, bug fix, and debug output reduction <87u0gaejex.fsf(a)tleepslib.sk.tsukuba.ac.jp> <87psqyeiu0.fsf(a)tleepslib.sk.tsukuba.ac.jp> <87ll1mei3w.fsf(a)tleepslib.sk.tsukuba.ac.jp> Revision Changes Path 1.758.2.29 +17 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.28 retrieving revision 1.758.2.29 diff -u -p -r1.758.2.28 -r1.758.2.29 --- ChangeLog 2005/09/23 18:20:37 1.758.2.28 +++ ChangeLog 2005/09/24 13:04:16 1.758.2.29 ＠＠ -1,3 +1,20 ＠＠ +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * objects-x.c (x_find_charset_font): Give user more control of + debug verbosity. Reduce verbosity at debug_xft=1. Reduce + verbosity of truename by removing properties that are rarely + specified from fontconfig font name. + +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * objects-x.c (x_find_charset_font): Work around buggy return + value in FcInit(). + +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * objects-x.c: Improve various header comments. + (x_font_instance_truename): Remove obsolete #ifdef 0 code. + 2005-09-12 Mike Alexander <mta(a)arbortext.com> * intl-win32.c (mswindows_current_locale): Define in non-MULE 1.26.2.19 +146 -101 XEmacs/xemacs/src/objects-x.c Index: objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.26.2.18 retrieving revision 1.26.2.19 diff -u -p -r1.26.2.18 -r1.26.2.19 --- objects-x.c 2005/04/18 03:51:18 1.26.2.18 +++ objects-x.c 2005/09/24 13:04:20 1.26.2.19 ＠＠ -243,7 +243,7 ＠＠ x_color_list (void) going to #ifdef the return values defaulting to short. -- sjt */ -/* #### Do we need to properly implement Qxft_font_name_encoding? */ +/* Standard for fontconfig. Use a macro to show we're not guessing. */ #define Qxft_font_name_encoding Qutf_8 /* DEBUGGING STUFF */ ＠＠ -518,7 +518,8 ＠＠ x_finalize_font_instance (Lisp_Font_Inst /* Determining the truename of a font is hard. (Big surprise.) - This is almost not true for fontconfig. At least in theory, it is + This is not true for fontconfig. Each font has a (nearly) canonical + representation up to permutation of the order of properties. It is possible to construct a name which exactly identifies the properties of the current font. However, it is theoretically possible that there exists another font with a super set of those properties that would happen to get ＠＠ -824,7 +825,6 ＠＠ x_font_instance_truename (Lisp_Font_Inst /* First, try an Xft font. */ if (NILP (FONT_INSTANCE_TRUENAME (f)) && FONT_INSTANCE_X_XFTFONT (f)) { -#ifndef DO_FORMER_BIZARRE_GYMNASTICS /* The font is already open, we just unparse. */ FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern); if (res) ＠＠ -840,65 +840,6 ＠＠ x_font_instance_truename (Lisp_Font_Inst Qnil, Qfont, errb); /* used to return Qnil here */ } -#else - /* FORMER BIZARRE GYMNASTICS */ - int core; - FcChar8* fcfont; - FcPattern *pat = FONT_INSTANCE_X_XFTFONT (f)->pattern; - FcResult res_xlfd = FcPatternGetString (pat, XFT_XLFD, 0, &fcfont); - FcResult res_core = FcPatternGetBool (pat, XFT_CORE, 0, &core); - - /* #### boy this is broken!! FIXME!! - Probably only makes sense in Xft v1. */ - if (res_xlfd == FcResultNoMatch || res_core == FcResultNoMatch || !core) - /* #### should we test fcfont for something here? if so, what? */ - { - /* we've got an Xft font! */ - FcChar8 *res = FcNameUnparse (pat); - Lisp_Object name = (res ? make_string (res, strlen (res)) : Qnil); - /* #### huh? device? Fc don' need no steekin' device! */ - Lisp_Object real_pat = Ffc_font_real_pattern (name, f->device); - free (res); - - res = FcNameUnparse (XFCPATTERN_PTR(real_pat)); - if (res) - { - FONT_INSTANCE_TRUENAME (f) = make_string (res, strlen (res)); - free (res); - return FONT_INSTANCE_TRUENAME (f); - } - else - { - maybe_signal_error (Qgui_error, - "Couldn't unparse Xft font to truename", - Qnil, Qfont, errb); - /* used to return Qnil here */ - } - } - else if (res_xlfd == FcResultMatch && res_core == FcResultMatch) - { - FONT_INSTANCE_TRUENAME (f) = - build_ext_string (truename_via_XListFonts (dpy, - (Extbyte *) &fcfont[0]), - Qx_font_name_encoding); - return FONT_INSTANCE_TRUENAME (f); - } - else if (res_xlfd == FcResultTypeMismatch || res_core == FcResultTypeMismatch) - { /* Now we're f.... */ - maybe_signal_error (Qgui_error, - "Xft TypeMismatch while determining font truename", - Qnil, Qfont, errb); - /* used to return Qnil here */ - } - /* we shouldn't have to worry about FcResultNoId */ - else - { /* Now we're f.... */ - maybe_signal_error (Qgui_error, - "Xft bogus status while determining font truename", - Qnil, Qfont, errb); - /* used to return Qnil here */ - } -#endif /* DO_FORMER_BIZARRE_GYMNASTICS */ } #endif /* USE_XFT */ ＠＠ -1194,9 +1135,10 ＠＠ mule_to_fc_charset (Lisp_Object cs) struct charset_reporter { Lisp_Object *charset; - /* #### Mule-ize these strings? */ - Extbyte *language; - FcChar8 *rfc3066; + /* #### Mule-ize these strings? + No hurry, this is a debug facility. */ + Extbyte *language; /* ASCII, please */ + FcChar8 *rfc3066; /* ASCII, please */ }; static struct charset_reporter charset_table[] = ＠＠ -1243,9 +1185,6 ＠＠ x_find_charset_font (Lisp_Object device, int count = 0; const Extbyte *patternext; Lisp_Object result = Qunbound; -#ifdef USE_XFT - FcBool waste; -#endif int i; /* #### with Xft need to handle second stage here -- sjt ＠＠ -1269,22 +1208,27 ＠＠ x_find_charset_font (Lisp_Object device, gives language or repertoire coverage. */ - waste = FcInit (); - if (!waste) /* I don't think this can fail */ - /* #### should we init in xft_fonts_init() - and FcInitBringUpToDate() here? */ + FcInit (); /* No-op if already initialized. + In fontconfig 2.3.2, this cannot return + failure, but that looks like a bug. We + check for it with FcGetCurrentConfig(), + which *can* fail. */ + if (!FcConfigGetCurrent()) /* #### should we init in xft_fonts_init() + and FcInitBringUpToDate() here? + I think not. We should expose FcInit* + interfaces to LISP and decide when to + reinitialize intelligently. */ stderr_out ("Failed fontconfig initialization\n"); - else if (waste) + else { FcPattern *fontxft; /* long-lived, freed at end of this block */ FcResult fcresult; FcConfig *fcc; FcChar8 *lang = "en"; /* #### probably a bad idea */ FcCharSet *fccs = NULL; - DECLARE_EISTRING (eistr_shortname); -#ifdef RETURN_LONG_FONTCONFIG_NAMES - DECLARE_EISTRING (eistr_longname); -#endif + DECLARE_EISTRING (eistr_shortname); /* user-friendly nickname */ + DECLARE_EISTRING (eistr_longname); /* omit FC_LANG and FC_CHARSET */ + DECLARE_EISTRING (eistr_fullname); /* everything */ LISP_STRING_TO_EXTERNAL (font, patternext, Qxft_font_name_encoding); fcc = FcConfigGetCurrent (); ＠＠ -1293,36 +1237,66 ＠＠ x_find_charset_font (Lisp_Object device, { FcPattern *p = FcNameParse (patternext); - PRINT_XFT_PATTERN (1, "FcNameParse'ed name is %s\n", p); + PRINT_XFT_PATTERN (3, "FcNameParse'ed name is %s\n", p); /* #### Next two return FcBool, but what does the return mean? */ /* The order is correct according the fontconfig docs. */ FcConfigSubstitute (fcc, p, FcMatchPattern); - PRINT_XFT_PATTERN (0, "FcConfigSubstitute'ed name is %s\n", p); + PRINT_XFT_PATTERN (2, "FcConfigSubstitute'ed name is %s\n", p); FcDefaultSubstitute (p); - PRINT_XFT_PATTERN (1, "FcDefaultSubstitute'ed name is %s\n", p); + PRINT_XFT_PATTERN (3, "FcDefaultSubstitute'ed name is %s\n", p); /* #### check fcresult of following match? */ fontxft = FcFontMatch (fcc, p, &fcresult); /* this prints the long fontconfig name */ - PRINT_XFT_PATTERN (0, "FcFontMatch'ed name is %s\n", fontxft); + PRINT_XFT_PATTERN (1, "FcFontMatch'ed name is %s\n", fontxft); FcPatternDestroy (p); } + + /* heuristic to give reasonable-length names for debug reports - /* heuristic to give reasonable-length names for debug reports */ + I considered #ifdef SUPPORT_FULL_FONTCONFIG_NAME etc but that's + pointless. We're just going to remove this code once the font/ + face refactoring is done, but until then it could be very useful. + */ { FcPattern *p = FcFontRenderPrepare (fcc, fontxft, fontxft); FcChar8 *name; -#ifdef RETURN_LONG_FONTCONFIG_NAMES + /* full name, including language coverage and repertoire */ name = FcNameUnparse (p); - eicpy_ext (eistr_longname, name, Qxft_font_name_encoding); + eicpy_ext (eistr_fullname, name, Qxft_font_name_encoding); free (name); -#endif - /* short name, omitting coverage and repertoire */ + + /* long name, omitting coverage and repertoire, plus a number + of rarely useful properties */ FcPatternDel (p, FC_CHARSET); FcPatternDel (p, FC_LANG); + FcPatternDel (p, FC_WIDTH); + FcPatternDel (p, FC_SPACING); + FcPatternDel (p, FC_HINTING); + FcPatternDel (p, FC_VERTICAL_LAYOUT); + FcPatternDel (p, FC_AUTOHINT); + FcPatternDel (p, FC_GLOBAL_ADVANCE); + FcPatternDel (p, FC_INDEX); + FcPatternDel (p, FC_SCALE); + FcPatternDel (p, FC_FONTVERSION); + name = FcNameUnparse (p); + eicpy_ext (eistr_longname, name, Qxft_font_name_encoding); + free (name); + + /* nickname, just family and size, but + "family" names usually have style, slant, and weight */ + FcPatternDel (p, FC_FOUNDRY); + FcPatternDel (p, FC_STYLE); + FcPatternDel (p, FC_SLANT); + FcPatternDel (p, FC_WEIGHT); + FcPatternDel (p, FC_PIXEL_SIZE); + FcPatternDel (p, FC_OUTLINE); + FcPatternDel (p, FC_SCALABLE); + FcPatternDel (p, FC_DPI); name = FcNameUnparse (p); eicpy_ext (eistr_shortname, name, Qxft_font_name_encoding); free (name); + FcPatternDestroy (p); } ＠＠ -1342,7 +1316,19 ＠＠ x_find_charset_font (Lisp_Object device, if (cr->rfc3066) { - CHECKING_LANG (0, eidata(eistr_shortname), cr->language); + /* #### is it worth incorporating this logic in a macro? */ + if (debug_xft > 2) + { + CHECKING_LANG (0, eidata(eistr_fullname), cr->language); + } + else if (debug_xft > 1) + { + CHECKING_LANG (0, eidata(eistr_longname), cr->language); + } + else if (debug_xft > 0) + { + CHECKING_LANG (0, eidata(eistr_shortname), cr->language); + } lang = cr->rfc3066; } else if (cr->charset) ＠＠ -1384,20 +1370,51 ＠＠ x_find_charset_font (Lisp_Object device, [[ Aidan says yes. The full pattern with the bitmap coverage is massively unwieldy. ]] - It would be nice if we could just store it into the truename - right here, though. */ - DEBUG_XFT2 (0, "Xft font %s supports %s\n", - eidata(eistr_shortname), lang); + Yah, but that's just *wrong*. We should have the full + thing internally, and filter stuff the client doesn't want + to see on output. + And it would be nice if we could just store it into the + truename right here, though. */ + /* #### is it worth incorporating this logic in a macro? */ + if (debug_xft > 2) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_fullname), lang); + } + else if (debug_xft > 1) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_longname), lang); + } + else if (debug_xft > 0) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_shortname), lang); + } #ifdef RETURN_LONG_FONTCONFIG_NAMES - result = eimake_string(eistr_longname); + result = eimake_string(eistr_fullname); #else - result = eimake_string(eistr_shortname); + result = eimake_string(eistr_longname); #endif } else { - DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", - eidata(eistr_shortname), lang); + /* #### is it worth incorporating this logic in a macro? */ + if (debug_xft > 2) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_fullname), lang); + } + else if (debug_xft > 1) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_longname), lang); + } + else if (debug_xft > 0) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_shortname), lang); + } result = Qnil; } ＠＠ -1424,18 +1441,46 ＠＠ x_find_charset_font (Lisp_Object device, } else if (FcLangSetHasLang (v.u.l, lang) != FcLangDifferentLang) { - DEBUG_XFT2 (0, "Xft font %s supports %s\n", - eidata(eistr_shortname), lang); + /* #### is it worth incorporating this logic in a macro? */ + if (debug_xft > 2) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_fullname), lang); + } + else if (debug_xft > 1) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_longname), lang); + } + else if (debug_xft > 0) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_shortname), lang); + } #ifdef RETURN_LONG_FONTCONFIG_NAMES - result = eimake_string(eistr_longname); + result = eimake_string(eistr_fullname); #else - result = eimake_string(eistr_shortname); + result = eimake_string(eistr_longname); #endif } else { - DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", - eidata(eistr_shortname), lang); + /* #### is it worth incorporating this logic in a macro? */ + if (debug_xft > 2) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_fullname), lang); + } + else if (debug_xft > 1) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_longname), lang); + } + else if (debug_xft > 0) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_shortname), lang); + } result = Qnil; } }

1 participants
0 comments

CVS update by viteno xemacs ... 18 years, 7 months

CVS Monitor

User: viteno Date: 05/09/23 23:51:46 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1292 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1291 retrieving revision 1.1292 diff -u -p -r1.1291 -r1.1292 --- version.sh 2005/09/22 21:51:25 1.1291 +++ version.sh 2005/09/23 21:51:45 1.1292 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20050922)" +xemacs_extra_name="(+CVS-20050923)" xemacs_release_date="2005-02-18"

1 participants
0 comments

CVS update by stephent xemacs/src ... 18 years, 7 months

CVS Monitor

User: stephent Date: 05/09/23 20:20:46 Branch: xemacs sjt-xft xemacs/etc sjt-xft sjt-xft sjt-xft xemacs/lib-src sjt-xft xemacs/src sjt-xft Modified: xemacs/src ChangeLog intl-win32.c mc-alloc.c Added: xemacs/etc ChangeLog.Xft Removed: xemacs/etc configure-2.13 Log: Synch to mainline. Revision Changes Path 1.418.2.16 +8 -2 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418.2.15 retrieving revision 1.418.2.16 diff -u -p -r1.418.2.15 -r1.418.2.16 --- ChangeLog 2005/09/23 17:04:16 1.418.2.15 +++ ChangeLog 2005/09/23 18:20:27 1.418.2.16 ＠＠ -1,6 +1,12 ＠＠ -2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> +2005-09-18 Mike Alexander <mta(a)arbortext.com> - * .cvsignore: Add _darcs for Darcs users. + * configure.ac: Fix the cygwin, non-X build by adding XPM header + and library files to XE_CFLAGS. Patch from Rick Rankin. + +2005-09-17 Malcolm Purvis <malcolmp(a)xemacs.org> + + * configure.in: Replace with warning to use autoconf 2.59. + * configure.ac: Removed warning about the use of autoconf 2.59. 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> 1.1.2.3 +4 -0 XEmacs/xemacs/Attic/ChangeLog.Xft Index: ChangeLog.Xft =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/Attic/ChangeLog.Xft,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -p -r1.1.2.2 -r1.1.2.3 --- ChangeLog.Xft 2005/09/20 16:04:32 1.1.2.2 +++ ChangeLog.Xft 2005/09/23 18:20:28 1.1.2.3 ＠＠ -1,3 +1,7 ＠＠ +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * .cvsignore: Add _darcs for Darcs users. + 2005-03-05 Malcolm Purvis <malcolmp(a)xemacs.org> * configure.ac: Correct the filename of the old copy of configure. 1.1.14.12 +3 -7 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.1.14.11 retrieving revision 1.1.14.12 diff -u -p -r1.1.14.11 -r1.1.14.12 --- configure.ac 2005/07/13 04:43:36 1.1.14.11 +++ configure.ac 2005/09/23 18:20:28 1.1.14.12 ＠＠ -3827,6 +3827,7 ＠＠ if test "$window_system" != "none"; then xpm_problem="" if test -z "$with_xpm"; then XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$incpath_xpm", XE_CFLAGS) XE_PREPEND("$libpath_xpm", LDFLAGS) AC_MSG_CHECKING(for Xpm - no older than 3.4f) xe_check_libs=-lXpm ＠＠ -3866,6 +3867,7 ＠＠ if test "$window_system" != "none"; then XE_PREPEND("$libpath_xpm", LDFLAGS) XE_PREPEND(-lXpm, libs_x) XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$incpath_xpm", XE_CFLAGS) AC_MSG_CHECKING(for \"FOR_MSW\" xpm) xe_check_libs=-lXpm AC_TRY_LINK(, [XpmCreatePixmapFromData()], ＠＠ -5633,13 +5635,7 ＠＠ dnl Start stdout redirection to '| tee - ( echo " -XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'. -" -echo " WARNING: --------------------------------------------------------------" -echo " WARNING: This was produced from a new autoconf-2.5 based configuration." -echo " WARNING: If this configuration seems buggy then copy etc/configure-2.13" -echo " WARNING: to configure and try again. Also please report the bug." -echo " WARNING: --------------------------------------------------------------" +XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'." echo " Compilation Environment and Installation Defaults:" 1.984.2.7 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.984.2.6 retrieving revision 1.984.2.7 diff -u -p -r1.984.2.6 -r1.984.2.7 --- version.sh 2005/09/20 16:04:53 1.984.2.6 +++ version.sh 2005/09/23 18:20:28 1.984.2.7 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+Xft)" +xemacs_extra_name="(+Xft+CVS-20050922)" xemacs_release_date="2005-09-14" 1.48.2.5 +2 -2 XEmacs/xemacs/etc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v retrieving revision 1.48.2.4 retrieving revision 1.48.2.5 diff -u -p -r1.48.2.4 -r1.48.2.5 --- ChangeLog 2005/09/23 17:04:21 1.48.2.4 +++ ChangeLog 2005/09/23 18:20:33 1.48.2.5 ＠＠ -1,6 +1,6 ＠＠ -2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> +2005-09-17 Malcolm Purvis <malcolmp(a)xemacs.org> - * .cvsignore: Create. Add Darcs.boring for Darcs users. + * configure-2.13: Remove. autoconf 2.59 support is stable. 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> 1.1.2.1 +4 -0 XEmacs/xemacs/etc/Attic/ChangeLog.Xft Index: ChangeLog.Xft =================================================================== RCS file: ChangeLog.Xft diff -N ChangeLog.Xft --- /dev/null Fri Sep 23 20:20:31 2005 +++ /tmp/cvsAAAUGaGnj Fri Sep 23 20:20:34 2005 ＠＠ -0,0 +1,4 ＠＠ +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * .cvsignore: Create. Add Darcs.boring for Darcs users. + 1.178.2.6 +5 -0 XEmacs/xemacs/lib-src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.178.2.5 retrieving revision 1.178.2.6 diff -u -p -r1.178.2.5 -r1.178.2.6 --- ChangeLog 2005/09/20 16:05:20 1.178.2.5 +++ ChangeLog 2005/09/23 18:20:35 1.178.2.6 ＠＠ -1,3 +1,8 ＠＠ +2005-09-18 Mike Alexander <mta(a)arbortext.com> + + * installexe.sh: Don't add an exe extention to a file that already + has one. Patch from Rick Rankin. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 1.4.20.1 +8 -3 XEmacs/xemacs/lib-src/installexe.sh Index: installexe.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/installexe.sh,v retrieving revision 1.4 retrieving revision 1.4.20.1 diff -u -p -r1.4 -r1.4.20.1 --- installexe.sh 2001/04/12 18:21:02 1.4 +++ installexe.sh 2005/09/23 18:20:36 1.4.20.1 ＠＠ -5,11 +5,16 ＠＠ shift tstr="" -while [ $# -gt 0 ] +while [[ $# -gt 0 ]] do - if [ -f $1.exe ] + if [[ -f $1.exe ]] then - tstr="$tstr$1.exe $2.exe" + if [[ "$2" == *.exe ]] + then + tstr="$tstr$1 $2" + else + tstr="$tstr$1.exe $2.exe" + fi shift 2 else tstr="$tstr$1 " 1.758.2.28 +11 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.27 retrieving revision 1.758.2.28 diff -u -p -r1.758.2.27 -r1.758.2.28 --- ChangeLog 2005/09/20 16:05:56 1.758.2.27 +++ ChangeLog 2005/09/23 18:20:37 1.758.2.28 ＠＠ -1,3 +1,14 ＠＠ +2005-09-12 Mike Alexander <mta(a)arbortext.com> + + * intl-win32.c (mswindows_current_locale): Define in non-MULE + build. + +2005-09-14 Marcus Crestani <crestani(a)xemacs.org> + + * mc-alloc.c (set_lookup_table): Adjust parameter to other memset + calls. + * mc-alloc.c (init_mc_allocator): Zero global allocator structure. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 1.13.2.3 +7 -0 XEmacs/xemacs/src/intl-win32.c Index: intl-win32.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/intl-win32.c,v retrieving revision 1.13.2.2 retrieving revision 1.13.2.3 diff -u -p -r1.13.2.2 -r1.13.2.3 --- intl-win32.c 2005/07/13 04:46:48 1.13.2.2 +++ intl-win32.c 2005/09/23 18:20:42 1.13.2.3 ＠＠ -1550,6 +1550,13 ＠＠ mswindows_locale_to_code_page (LCID UNUS return CP_ACP; } +LCID +mswindows_current_locale (void) +{ + /* In non-MULE version just return the default locale */ + return GetUserDefaultLCID (); +} + #endif /* MULE */ 1.3.2.2 +3 -1 XEmacs/xemacs/src/mc-alloc.c Index: mc-alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -p -r1.3.2.1 -r1.3.2.2 --- mc-alloc.c 2005/07/13 05:48:56 1.3.2.1 +++ mc-alloc.c 2005/09/23 18:20:42 1.3.2.2 ＠＠ -521,7 +521,7 ＠＠ set_lookup_table (void *ptr, page_header MC_MALLOCED_BYTES += malloced_storage_size (0, sizeof (level_2_lookup_tree), 0); #endif - memset (l2, 0, sizeof (level_2_lookup_tree)); + memset (l2, '\0', sizeof (level_2_lookup_tree)); #ifdef USE_HASH_TABLE LEVEL2_HASH_LINK (l2) = PTR_LOOKUP_TABLE (l1_index); #endif ＠＠ -1689,6 +1689,8 ＠＠ void init_mc_allocator (void) { int i; + + memset (&mc_allocator_globals, '\0', sizeof (mc_allocator_globals_type)); for (i = 0; i < N_USED_PAGE_LISTS; i++) {

1 participants
0 comments

CVS update by stephent xemacs/etc ... 18 years, 7 months

CVS Monitor

User: stephent Date: 05/09/23 19:04:21 Branch: xemacs sjt-xft xemacs/etc sjt-xft sjt-xft Modified: xemacs/etc ChangeLog Added: xemacs/etc .cvsignore Log: Ignore Darcs administrative files and directory. Revision Changes Path 1.3.20.2 +1 -0 XEmacs/xemacs/.cvsignore Index: .cvsignore =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/.cvsignore,v retrieving revision 1.3.20.1 retrieving revision 1.3.20.2 diff -u -p -r1.3.20.1 -r1.3.20.2 --- .cvsignore 2005/03/15 05:18:50 1.3.20.1 +++ .cvsignore 2005/09/23 17:04:16 1.3.20.2 ＠＠ -12,3 +12,4 ＠＠ mule-packages site-packages gmon.out autom4te.cache +_darcs 1.418.2.15 +4 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418.2.14 retrieving revision 1.418.2.15 diff -u -p -r1.418.2.14 -r1.418.2.15 --- ChangeLog 2005/09/20 16:04:31 1.418.2.14 +++ ChangeLog 2005/09/23 17:04:16 1.418.2.15 ＠＠ -1,3 +1,7 ＠＠ +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * .cvsignore: Add _darcs for Darcs users. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 1.48.2.4 +4 -0 XEmacs/xemacs/etc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v retrieving revision 1.48.2.3 retrieving revision 1.48.2.4 diff -u -p -r1.48.2.3 -r1.48.2.4 --- ChangeLog 2005/09/20 16:05:18 1.48.2.3 +++ ChangeLog 2005/09/23 17:04:21 1.48.2.4 ＠＠ -1,3 +1,7 ＠＠ +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * .cvsignore: Create. Add Darcs.boring for Darcs users. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 1.1.2.1 +1 -0 XEmacs/xemacs/etc/Attic/.cvsignore Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null Fri Sep 23 19:04:18 2005 +++ /tmp/cvsAAAubaiIK Fri Sep 23 19:04:21 2005 ＠＠ -0,0 +1 ＠＠ +Darcs.boring

1 participants
0 comments

CVS update by simon packages/xemacs-packages/mail-lib, reporter.el ... 18 years, 7 months

CVS Monitor

User: simon Date: 05/09/23 15:01:17 Modified: packages/xemacs-packages/mail-lib starttls.el rfc2104.el reporter.el mailheader.el ChangeLog Log: 2005-09-23 Simon Josefsson <jas(a)extundo.com> * reporter.el: Change maintainer to FSF, since nobody from the XEmacs camp has touched this file for ages and it has effectively been maintained by the FSF for quite some time through syncing anyway. 2005-08-08 Richard M. Stallman <rms(a)gnu.org> * mail/reporter.el (reporter-dump-state): Use insert-buffer-substring. 2005-06-02 Katsumi Yamaoka <yamaoka(a)jpl.org> * starttls.el (starttls-set-process-query-on-exit-flag): Use eval-and-compile. 2005-05-31 Katsumi Yamaoka <yamaoka(a)jpl.org> * starttls.el (starttls-set-process-query-on-exit-flag): Alias to set-process-query-on-exit-flag or process-kill-without-query. (starttls-open-stream-gnutls): Use it instead of process-kill-without-query. (starttls-open-stream): Ditto. 2001-11-22 Colin Walters <walters(a)debian.org> * mail/reporter.el (reporter-submit-bug-report): Doc fixes. Revision Changes Path 1.4 +13 -5 XEmacs/packages/xemacs-packages/mail-lib/starttls.el Index: starttls.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/starttls.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- starttls.el 2004/06/10 20:28:01 1.3 +++ starttls.el 2005/09/23 13:01:15 1.4 ＠＠ -1,6 +1,7 ＠＠ ;;; starttls.el --- STARTTLS functions -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Author: Simon Josefsson <simon(a)josefsson.org> ＠＠ -21,8 +22,8 ＠＠ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -228,6 +229,13 ＠＠ handshake, or NIL on failure." (starttls-negotiate-gnutls process) (signal-process (process-id process) 'SIGALRM))) +(eval-and-compile + (if (fboundp 'set-process-query-on-exit-flag) + (defalias 'starttls-set-process-query-on-exit-flag + 'set-process-query-on-exit-flag) + (defalias 'starttls-set-process-query-on-exit-flag + 'process-kill-without-query))) + (defun starttls-open-stream-gnutls (name buffer host service) (message "Opening STARTTLS connection to `%s'..." host) (let* (done ＠＠ -239,7 +247,7 ＠＠ handshake, or NIL on failure." (int-to-string service) service) starttls-extra-arguments))) - (process-kill-without-query process) + (starttls-set-process-query-on-exit-flag process nil) (while (and (processp process) (eq (process-status process) 'run) (save-excursion ＠＠ -279,7 +287,7 ＠＠ specifying a port number to connect to." name buffer starttls-program host (format "%s" service) starttls-extra-args))) - (process-kill-without-query process) + (starttls-set-process-query-on-exit-flag process nil) process))) (provide 'starttls) 1.5 +5 -3 XEmacs/packages/xemacs-packages/mail-lib/rfc2104.el Index: rfc2104.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/rfc2104.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- rfc2104.el 2004/09/16 13:01:29 1.4 +++ rfc2104.el 2005/09/23 13:01:15 1.5 ＠＠ -1,6 +1,8 ＠＠ ;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes -;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. + ;; Author: Simon Josefsson <jas(a)pdc.kth.se> ;; Keywords: mail ＠＠ -18,8 +20,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: 1.6 +9 -15 XEmacs/packages/xemacs-packages/mail-lib/reporter.el Index: reporter.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/reporter.el,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- reporter.el 2001/10/13 14:17:40 1.5 +++ reporter.el 2005/09/23 13:01:15 1.6 ＠＠ -1,9 +1,10 ＠＠ ;;; reporter.el --- customizable bug reporting of lisp programs -;; Copyright (C) 1993,1994,1995,1996,1997,1998 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: 1993-1998 Barry A. Warsaw -;; Maintainer: XEmacs Development Team +;; Maintainer: FSF ;; Created: 19-Apr-1993 ;; Keywords: maint mail tools ＠＠ -21,8 +22,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -62,15 +63,6 ＠＠ ;; ;; ... ;; 'mypkg-variable-last))) -;; Reporter Users -;; ============== -;; Packages that currently use reporter are: CC Mode, supercite, elp, -;; tcl, ediff, crypt++ (crypt), dired-x, rmailgen, mode-line, vm, -;; mh-e, edebug, archie, viper, w3-mode, framepop, hl319, hilit19, -;; pgp, eos, hm--html, efs, webster19. -;; -;; If you know of others, please email me! - ;;; Code: ＠＠ -272,7 +264,7 ＠＠ dumped." varlist) (lisp-indent-line) (insert ")\n")) - (insert-buffer elbuf)) + (insert-buffer-substring elbuf)) (error (insert "State could not be dumped due to the following error:\n\n" (format "%s" fault) ＠＠ -326,7 +318,7 ＠＠ This function prompts for a summary if ` is non-nil. This function does not send a message; it uses the given information -to initialize a a messagem, which the user can then edit and finally send +to initialize a message, which the user can then edit and finally send \(or decline to send). The variable `mail-user-agent' controls which mail-sending package is used for editing and sending the message." (let ((reporter-eval-buffer (current-buffer)) ＠＠ -416,4 +408,6 ＠＠ mail-sending package is used for editing (provide 'reporter) + +;;; arch-tag: 33612ff4-fbbc-4be2-b183-560ce9e0199b ;;; reporter.el ends here 1.3 +5 -4 XEmacs/packages/xemacs-packages/mail-lib/mailheader.el Index: mailheader.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/mailheader.el,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- mailheader.el 2000/12/31 00:02:38 1.2 +++ mailheader.el 2005/09/23 13:01:15 1.3 ＠＠ -1,6 +1,6 ＠＠ -;;; mailheader.el --- Mail header parsing, merging, formatting +;;; mailheader.el --- mail header parsing, merging, formatting -;; Copyright (C) 1996 by Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc. ;; Author: Erik Naggum <erik(a)naggum.no> ;; Keywords: tools, mail, news ＠＠ -19,8 +19,8 ＠＠ ;; 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. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -191,4 +191,5 ＠＠ A key of nil has as its value a list of (provide 'mailheader) +;;; arch-tag: 6e7aa221-80b5-4b3d-b46f-fd66ab567be0 ;;; mailheader.el ends here 1.160 +28 -0 XEmacs/packages/xemacs-packages/mail-lib/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/ChangeLog,v retrieving revision 1.159 retrieving revision 1.160 diff -u -p -r1.159 -r1.160 --- ChangeLog 2005/04/03 12:04:01 1.159 +++ ChangeLog 2005/09/23 13:01:15 1.160 ＠＠ -1,3 +1,31 ＠＠ +2005-09-23 Simon Josefsson <jas(a)extundo.com> + + * reporter.el: Change maintainer to FSF, since nobody from the + XEmacs camp has touched this file for ages and it has effectively + been maintained by the FSF for quite some time through syncing + anyway. + +2005-08-08 Richard M. Stallman <rms(a)gnu.org> + + * mail/reporter.el (reporter-dump-state): Use insert-buffer-substring. + +2005-06-02 Katsumi Yamaoka <yamaoka(a)jpl.org> + + * starttls.el (starttls-set-process-query-on-exit-flag): + Use eval-and-compile. + +2005-05-31 Katsumi Yamaoka <yamaoka(a)jpl.org> + + * starttls.el (starttls-set-process-query-on-exit-flag): Alias to + set-process-query-on-exit-flag or process-kill-without-query. + (starttls-open-stream-gnutls): Use it instead of + process-kill-without-query. + (starttls-open-stream): Ditto. + +2001-11-22 Colin Walters <walters(a)debian.org> + + * mail/reporter.el (reporter-submit-bug-report): Doc fixes. + 2005-04-03 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.73 released.

1 participants
0 comments

CVS update by simon packages/xemacs-packages/pgg, pgg-parse.el ... 18 years, 7 months

CVS Monitor

User: simon Date: 05/09/23 14:53:19 Modified: packages/xemacs-packages/pgg pgg.el pgg-pgp5.el pgg-pgp.el pgg-parse.el pgg-gpg.el pgg-def.el ChangeLog Log: 2005-08-15 Simon Josefsson <jas(a)extundo.com> * pgg.el (url-insert-file-contents): Don't autoload it, Emacs has it in url-handlers.el and XEmacs in url.el. Reported by Luca Capello and Romain Francoise. (pgg-fetch-key-function): Removed, not used? (pgg-insert-url-with-w3): Require url, to get url-insert-file-contents regardless of where it is defined. 2005-08-08 Simon Josefsson <jas(a)extundo.com> * pgg.el: Autoload url-insert-file-contents instead of loading w3/url. (pgg-insert-url-with-w3): Don't load url here. 2005-08-05 Daiki Ueno <ueno(a)unixuser.org> * pgg-parse.el (pgg-parse-hash-algorithm-alist): Add SHA-2. 2005-07-25 Simon Josefsson <jas(a)extundo.com> * pgg.el (pgg-insert-url-with-w3): Don't load w3, it is possible to have the url package without w3. Reported by Daiki Ueno <ueno(a)unixuser.org> and Luigi Panzeri <matley(a)muppetslab.org>. 2005-07-04 Juanma Barranquero <lekktu(a)gmail.com> * pgg-gpg.el (pgg-gpg): * pgg-parse.el (pgg-parse): * pgg-pgp.el (pgg-pgp): * pgg-pgp5.el (pgg-pgp5): Finish `defgroup' description with period. 2005-06-29 Katsumi Yamaoka <yamaoka(a)jpl.org> * pgg.el (pgg-verify): Return the verification result. 2005-05-30 Reiner Steib <Reiner.Steib(a)gmx.de> * pgg-gpg.el (pgg-gpg-snarf-keys-region): Replace `string-to-int' by `string-to-number'. * pgg-parse.el (pgg-read-body, pgg-read-bytes) (pgg-format-key-identifier): Ditto. 2005-05-09 Simon Josefsson <jas(a)extundo.com> * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching, tiny patch from "Georg C. F. Greve" <greve(a)gnu.org>. 2005-01-21 Derek Atkins <warlord(a)MIT.EDU> (tiny change) * pgg-pgp.el (pgg-pgp-decrypt-region): Use passphrase cache. Revision Changes Path 1.5 +6 -15 XEmacs/packages/xemacs-packages/pgg/pgg.el Index: pgg.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- pgg.el 2004/09/16 12:45:39 1.4 +++ pgg.el 2005/09/23 12:53:13 1.5 ＠＠ -1,6 +1,7 ＠＠ ;;; pgg.el --- glue for the various PGP implementations. -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/10/28 ＠＠ -20,8 +21,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -34,20 +35,10 ＠＠ ;; Don't merge these two `eval-when-compile's. (eval-when-compile (require 'cl)) -;; Fixme: This would be better done with an autoload for -;; `url-insert-file-contents', and the url stuff rationalized. -;; (`locate-library' can say whether the url code is available.) -(eval-when-compile - (ignore-errors - (require 'w3) - (require 'url))) ;;; ＠ utility functions ;;; -(defvar pgg-fetch-key-function (if (fboundp 'url-insert-file-contents) - (function pgg-fetch-key-with-w3))) - (defun pgg-invoke (func scheme &rest args) (progn (require (intern (format "pgg-%s" scheme))) ＠＠ -298,7 +289,8 ＠＠ within the region." (with-output-to-temp-buffer pgg-echo-buffer (set-buffer standard-output) (insert-buffer-substring (if status pgg-output-buffer - pgg-errors-buffer))))))) + pgg-errors-buffer))))) + status)) ;;;###autoload (defun pgg-insert-key () ＠＠ -327,7 +319,6 ＠＠ within the region." (defun pgg-insert-url-with-w3 (url) (ignore-errors - (require 'w3) (require 'url) (let (buffer-file-name) (url-insert-file-contents url)))) 1.5 +5 -4 XEmacs/packages/xemacs-packages/pgg/pgg-pgp5.el Index: pgg-pgp5.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-pgp5.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- pgg-pgp5.el 2004/09/16 12:41:11 1.4 +++ pgg-pgp5.el 2005/09/23 12:53:14 1.5 ＠＠ -1,6 +1,7 ＠＠ ;;; pgg-pgp5.el --- PGP 5.* support for PGG. -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/11/02 ＠＠ -20,8 +21,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: ＠＠ -30,7 +31,7 ＠＠ (require 'pgg)) (defgroup pgg-pgp5 () - "PGP 5.* interface" + "PGP 5.* interface." :group 'pgg) (defcustom pgg-pgp5-pgpe-program "pgpe" 1.6 +10 -7 XEmacs/packages/xemacs-packages/pgg/pgg-pgp.el Index: pgg-pgp.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-pgp.el,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- pgg-pgp.el 2004/09/16 12:41:11 1.5 +++ pgg-pgp.el 2005/09/23 12:53:14 1.6 ＠＠ -1,6 +1,7 ＠＠ ;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG. -;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/11/02 ＠＠ -20,8 +21,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: ＠＠ -30,7 +31,7 ＠＠ (require 'pgg)) (defgroup pgg-pgp () - "PGP 2.* and 6.* interface" + "PGP 2.* and 6.* interface." :group 'pgg) (defcustom pgg-pgp-program "pgp" ＠＠ -148,14 +149,16 ＠＠ Bourne shell or its equivalent \(not tcs (defun pgg-pgp-decrypt-region (start end) "Decrypt the current region between START and END." (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) + (key (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt)) (passphrase (pgg-read-passphrase - (format "PGP passphrase for %s: " pgg-pgp-user-id) - (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt))) + (format "PGP passphrase for %s: " pgg-pgp-user-id) key)) (args '("+verbose=1" "+batchmode" "+language=us" "-f"))) (pgg-pgp-process-region start end passphrase pgg-pgp-program args) - (pgg-process-when-success nil))) + (pgg-process-when-success + (if pgg-cache-passphrase + (pgg-add-passphrase-cache key passphrase))))) (defun pgg-pgp-sign-region (start end &optional clearsign) "Make detached signature from text between START and END." 1.5 +9 -8 XEmacs/packages/xemacs-packages/pgg/pgg-parse.el Index: pgg-parse.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-parse.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- pgg-parse.el 2004/09/16 12:37:05 1.4 +++ pgg-parse.el 2005/09/23 12:53:14 1.5 ＠＠ -1,6 +1,6 ＠＠ ;;; pgg-parse.el --- OpenPGP packet parsing -;; Copyright (C) 1999, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/10/28 ＠＠ -20,8 +20,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -38,7 +38,7 ＠＠ (eval-when-compile (require 'cl)) (defgroup pgg-parse () - "OpenPGP packet parsing" + "OpenPGP packet parsing." :group 'pgg) (defcustom pgg-parse-public-key-algorithm-alist ＠＠ -56,7 +56,8 ＠＠ (cons (sexp :tag "Number") (sexp :tag "Type")))) (defcustom pgg-parse-hash-algorithm-alist - '((1 . MD5) (2 . SHA1) (3 . RIPEMD160) (5 . MD2)) + '((1 . MD5) (2 . SHA1) (3 . RIPEMD160) (5 . MD2) (8 . SHA256) (9 . SHA384) + (10 . SHA512)) "Alist of the assigned number to the cryptographic hash algorithm." :group 'pgg-parse :type '(repeat ＠＠ -111,7 +112,7 ＠＠ `(mapconcat (lambda (c) (format "%02X" (pgg-char-int c))) ,string "") ;; `(upcase (apply #'format "%02x%02x%02x%02x%02x%02x%02x%02x" - ;; (string-to-int-list ,string))) + ;; (string-to-number-list ,string))) ) (defmacro pgg-parse-time-field (bytes) ＠＠ -134,7 +135,7 ＠＠ (defmacro pgg-read-bytes (nbytes) `(mapcar #'pgg-char-int (pgg-read-bytes-string ,nbytes)) - ;; `(string-to-int-list (pgg-read-bytes-string ,nbytes)) + ;; `(string-to-number-list (pgg-read-bytes-string ,nbytes)) ) (defmacro pgg-read-body-string (ptag) ＠＠ -144,7 +145,7 ＠＠ (defmacro pgg-read-body (ptag) `(mapcar #'pgg-char-int (pgg-read-body-string ,ptag)) - ;; `(string-to-int-list (pgg-read-body-string ,ptag)) + ;; `(string-to-number-list (pgg-read-body-string ,ptag)) ) (defalias 'pgg-skip-bytes 'forward-char) 1.7 +8 -7 XEmacs/packages/xemacs-packages/pgg/pgg-gpg.el Index: pgg-gpg.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-gpg.el,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- pgg-gpg.el 2004/09/16 12:34:06 1.6 +++ pgg-gpg.el 2005/09/23 12:53:14 1.7 ＠＠ -1,6 +1,7 ＠＠ ;;; pgg-gpg.el --- GnuPG support for PGG. -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/10/28 ＠＠ -20,8 +21,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: ＠＠ -30,7 +31,7 ＠＠ (require 'pgg)) (defgroup pgg-gpg () - "GnuPG interface" + "GnuPG interface." :group 'pgg) (defcustom pgg-gpg-program "gpg" ＠＠ -99,13 +100,13 ＠＠ (if (and pgg-cache-passphrase (progn (goto-char (point-min)) - (re-search-forward "^\\[GNUPG:] GOOD_PASSPHRASE\\>" nil t))) + (re-search-forward "^\\[GNUPG:] \$GOOD_PASSPHRASE\\>\$\\|\$SIG_CREATED\$" nil t))) (pgg-add-passphrase-cache (or key (progn (goto-char (point-min)) (if (re-search-forward - "^\\[GNUPG:] NEED_PASSPHRASE \\w+ ?\\w*" nil t) + "^\\[GNUPG:] NEED_PASSPHRASE\$_PIN\$? \\w+ ?\\w*" nil t) (substring (match-string 0) -8)))) passphrase))) ＠＠ -252,7 +253,7 ＠＠ If optional argument SIGN is non-nil, do (when (re-search-forward "^\\[GNUPG:] IMPORT_RES\\>" nil t) (setq status (buffer-substring (match-end 0) (progn (end-of-line)(point))) - status (vconcat (mapcar #'string-to-int (split-string status)))) + status (vconcat (mapcar #'string-to-number (split-string status)))) (erase-buffer) (insert (format "Imported %d key(s). \tArmor contains %d key(s) [%d bad, %d old].\n" 1.5 +3 -3 XEmacs/packages/xemacs-packages/pgg/pgg-def.el Index: pgg-def.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-def.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- pgg-def.el 2004/09/16 12:02:15 1.4 +++ pgg-def.el 2005/09/23 12:53:14 1.5 ＠＠ -1,6 +1,6 ＠＠ ;;; pgg-def.el --- functions/macros for defining PGG functions -;; Copyright (C) 1999, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/11/02 ＠＠ -20,8 +20,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: 1.25 +52 -0 XEmacs/packages/xemacs-packages/pgg/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/ChangeLog,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- ChangeLog 2004/09/16 13:57:38 1.24 +++ ChangeLog 2005/09/23 12:53:14 1.25 ＠＠ -1,3 +1,55 ＠＠ +2005-08-15 Simon Josefsson <jas(a)extundo.com> + + * pgg.el (url-insert-file-contents): Don't autoload it, Emacs has + it in url-handlers.el and XEmacs in url.el. Reported by Luca + Capello and Romain Francoise. + (pgg-fetch-key-function): Removed, not used? + (pgg-insert-url-with-w3): Require url, to get + url-insert-file-contents regardless of where it is defined. + +2005-08-08 Simon Josefsson <jas(a)extundo.com> + + * pgg.el: Autoload url-insert-file-contents instead of loading + w3/url. + (pgg-insert-url-with-w3): Don't load url here. + +2005-08-05 Daiki Ueno <ueno(a)unixuser.org> + + * pgg-parse.el (pgg-parse-hash-algorithm-alist): Add SHA-2. + +2005-07-25 Simon Josefsson <jas(a)extundo.com> + + * pgg.el (pgg-insert-url-with-w3): Don't load w3, it is possible + to have the url package without w3. Reported by Daiki Ueno + <ueno(a)unixuser.org> and Luigi Panzeri <matley(a)muppetslab.org>. + +2005-07-04 Juanma Barranquero <lekktu(a)gmail.com> + + * pgg-gpg.el (pgg-gpg): + * pgg-parse.el (pgg-parse): + * pgg-pgp.el (pgg-pgp): + * pgg-pgp5.el (pgg-pgp5): Finish `defgroup' description with period. + +2005-06-29 Katsumi Yamaoka <yamaoka(a)jpl.org> + + * pgg.el (pgg-verify): Return the verification result. + +2005-05-30 Reiner Steib <Reiner.Steib(a)gmx.de> + + * pgg-gpg.el (pgg-gpg-snarf-keys-region): Replace `string-to-int' + by `string-to-number'. + * pgg-parse.el (pgg-read-body, pgg-read-bytes) + (pgg-format-key-identifier): Ditto. + +2005-05-09 Simon Josefsson <jas(a)extundo.com> + + * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching, + tiny patch from "Georg C. F. Greve" <greve(a)gnu.org>. + +2005-01-21 Derek Atkins <warlord(a)MIT.EDU> (tiny change) + + * pgg-pgp.el (pgg-pgp-decrypt-region): Use passphrase cache. + 2004-09-16 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.05 released.

1 participants
0 comments

CVS update by simon packages/xemacs-packages/ecrypto, encrypt.el ... 18 years, 7 months

CVS Monitor

User: simon Date: 05/09/23 14:41:48 Modified: packages/xemacs-packages/ecrypto sha1.el md4.el hex-util.el encrypt.el ChangeLog Log: 2005-05-30 Reiner Steib <Reiner.Steib(a)gmx.de> * encrypt.el (encrypt-xor-process-buffer): Replace `string-to-int' by `string-to-number'. 2005-05-17 Katsumi Yamaoka <yamaoka(a)jpl.org> * encrypt.el (encrypt): Add :group. 2005-02-22 Simon Josefsson <jas(a)extundo.com> * encrypt.el (encrypt-password-cache-expiry): Remove (use `password-cache-expiry' instead). Reported by Arne JÃžrgensen <arne(a)arnested.dk>. (encrypt): Add password-cache and password-cache-expiry as group members. 2004-01-05 Simon Josefsson <jas(a)extundo.com> * md4.el (print-int32, print-string-hexa): Remove. Suggested by Jesper Harder <harder(a)myrealbox.com>. Revision Changes Path 1.4 +4 -3 XEmacs/packages/xemacs-packages/ecrypto/sha1.el Index: sha1.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecrypto/sha1.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sha1.el 2004/09/16 11:47:15 1.3 +++ sha1.el 2005/09/23 12:41:46 1.4 ＠＠ -1,6 +1,7 ＠＠ ;;; sha1.el --- SHA1 Secure Hash Algorithm in Emacs-Lisp -;; Copyright (C) 1999, 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI <shuhei(a)aqua.ocn.ne.jp> ;; Keywords: SHA1, FIPS 180-1 ＠＠ -19,8 +20,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: 1.2 +4 -12 XEmacs/packages/xemacs-packages/ecrypto/md4.el Index: md4.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecrypto/md4.el,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- md4.el 2002/08/02 20:15:37 1.1 +++ md4.el 2005/09/23 12:41:46 1.2 ＠＠ -1,5 +1,6 ＠＠ ;;; md4.el --- MD4 Message Digest Algorithm. +;; Copyright (C) 2004 Free Software Foundation, Inc. ;; Copyright (C) 2001 Taro Kawagishi ;; Author: Taro Kawagishi <tarok(a)transpulse.org> ;; Keywords: MD4 ＠＠ -20,24 +21,14 ＠＠ ;; ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: ;;; ;;; MD4 hash calculation -(defun print-int32 (int32) - "print 32 bits integer in 4 bytes string as little endian" - (let ((h (car int32)) (l (cdr int32))) - (list (logand l 255) (lsh l -8) (logand h 255) (lsh h -8)))) - -(defun print-string-hexa (str) - "print a string in hexadecimal" - (let (out) - (mapcar (function (lambda (x) (concat out (format "%x" x)))) str))) - (defvar md4-buffer (make-vector 4 '(0 . 0)) "work buffer of four 32-bit integers") ＠＠ -235,4 +226,5 ＠＠ integer is represented as a pair of two (provide 'md4) +;;; arch-tag: 99d706fe-089b-42ea-9507-67ae41091e6e ;;; md4.el ends here 1.4 +4 -3 XEmacs/packages/xemacs-packages/ecrypto/hex-util.el Index: hex-util.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecrypto/hex-util.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- hex-util.el 2004/09/16 11:49:04 1.3 +++ hex-util.el 2005/09/23 12:41:46 1.4 ＠＠ -1,6 +1,7 ＠＠ ;;; hex-util.el --- Functions to encode/decode hexadecimal string. -;; Copyright (C) 1999, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI <shuhei(a)aqua.ocn.ne.jp> ;; Keywords: data ＠＠ -19,8 +20,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: 1.2 +8 -15 XEmacs/packages/xemacs-packages/ecrypto/encrypt.el Index: encrypt.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecrypto/encrypt.el,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- encrypt.el 2004/11/29 22:04:40 1.1 +++ encrypt.el 2005/09/23 12:41:46 1.2 ＠＠ -1,5 +1,5 ＠＠ ;;; encrypt.el --- file encryption routines -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Teodor Zlatanov <tzz(a)lifelogs.com> ;; Created: 2003/01/24 ＠＠ -19,8 +19,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -34,18 +34,11 ＠＠ (eval-and-compile (autoload 'password-read "password")) -(defgroup encrypt nil - "File encryption configuration.") +(defgroup encrypt '((password-cache custom-variable) + (password-cache-expiry custom-variable)) + "File encryption configuration." + :group 'applications) -(defcustom encrypt-password-cache-expiry 200 - "Encryption password timeout. -When set, directly sets password-cache-expiry" - :type 'integer - :group 'encrypt - :set (lambda (symbol value) - (set symbol value) - (setq password-cache-expiry value))) - (defcustom encrypt-file-alist nil "List of file names or regexes matched with encryptions. Format example: ＠＠ -220,7 +213,7 ＠＠ Format example: (progn (setq new-list (reverse (split-string bs))) (dolist (x new-list) - (setq x (string-to-int x)) + (setq x (string-to-number x)) (insert (format "%c" (logxor x passphrase-sum)))))) (buffer-substring-no-properties (point-min) (point-max))))) 1.28 +22 -0 XEmacs/packages/xemacs-packages/ecrypto/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecrypto/ChangeLog,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- ChangeLog 2004/11/30 05:55:23 1.27 +++ ChangeLog 2005/09/23 12:41:46 1.28 ＠＠ -1,3 +1,25 ＠＠ +2005-05-30 Reiner Steib <Reiner.Steib(a)gmx.de> + + * encrypt.el (encrypt-xor-process-buffer): Replace `string-to-int' + by `string-to-number'. + +2005-05-17 Katsumi Yamaoka <yamaoka(a)jpl.org> + + * encrypt.el (encrypt): Add :group. + +2005-02-22 Simon Josefsson <jas(a)extundo.com> + + * encrypt.el (encrypt-password-cache-expiry): Remove (use + `password-cache-expiry' instead). Reported by Arne Jørgensen + <arne(a)arnested.dk>. + (encrypt): Add password-cache and password-cache-expiry as group + members. + +2004-01-05 Simon Josefsson <jas(a)extundo.com> + + * md4.el (print-int32, print-string-hexa): Remove. Suggested by + Jesper Harder <harder(a)myrealbox.com>. + 2004-11-30 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 0.19 released.

1 participants
0 comments

CVS update by simon packages/xemacs-packages/sieve, sieve-manage.el ... 18 years, 7 months

CVS Monitor

User: simon Date: 05/09/23 14:35:28 Modified: packages/xemacs-packages/sieve sieve.el sieve-mode.el sieve-manage.el ChangeLog Log: 2005-09-18 D Goel <deego(a)gnufans.org> * sieve.el (sieve-help): Fix `message' call: first arg should be a format spec. 2005-08-02 Katsumi Yamaoka <yamaoka(a)jpl.org> * sieve-manage.el (sieve-manage-interactive-login): Use make-local-variable rather than make-variable-buffer-local. (sieve-manage-open): Ditto. (sieve-manage-authenticate): Ditto. 2005-06-16 Miles Bader <miles(a)gnu.org> * sieve-mode.el (sieve-control-commands, sieve-action-commands) (sieve-test-commands, sieve-tagged-arguments): Remove "-face" suffix from face names. (sieve-control-commands-face, sieve-action-commands-face) (sieve-test-commands-face, sieve-tagged-arguments-face): New backward-compatibility aliases for renamed faces. (sieve-control-commands-face, sieve-action-commands-face) (sieve-test-commands-face, sieve-tagged-arguments-face): Use renamed sieve faces. 2005-05-17 Katsumi Yamaoka <yamaoka(a)jpl.org> * sieve-manage.el (sieve-manage-log): Add :group. (sieve-manage-default-user): Diito. (sieve-manage-server-eol, sieve-manage-client-eol): Ditto. (sieve-manage-streams, sieve-manage-stream-alist): Ditto. (sieve-manage-authenticators): Ditto. (sieve-manage-authenticator-alist): Ditto. (sieve-manage-default-port): Ditto. * sieve-mode.el (sieve-control-commands-face): Add :group. (sieve-action-commands-face): Ditto. (sieve-test-commands-face): Ditto. (sieve-tagged-arguments-face): Ditto. Revision Changes Path 1.6 +5 -4 XEmacs/packages/xemacs-packages/sieve/sieve.el Index: sieve.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/sieve/sieve.el,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sieve.el 2004/09/16 12:51:33 1.5 +++ sieve.el 2005/09/23 12:35:27 1.6 ＠＠ -1,6 +1,7 ＠＠ ;;; sieve.el --- Utilities to manage sieve scripts -;; Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + ;; Author: Simon Josefsson <simon(a)josefsson.org> ;; This file is part of GNU Emacs. ＠＠ -17,8 +18,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -243,7 +244,7 ＠＠ Used to bracket operations which move po (if (eq last-command 'sieve-help) ;; would need minor-mode for log-edit-mode (describe-function 'sieve-mode) - (message (substitute-command-keys + (message "%s" (substitute-command-keys "`\\[sieve-edit-script]':edit `\\[sieve-activate]':activate `\\[sieve-deactivate]':deactivate `\\[sieve-remove]':remove")))) (defun sieve-bury-buffer (buf &optional mainbuf) 1.8 +28 -15 XEmacs/packages/xemacs-packages/sieve/sieve-mode.el Index: sieve-mode.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/sieve/sieve-mode.el,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sieve-mode.el 2004/09/16 12:51:33 1.7 +++ sieve-mode.el 2005/09/23 12:35:27 1.8 ＠＠ -1,6 +1,7 ＠＠ ;;; sieve-mode.el --- Sieve code editing commands for Emacs -;; Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + ;; Author: Simon Josefsson <simon(a)josefsson.org> ;; This file is part of GNU Emacs. ＠＠ -17,8 +18,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -64,32 +65,38 ＠＠ ;; Font-lock -(defvar sieve-control-commands-face 'sieve-control-commands-face +(defvar sieve-control-commands-face 'sieve-control-commands "Face name used for Sieve Control Commands.") -(defface sieve-control-commands-face +(defface sieve-control-commands '((((type tty) (class color)) (:foreground "blue" :weight light)) (((class grayscale) (background light)) (:foreground "LightGray" :bold t)) (((class grayscale) (background dark)) (:foreground "DimGray" :bold t)) (((class color) (background light)) (:foreground "Orchid")) (((class color) (background dark)) (:foreground "LightSteelBlue")) (t (:bold t))) - "Face used for Sieve Control Commands.") + "Face used for Sieve Control Commands." + :group 'sieve) +;; backward-compatibility alias +(put 'sieve-control-commands-face 'face-alias 'sieve-control-commands) -(defvar sieve-action-commands-face 'sieve-action-commands-face +(defvar sieve-action-commands-face 'sieve-action-commands "Face name used for Sieve Action Commands.") -(defface sieve-action-commands-face +(defface sieve-action-commands '((((type tty) (class color)) (:foreground "blue" :weight bold)) (((class color) (background light)) (:foreground "Blue")) (((class color) (background dark)) (:foreground "LightSkyBlue")) (t (:inverse-video t :bold t))) - "Face used for Sieve Action Commands.") + "Face used for Sieve Action Commands." + :group 'sieve) +;; backward-compatibility alias +(put 'sieve-action-commands-face 'face-alias 'sieve-action-commands) -(defvar sieve-test-commands-face 'sieve-test-commands-face +(defvar sieve-test-commands-face 'sieve-test-commands "Face name used for Sieve Test Commands.") -(defface sieve-test-commands-face +(defface sieve-test-commands '((((type tty) (class color)) (:foreground "magenta")) (((class grayscale) (background light)) (:foreground "LightGray" :bold t :underline t)) ＠＠ -98,19 +105,25 ＠＠ (((class color) (background light)) (:foreground "CadetBlue")) (((class color) (background dark)) (:foreground "Aquamarine")) (t (:bold t :underline t))) - "Face used for Sieve Test Commands.") + "Face used for Sieve Test Commands." + :group 'sieve) +;; backward-compatibility alias +(put 'sieve-test-commands-face 'face-alias 'sieve-test-commands) -(defvar sieve-tagged-arguments-face 'sieve-tagged-arguments-face +(defvar sieve-tagged-arguments-face 'sieve-tagged-arguments "Face name used for Sieve Tagged Arguments.") -(defface sieve-tagged-arguments-face +(defface sieve-tagged-arguments '((((type tty) (class color)) (:foreground "cyan" :weight bold)) (((class grayscale) (background light)) (:foreground "LightGray" :bold t)) (((class grayscale) (background dark)) (:foreground "DimGray" :bold t)) (((class color) (background light)) (:foreground "Purple")) (((class color) (background dark)) (:foreground "Cyan")) (t (:bold t))) - "Face used for Sieve Tagged Arguments.") + "Face used for Sieve Tagged Arguments." + :group 'sieve) +;; backward-compatibility alias +(put 'sieve-tagged-arguments-face 'face-alias 'sieve-tagged-arguments) (defconst sieve-font-lock-keywords 1.8 +27 -17 XEmacs/packages/xemacs-packages/sieve/sieve-manage.el Index: sieve-manage.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/sieve/sieve-manage.el,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sieve-manage.el 2004/09/16 12:51:33 1.7 +++ sieve-manage.el 2005/09/23 12:35:27 1.8 ＠＠ -1,6 +1,7 ＠＠ ;;; sieve-manage.el --- Implementation of the managesive protocol in elisp -;; Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + ;; Author: Simon Josefsson <simon(a)josefsson.org> ;; This file is part of GNU Emacs. ＠＠ -17,8 +18,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -91,22 +92,27 ＠＠ (defcustom sieve-manage-log "*sieve-manage-log*" "Name of buffer for managesieve session trace." - :type 'string) + :type 'string + :group 'sieve-manage) (defcustom sieve-manage-default-user (user-login-name) "Default username to use." - :type 'string) + :type 'string + :group 'sieve-manage) (defcustom sieve-manage-server-eol "\r\n" "The EOL string sent from the server." - :type 'string) + :type 'string + :group 'sieve-manage) (defcustom sieve-manage-client-eol "\r\n" "The EOL string we send to the server." - :type 'string) + :type 'string + :group 'sieve-manage) (defcustom sieve-manage-streams '(network starttls shell) - "Priority of streams to consider when opening connection to server.") + "Priority of streams to consider when opening connection to server." + :group 'sieve-manage) (defcustom sieve-manage-stream-alist '((network sieve-manage-network-p sieve-manage-network-open) ＠＠ -118,7 +124,8 ＠＠ NAME names the stream, CHECK is a function returning non-nil if the server support the stream and OPEN is a function for opening the -stream.") +stream." + :group 'sieve-manage) (defcustom sieve-manage-authenticators '(digest-md5 cram-md5 ＠＠ -126,7 +133,8 ＠＠ stream.") ntlm plain login) - "Priority of authenticators to consider when authenticating to server.") + "Priority of authenticators to consider when authenticating to server." + :group 'sieve-manage) (defcustom sieve-manage-authenticator-alist '((cram-md5 sieve-manage-cram-md5-p sieve-manage-cram-md5-auth) ＠＠ -141,11 +149,13 ＠＠ stream.") NAME names the authenticator. CHECK is a function returning non-nil if the server support the authenticator and AUTHENTICATE is a function -for doing the actual authentication.") +for doing the actual authentication." + :group 'sieve-manage) (defcustom sieve-manage-default-port 2000 "Default port number for managesieve protocol." - :type 'integer) + :type 'integer + :group 'sieve-manage) ;; Internal variables: ＠＠ -189,8 +199,8 ＠＠ LOGINFUNC is passed a username and a pas it where sucessful authenticating itself to the server, nil otherwise. Returns t if login was successful, nil otherwise." (with-current-buffer buffer - (make-variable-buffer-local 'sieve-manage-username) - (make-variable-buffer-local 'sieve-manage-password) + (make-local-variable 'sieve-manage-username) + (make-local-variable 'sieve-manage-password) (let (user passwd ret reason passwd-key) (condition-case () (while (or (not user) (not passwd)) ＠＠ -433,7 +443,7 ＠＠ Optional variable BUFFER is buffer (buff to work in." (setq buffer (or buffer (format " *sieve* %s:%d" server (or port 2000)))) (with-current-buffer (get-buffer-create buffer) - (mapc 'make-variable-buffer-local sieve-manage-local-variables) + (mapc 'make-local-variable sieve-manage-local-variables) (sieve-manage-disable-multibyte) (buffer-disable-undo) (setq sieve-manage-server (or server sieve-manage-server)) ＠＠ -521,8 +531,8 ＠＠ password is remembered in the buffer." (with-current-buffer (or buffer (current-buffer)) (if (not (eq sieve-manage-state 'nonauth)) (eq sieve-manage-state 'auth) - (make-variable-buffer-local 'sieve-manage-username) - (make-variable-buffer-local 'sieve-manage-password) + (make-local-variable 'sieve-manage-username) + (make-local-variable 'sieve-manage-password) (if user (setq sieve-manage-username user)) (if passwd (setq sieve-manage-password passwd)) (if (funcall (nth 2 (assq sieve-manage-auth 1.33 +39 -0 XEmacs/packages/xemacs-packages/sieve/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/sieve/ChangeLog,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- ChangeLog 2004/09/16 13:58:12 1.32 +++ ChangeLog 2005/09/23 12:35:27 1.33 ＠＠ -1,3 +1,42 ＠＠ +2005-09-18 D Goel <deego(a)gnufans.org> + + * sieve.el (sieve-help): Fix `message' call: first arg should be a + format spec. + +2005-08-02 Katsumi Yamaoka <yamaoka(a)jpl.org> + + * sieve-manage.el (sieve-manage-interactive-login): Use + make-local-variable rather than make-variable-buffer-local. + (sieve-manage-open): Ditto. + (sieve-manage-authenticate): Ditto. + +2005-06-16 Miles Bader <miles(a)gnu.org> + + * sieve-mode.el (sieve-control-commands, sieve-action-commands) + (sieve-test-commands, sieve-tagged-arguments): + Remove "-face" suffix from face names. + (sieve-control-commands-face, sieve-action-commands-face) + (sieve-test-commands-face, sieve-tagged-arguments-face): + New backward-compatibility aliases for renamed faces. + (sieve-control-commands-face, sieve-action-commands-face) + (sieve-test-commands-face, sieve-tagged-arguments-face): + Use renamed sieve faces. + +2005-05-17 Katsumi Yamaoka <yamaoka(a)jpl.org> + + * sieve-manage.el (sieve-manage-log): Add :group. + (sieve-manage-default-user): Diito. + (sieve-manage-server-eol, sieve-manage-client-eol): Ditto. + (sieve-manage-streams, sieve-manage-stream-alist): Ditto. + (sieve-manage-authenticators): Ditto. + (sieve-manage-authenticator-alist): Ditto. + (sieve-manage-default-port): Ditto. + + * sieve-mode.el (sieve-control-commands-face): Add :group. + (sieve-action-commands-face): Ditto. + (sieve-test-commands-face): Ditto. + (sieve-tagged-arguments-face): Ditto. + 2004-09-16 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.17 released.

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

xemacs-cvs September 2005