From 9c94788788bf7901775cc83f7bd6e484438576f0 Mon Sep 17 00:00:00 2001 From: sumikawa Date: Thu, 1 May 2003 06:54:38 +0000 Subject: Fix breakage with wnn7. Submitted by: Masahiko KIMOTO --- japanese/emacs-emcws/Makefile | 1 + japanese/emacs-emcws/files/patch-src:wnnfns.c | 22 ++++++++++++++++++++++ japanese/emacs21-emcws/Makefile | 1 + japanese/emacs21-emcws/files/patch-src:wnnfns.c | 22 ++++++++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 japanese/emacs-emcws/files/patch-src:wnnfns.c create mode 100644 japanese/emacs21-emcws/files/patch-src:wnnfns.c (limited to 'japanese') diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index 3c18f96da50d..ef2e3fe5aebc 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -7,6 +7,7 @@ PORTNAME= emcws PORTVERSION= ${EMACS_VER} +PORTREVISION= 1 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs diff --git a/japanese/emacs-emcws/files/patch-src:wnnfns.c b/japanese/emacs-emcws/files/patch-src:wnnfns.c new file mode 100644 index 000000000000..988c9bcf9578 --- /dev/null +++ b/japanese/emacs-emcws/files/patch-src:wnnfns.c @@ -0,0 +1,22 @@ +--- src/wnnfns.c- Wed Apr 30 15:45:08 2003 ++++ src/wnnfns.c Wed Apr 30 15:45:20 2003 +@@ -1816,6 +1816,9 @@ + return Qt; + } + ++/* このtype castは非常に危険。jl.cが使っているのでマネしているだけ。 ++ 更に js_*()系を呼び出してる… */ ++#include "mt_jlib.h" /* for WNN_ENV_INT */ + DEFUN ("wnn-nihongo-kosei", Fwnn_nihongo_kosei, Swnn_nihongo_kosei, 1, 1, 0, + "For Wnn7.") + (mode) +@@ -1824,9 +1827,6 @@ + int snum; + if ((snum = check_wnn_server_type()) == -1) return Qnil; + if(!wnnfns_buf[snum]) return Qnil; +- /* このtype castは非常に危険。jl.cが使っているのでマネしているだけ。 +- 更に js_*()系を呼び出してる… */ +-#include "mt_jlib.h" /* for WNN_ENV_INT */ + if(js_set_henkan_hinsi_group( (WNN_ENV_INT*)wnnfns_buf[snum]->env, + HINSI_NO_GOYOU, + HINSI_NO_GOYOU_START, diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile index 3c18f96da50d..ef2e3fe5aebc 100644 --- a/japanese/emacs21-emcws/Makefile +++ b/japanese/emacs21-emcws/Makefile @@ -7,6 +7,7 @@ PORTNAME= emcws PORTVERSION= ${EMACS_VER} +PORTREVISION= 1 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs diff --git a/japanese/emacs21-emcws/files/patch-src:wnnfns.c b/japanese/emacs21-emcws/files/patch-src:wnnfns.c new file mode 100644 index 000000000000..988c9bcf9578 --- /dev/null +++ b/japanese/emacs21-emcws/files/patch-src:wnnfns.c @@ -0,0 +1,22 @@ +--- src/wnnfns.c- Wed Apr 30 15:45:08 2003 ++++ src/wnnfns.c Wed Apr 30 15:45:20 2003 +@@ -1816,6 +1816,9 @@ + return Qt; + } + ++/* このtype castは非常に危険。jl.cが使っているのでマネしているだけ。 ++ 更に js_*()系を呼び出してる… */ ++#include "mt_jlib.h" /* for WNN_ENV_INT */ + DEFUN ("wnn-nihongo-kosei", Fwnn_nihongo_kosei, Swnn_nihongo_kosei, 1, 1, 0, + "For Wnn7.") + (mode) +@@ -1824,9 +1827,6 @@ + int snum; + if ((snum = check_wnn_server_type()) == -1) return Qnil; + if(!wnnfns_buf[snum]) return Qnil; +- /* このtype castは非常に危険。jl.cが使っているのでマネしているだけ。 +- 更に js_*()系を呼び出してる… */ +-#include "mt_jlib.h" /* for WNN_ENV_INT */ + if(js_set_henkan_hinsi_group( (WNN_ENV_INT*)wnnfns_buf[snum]->env, + HINSI_NO_GOYOU, + HINSI_NO_GOYOU_START, -- cgit