diff -c -r ../hanemacs-19.34-old/Makefile.in ./Makefile.in *** ../hanemacs-19.34-old/Makefile.in Tue Oct 29 22:19:31 1996 --- ./Makefile.in Tue Apr 1 21:55:05 1997 *************** *** 307,317 **** $(MAKE) install $(MFLAGS) prefix=${prefix} \ exec_prefix=${exec_prefix} bindir=${bindir} \ libexecdir=${libexecdir} archlibdir=${archlibdir}) ! ${INSTALL_PROGRAM} src/hanemacs ${bindir}/emacs-${version} ### hanemacs ### ! -chmod 1755 ${bindir}/emacs-${version} rm -f ${bindir}/$(EMACS) ! -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS) ### Install the files that are machine-independent. ### Most of them come straight from the distribution; --- 307,317 ---- $(MAKE) install $(MFLAGS) prefix=${prefix} \ exec_prefix=${exec_prefix} bindir=${bindir} \ libexecdir=${libexecdir} archlibdir=${archlibdir}) ! ${INSTALL_PROGRAM} src/hanemacs ${bindir}/hanemacs-${version} ### hanemacs ### ! -chmod 1755 ${bindir}/hanemacs-${version} rm -f ${bindir}/$(EMACS) ! -ln ${bindir}/hanemacs-${version} ${bindir}/$(EMACS) ### Install the files that are machine-independent. ### Most of them come straight from the distribution; *************** *** 421,435 **** * ) rm -rf $${dir} ;; \ esac ; \ case $${dir} in \ ! ${datadir}/emacs/${version}/* ) \ ! rm -rf ${datadir}/emacs/${version} \ ;; \ esac ; \ fi ; \ done (cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*) (cd ${man1dir} && rm -f emacs.1 etags.1 ctags.1) ! (cd ${bindir} && rm -f emacs-${version} $(EMACS)) FRC: --- 421,435 ---- * ) rm -rf $${dir} ;; \ esac ; \ case $${dir} in \ ! ${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 ${man1dir} && rm -f emacs.1 etags.1 ctags.1) ! (cd ${bindir} && rm -f hanemacs-${version} $(EMACS)) FRC: diff -c -r ../hanemacs-19.34-old/configure ./configure *** ../hanemacs-19.34-old/configure Tue Oct 29 22:29:53 1996 --- ./configure Tue Apr 1 20:14:32 1997 *************** *** 536,549 **** ! lispdir='${datadir}/emacs/${version}/lisp' ! locallisppath='${datadir}/emacs/${version}/site-lisp:'\ ! '${datadir}/emacs/site-lisp' lisppath='${locallisppath}:${lispdir}' ! etcdir='${datadir}/emacs/${version}/etc' ! lockdir='${sharedstatedir}/emacs/lock' ! archlibdir='${libexecdir}/emacs/${version}/${configuration}' ! docdir='${datadir}/emacs/${version}/etc' # Check whether --with-gcc or --without-gcc was given. if test "${with_gcc+set}" = set; then --- 536,549 ---- ! lispdir='${datadir}/hanemacs/${version}/lisp' ! locallisppath='${datadir}/hanemacs/${version}/site-lisp:'\ ! '${datadir}/hanemacs/site-lisp' lisppath='${locallisppath}:${lispdir}' ! 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 Only in ./src: 1 diff -c -r ../hanemacs-19.34-old/src/Makefile.in ./src/Makefile.in *** ../hanemacs-19.34-old/src/Makefile.in Wed Oct 30 00:29:07 1996 --- ./src/Makefile.in Tue Apr 1 20:19:14 1997 *************** *** 1050,1056 **** rm -f ../etc/DOC /*** hanemacs ***/ clean: mostlyclean ! rm -f emacs-* hanemacs /**/# This is used in making a distribution. /**/# Do not use it on development directories! distclean: clean --- 1050,1056 ---- rm -f ../etc/DOC /*** hanemacs ***/ clean: mostlyclean ! rm -f hanemacs* emacs-* /**/# This is used in making a distribution. /**/# Do not use it on development directories! distclean: clean *************** *** 1060,1066 **** @echo "it deletes files that may require special tools to rebuild." rm -f TAGS versionclean: ! -rm -f emacs emacs-* ../etc/DOC* extraclean: distclean -rm -f *~ \#* m/?*~ s/?*~ --- 1060,1066 ---- @echo "it deletes files that may require special tools to rebuild." rm -f TAGS versionclean: ! -rm -f hanemacs* emacs emacs-* ../etc/DOC* extraclean: distclean -rm -f *~ \#* m/?*~ s/?*~ diff -c -r ../hanemacs-19.34-old/src/emacs.c ./src/emacs.c *** ../hanemacs-19.34-old/src/emacs.c Wed Oct 30 01:59:06 1996 --- ./src/emacs.c Wed Apr 2 11:11:29 1997 *************** *** 44,49 **** --- 44,52 ---- #include "blockinput.h" #include "syssignal.h" #include "process.h" + #include "hangul.h" + + int font_ks_mode; #ifndef O_RDWR #define O_RDWR 2 *************** *** 608,614 **** } #if defined (hanemacs_self_display) && defined (HAVE_X_WINDOWS) { ! extern int font_ks_mode; if (argmatch (argv, argc, "-ks", "--ks", 3, NULL, &skip_args)) font_ks_mode = 0; } --- 611,617 ---- } #if defined (hanemacs_self_display) && defined (HAVE_X_WINDOWS) { ! font_ks_mode = 1; if (argmatch (argv, argc, "-ks", "--ks", 3, NULL, &skip_args)) font_ks_mode = 0; } diff -c -r ../hanemacs-19.34-old/src/handisp.c ./src/handisp.c *** ../hanemacs-19.34-old/src/handisp.c Wed Oct 30 00:39:28 1996 --- ./src/handisp.c Wed Apr 2 11:10:06 1997 *************** *** 26,32 **** #include "hangul.h" int han_johab_font; - int font_ks_mode = 't'; int check_hangul_font (font) --- 26,31 ---- *************** *** 36,45 **** han_johab_font = 1; else if (strstr (font, "JOHAB")) han_johab_font = 1; ! else if (strstr (font, "ksc5601.1987")) han_johab_font = 0; ! else if (strstr (font, "KSC5601.1987")) han_johab_font = 0; else error ("Hangul Font is not defined.\n"); --- 35,48 ---- han_johab_font = 1; else if (strstr (font, "JOHAB")) han_johab_font = 1; ! else if (strstr (font, "ksc5601.1987")){ han_johab_font = 0; ! 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,292 **** { if (!han_johab_mode) { ! if (font_ks_mode == 't') strcpy ((char *) des, src); else { --- 289,295 ---- { if (!han_johab_mode) { ! if (font_ks_mode == 1) strcpy ((char *) des, src); else { *************** *** 305,311 **** { n = convert_jstring_to_wstring (src, des, len); ! if (font_ks_mode != 't') { int i = n; XChar2b *ptr = des; --- 308,314 ---- { n = convert_jstring_to_wstring (src, des, len); ! if (font_ks_mode != 1) { int i = n; XChar2b *ptr = des; diff -c -r ../hanemacs-19.34-old/src/hangul.h ./src/hangul.h *** ../hanemacs-19.34-old/src/hangul.h Wed Oct 30 00:39:28 1996 --- ./src/hangul.h Wed Apr 2 11:10:14 1997 *************** *** 62,64 **** --- 62,65 ---- 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 -c -r ../hanemacs-19.34-old/src/xfns.c ./src/xfns.c *** ../hanemacs-19.34-old/src/xfns.c Wed Oct 30 03:24:10 1996 --- ./src/xfns.c Tue Apr 1 22:24:56 1997 *************** *** 3245,3258 **** 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"); 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; ! } if (!STRINGP (hfont)) hfont = x_new_font (f, "-kaist-philgi-bold-r-normal--16-160-75-75-c-160-johabsh-1"); if (!STRINGP (hfont)) --- 3245,3253 ---- if (STRINGP (hfont)) hfont = x_new_font (f, XSTRING (hfont)->data); if (!STRINGP (hfont)) ! hfont = x_new_font (f, "-kaist-iyagi-bold-r-normal--16-160-75-75-c-160-johabsh-1"); if (!STRINGP (hfont)) ! 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))