This commit was generated by cvs2svn to compensate for changes in r61519,

which included commits to RCS files with non-trunk default branches.
This commit is contained in:
obrien 2000-06-10 21:38:51 +00:00
commit e5768ed854
2 changed files with 19 additions and 7 deletions

View File

@ -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;

View File

@ -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