1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
|
diff -uNr hanemacs-19.34-old/Makefile.in Makefile.in
--- hanemacs-19.34-old/Makefile.in Tue Oct 29 13:19:31 1996
+++ Makefile.in Fri Mar 13 08:39:14 1998
@@ -184,7 +184,7 @@
# Subdirectories to make recursively. `lisp' is not included
# because the compiled lisp files are part of the distribution
# and you cannot remake them without installing Emacs first.
-SUBDIR = lib-src src
+SUBDIR = lib-src src man
# The makefiles of the directories in $SUBDIR.
SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
@@ -307,11 +307,11 @@
$(MAKE) install $(MFLAGS) prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir})
- ${INSTALL_PROGRAM} src/hanemacs ${bindir}/emacs-${version}
+ ${INSTALL_PROGRAM} src/hanemacs ${bindir}/hanemacs-${version}
### hanemacs ###
- -chmod 1755 ${bindir}/emacs-${version}
+ -chmod 1755 ${bindir}/hanemacs-${version}
rm -f ${bindir}/$(EMACS)
- -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
+ -ln ${bindir}/hanemacs-${version} ${bindir}/$(EMACS)
### Install the files that are machine-independent.
### Most of them come straight from the distribution;
@@ -369,14 +369,8 @@
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
then \
(cd ${infodir}; \
- if [ -f dir ]; then \
- if [ ! -f dir.old ]; then mv -f dir dir.old; \
- else mv -f dir dir.bak; fi; \
- fi; \
cd ${srcdir}/info ; \
- (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
- (cd $${thisdir}; chmod a+r ${infodir}/dir); \
- for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
+ for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip*; do \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
chmod a+r ${infodir}/$$f); \
@@ -421,15 +415,15 @@
* ) rm -rf $${dir} ;; \
esac ; \
case $${dir} in \
- ${datadir}/emacs/${version}/* ) \
- rm -rf ${datadir}/emacs/${version} \
+ ${datadir}/hanemacs/${version}/* ) \
+ rm -rf ${datadir}/hanemacs/${version} \
;; \
esac ; \
fi ; \
done
- (cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
+ (cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
(cd ${man1dir} && rm -f emacs.1 etags.1 ctags.1)
- (cd ${bindir} && rm -f emacs-${version} $(EMACS))
+ (cd ${bindir} && rm -f hanemacs-${version} $(EMACS))
FRC:
diff -uNr hanemacs-19.34-old/configure configure
--- hanemacs-19.34-old/configure Tue Oct 29 13:29:53 1996
+++ configure Fri Mar 13 08:25:33 1998
@@ -536,14 +536,14 @@
-lispdir='${datadir}/emacs/${version}/lisp'
-locallisppath='${datadir}/emacs/${version}/site-lisp:'\
-'${datadir}/emacs/site-lisp'
+lispdir='${datadir}/hanemacs/${version}/lisp'
+locallisppath='${datadir}/hanemacs/${version}/site-lisp:'\
+'${datadir}/hanemacs/site-lisp'
lisppath='${locallisppath}:${lispdir}'
-etcdir='${datadir}/emacs/${version}/etc'
-lockdir='${sharedstatedir}/emacs/lock'
-archlibdir='${libexecdir}/emacs/${version}/${configuration}'
-docdir='${datadir}/emacs/${version}/etc'
+etcdir='${datadir}/hanemacs/${version}/etc'
+lockdir='${sharedstatedir}/hanemacs/lock'
+archlibdir='${libexecdir}/hanemacs/${version}/${configuration}'
+docdir='${datadir}/hanemacs/${version}/etc'
# Check whether --with-gcc or --without-gcc was given.
if test "${with_gcc+set}" = set; then
diff -uNr hanemacs-19.34-old/src/Makefile.in src/Makefile.in
--- hanemacs-19.34-old/src/Makefile.in Tue Oct 29 15:29:07 1996
+++ src/Makefile.in Fri Mar 13 08:29:12 1998
@@ -1050,7 +1050,7 @@
rm -f ../etc/DOC
/*** hanemacs ***/
clean: mostlyclean
- rm -f emacs-* hanemacs
+ rm -f emacs-* hanemacs*
/**/# This is used in making a distribution.
/**/# Do not use it on development directories!
distclean: clean
@@ -1060,7 +1060,7 @@
@echo "it deletes files that may require special tools to rebuild."
rm -f TAGS
versionclean:
- -rm -f emacs emacs-* ../etc/DOC*
+ -rm -f emacs hanemacs* emacs-* ../etc/DOC*
extraclean: distclean
-rm -f *~ \#* m/?*~ s/?*~
diff -uNr hanemacs-19.34-old/src/emacs.c src/emacs.c
--- hanemacs-19.34-old/src/emacs.c Tue Oct 29 16:59:06 1996
+++ src/emacs.c Fri Mar 13 08:25:34 1998
@@ -44,6 +44,9 @@
#include "blockinput.h"
#include "syssignal.h"
#include "process.h"
+#include "hangul.h"
+
+int font_ks_mode;
#ifndef O_RDWR
#define O_RDWR 2
@@ -608,7 +611,7 @@
}
#if defined (hanemacs_self_display) && defined (HAVE_X_WINDOWS)
{
- extern int font_ks_mode;
+ font_ks_mode = 1;
if (argmatch (argv, argc, "-ks", "--ks", 3, NULL, &skip_args))
font_ks_mode = 0;
}
diff -uNr hanemacs-19.34-old/src/handisp.c src/handisp.c
--- hanemacs-19.34-old/src/handisp.c Tue Oct 29 15:39:28 1996
+++ src/handisp.c Fri Mar 13 08:25:34 1998
@@ -26,7 +26,6 @@
#include "hangul.h"
int han_johab_font;
-int font_ks_mode = 't';
int
check_hangul_font (font)
@@ -36,10 +35,14 @@
han_johab_font = 1;
else if (strstr (font, "JOHAB"))
han_johab_font = 1;
- else if (strstr (font, "ksc5601.1987"))
+ else if (strstr (font, "ksc5601.1987")){
han_johab_font = 0;
- else if (strstr (font, "KSC5601.1987"))
+ font_ks_mode = 0;
+ }
+ else if (strstr (font, "KSC5601.1987")){
han_johab_font = 0;
+ font_ks_mode = 0;
+ }
else
error ("Hangul Font is not defined.\n");
@@ -286,7 +289,7 @@
{
if (!han_johab_mode)
{
- if (font_ks_mode == 't')
+ if (font_ks_mode == 1)
strcpy ((char *) des, src);
else
{
@@ -305,7 +308,7 @@
{
n = convert_jstring_to_wstring (src, des, len);
- if (font_ks_mode != 't')
+ if (font_ks_mode != 1)
{
int i = n;
XChar2b *ptr = des;
diff -uNr hanemacs-19.34-old/src/hangul.h src/hangul.h
--- hanemacs-19.34-old/src/hangul.h Tue Oct 29 15:39:28 1996
+++ src/hangul.h Fri Mar 13 08:25:34 1998
@@ -62,3 +62,4 @@
extern int han_johab_mode; /* default KSC5601 */
extern int han_kbd_kind; /* default 2 bulsik */
extern int han_kbd_state; /* default English */
+extern int font_ks_mode; /* font type */
diff -uNr hanemacs-19.34-old/src/xfns.c src/xfns.c
--- hanemacs-19.34-old/src/xfns.c Tue Oct 29 18:24:10 1996
+++ src/xfns.c Fri Mar 13 08:25:35 1998
@@ -3245,14 +3245,9 @@
if (STRINGP (hfont))
hfont = x_new_font (f, XSTRING (hfont)->data);
if (!STRINGP (hfont))
- hfont = x_new_font (f, "-kaist-philgi-bold-r-normal--16-160-75-75-c-160-johabsh-1");
+ hfont = x_new_font (f, "-kaist-iyagi-bold-r-normal--16-160-75-75-c-160-johabsh-1");
if (!STRINGP (hfont))
- {
- extern int font_ks_mode;
- hfont = x_new_font (f, "-daewoo-mincho-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0");
- if (STRINGP (hfont))
- font_ks_mode = 0;
- }
+ hfont = x_new_font (f, "-daewoo-mincho-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0");
if (!STRINGP (hfont))
hfont = x_new_font (f, "-kaist-philgi-bold-r-normal--16-160-75-75-c-160-johabsh-1");
if (!STRINGP (hfont))
|
