diff options
author | obrien <obrien@FreeBSD.org> | 2000-06-10 21:38:51 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2000-06-10 21:38:51 +0000 |
commit | 456fe1401568b5738f6ca2cb196d655f4391dbd5 (patch) | |
tree | 3015e683849785eb046e13fc5bc6922275dc76d9 | |
parent | 6c455698d7ca8321efcf1ceeed114e215005b537 (diff) | |
parent | 5bc99b103657e5e060a1f6c3d4be5d12bbc83a57 (diff) | |
download | FreeBSD-src-456fe1401568b5738f6ca2cb196d655f4391dbd5.zip FreeBSD-src-456fe1401568b5738f6ca2cb196d655f4391dbd5.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r61519,
which included commits to RCS files with non-trunk default branches.
-rw-r--r-- | contrib/tcsh/ed.inputl.c | 10 | ||||
-rw-r--r-- | contrib/tcsh/ed.refresh.c | 16 |
2 files changed, 19 insertions, 7 deletions
diff --git a/contrib/tcsh/ed.inputl.c b/contrib/tcsh/ed.inputl.c index 2842d7d..ed58cd3 100644 --- a/contrib/tcsh/ed.inputl.c +++ b/contrib/tcsh/ed.inputl.c @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/ed.inputl.c,v 3.47 1999/04/20 07:48:39 christos Exp $ */ +/* $Header: /src/pub/tcsh/ed.inputl.c,v 3.48 2000/06/10 20:14:57 kim Exp $ */ /* * ed.inputl.c: Input line handling. */ @@ -36,7 +36,7 @@ */ #include "sh.h" -RCSID("$Id: ed.inputl.c,v 3.47 1999/04/20 07:48:39 christos Exp $") +RCSID("$Id: ed.inputl.c,v 3.48 2000/06/10 20:14:57 kim Exp $") #include "ed.h" #include "ed.defns.h" /* for the function names */ @@ -661,7 +661,11 @@ GetNextCommand(cmdnum, ch) return num; } #ifdef KANJI - if (!adrof(STRnokanji) && (*ch & META)) { + if ( +#ifdef DSPMBYTE + _enable_mbdisp && +#endif + !adrof(STRnokanji) && (*ch & META)) { MetaNext = 0; cmd = F_INSERT; break; diff --git a/contrib/tcsh/ed.refresh.c b/contrib/tcsh/ed.refresh.c index 46333c9..5a5a9cf 100644 --- a/contrib/tcsh/ed.refresh.c +++ b/contrib/tcsh/ed.refresh.c @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/ed.refresh.c,v 3.25 1998/11/24 18:17:22 christos Exp $ */ +/* $Header: /src/pub/tcsh/ed.refresh.c,v 3.26 2000/06/10 20:14:57 kim Exp $ */ /* * ed.refresh.c: Lower level screen refreshing functions */ @@ -36,7 +36,7 @@ */ #include "sh.h" -RCSID("$Id: ed.refresh.c,v 3.25 1998/11/24 18:17:22 christos Exp $") +RCSID("$Id: ed.refresh.c,v 3.26 2000/06/10 20:14:57 kim Exp $") #include "ed.h" /* #define DEBUG_UPDATE */ @@ -182,7 +182,11 @@ Draw(c) /* draw c, expand tabs, ctl chars */ } } #ifdef KANJI - else if (!adrof(STRnokanji)) { + else if ( +#ifdef DSPMBYTE + _enable_mbdisp && +#endif + !adrof(STRnokanji)) { Vdraw(c); return; } @@ -1264,7 +1268,11 @@ RefPlusOne() PutPlusOne(c); } #ifdef KANJI - else if (!adrof(STRnokanji)) { + else if ( +#ifdef DSPMBYTE + _enable_mbdisp && +#endif + !adrof(STRnokanji)) { PutPlusOne(c); } #endif |