summaryrefslogtreecommitdiff
path: root/cmd-line-utils/libedit/chared.h
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-02-10 16:26:18 +0200
committerGeorgi Kodinov <joro@sun.com>2009-02-10 16:26:18 +0200
commit29f898bb64349f46bde6c61badaf47bccd1183c1 (patch)
treef9108e587b2ac0b9dfd93033e9da1dabda493155 /cmd-line-utils/libedit/chared.h
parent46f91045f8e87434f84b2b268f29f54adcb344eb (diff)
parentfab053ccf84ccb537999615da8f962d03ef5da76 (diff)
downloadmariadb-git-29f898bb64349f46bde6c61badaf47bccd1183c1.tar.gz
merged 5.0-bugteam -> 5.1-bugteam
Diffstat (limited to 'cmd-line-utils/libedit/chared.h')
-rw-r--r--cmd-line-utils/libedit/chared.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd-line-utils/libedit/chared.h b/cmd-line-utils/libedit/chared.h
index 2dd0a5795c7..fa8f5a58d83 100644
--- a/cmd-line-utils/libedit/chared.h
+++ b/cmd-line-utils/libedit/chared.h
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.h,v 1.14 2004/08/13 12:10:39 mycroft Exp $ */
+/* $NetBSD: chared.h,v 1.17 2006/03/06 21:11:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -48,7 +48,7 @@
#define EL_MAXMACRO 10
/*
- * This is a issue of basic "vi" look-and-feel. Defining VI_MOVE works
+ * This is an issue of basic "vi" look-and-feel. Defining VI_MOVE works
* like real vi: i.e. the transition from command<->insert modes moves
* the cursor.
*
@@ -116,11 +116,10 @@ typedef struct el_chared_t {
} el_chared_t;
-#define STReof "^D\b\b"
#define STRQQ "\"\""
#define isglob(a) (strchr("*[]?", (a)) != NULL)
-#define isword(a) (isprint(a))
+#define isword(a) (el_isprint(a))
#define NOP 0x00
#define DELETE 0x01
@@ -161,7 +160,7 @@ protected int c_gets(EditLine *, char *, const char *);
protected int c_hpos(EditLine *);
protected int ch_init(EditLine *);
-protected void ch_reset(EditLine *);
+protected void ch_reset(EditLine *, int);
protected int ch_enlargebufs(EditLine *, size_t);
protected void ch_end(EditLine *);