aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2000-06-10 21:38:51 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2000-06-10 21:38:51 +0000
commit00c801ed48901e591e2d1268bee7656fb6d17def (patch)
tree68a5de6e1dcbc9a9b1946ae678f34e01e8426eb9
parentdc86a98eaf074b650f336bc9a70bf03b1dce2eb7 (diff)
downloadsrc-00c801ed48901e591e2d1268bee7656fb6d17def.tar.gz
src-00c801ed48901e591e2d1268bee7656fb6d17def.zip
Offical fixes to the history and I18N bugs ache found.
Notes
Notes: svn path=/vendor/tcsh/dist/; revision=61519
-rw-r--r--contrib/tcsh/ed.inputl.c10
-rw-r--r--contrib/tcsh/ed.refresh.c16
2 files changed, 19 insertions, 7 deletions
diff --git a/contrib/tcsh/ed.inputl.c b/contrib/tcsh/ed.inputl.c
index 2842d7db78ea..ed58cd39aac5 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 46333c996a1c..5a5a9cfaa483 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