diff options
| author | pfg <pfg@FreeBSD.org> | 2016-02-29 00:15:25 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2016-02-29 00:15:25 +0000 |
| commit | e28ddc5231156d3896be4960ce5ac4a6281bcb35 (patch) | |
| tree | f932c864ff0c2959f139d11ea54256fb3d3be7a3 /lib/libedit/chared.h | |
| parent | 33a884e8ff49457b9ec30565dbef2fbb9111afa9 (diff) | |
| download | FreeBSD-src-e28ddc5231156d3896be4960ce5ac4a6281bcb35.zip FreeBSD-src-e28ddc5231156d3896be4960ce5ac4a6281bcb35.tar.gz | |
MFV r296159
Sync our libedit with NetBSD's libedit 2016-02-27.
Obtained from: NetBSD
Diffstat (limited to 'lib/libedit/chared.h')
| -rw-r--r-- | lib/libedit/chared.h | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h index 909adac..458e671 100644 --- a/lib/libedit/chared.h +++ b/lib/libedit/chared.h @@ -1,4 +1,4 @@ -/* $NetBSD: chared.h,v 1.22 2014/06/18 18:12:28 christos Exp $ */ +/* $NetBSD: chared.h,v 1.27 2016/02/16 22:53:14 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -41,11 +41,6 @@ #ifndef _h_el_chared #define _h_el_chared -#include <ctype.h> -#include <string.h> - -#include "histedit.h" - #define EL_MAXMACRO 10 /* @@ -140,24 +135,18 @@ typedef struct el_chared_t { #define MODE_REPLACE 1 #define MODE_REPLACE_1 2 -#include "common.h" -#include "vi.h" -#include "emacs.h" -#include "search.h" -#include "fcns.h" - -protected int cv__isword(Int); -protected int cv__isWord(Int); +protected int cv__isword(wint_t); +protected int cv__isWord(wint_t); protected void cv_delfini(EditLine *); -protected Char *cv__endword(Char *, Char *, int, int (*)(Int)); -protected int ce__isword(Int); +protected Char *cv__endword(Char *, Char *, int, int (*)(wint_t)); +protected int ce__isword(wint_t); protected void cv_undo(EditLine *); protected void cv_yank(EditLine *, const Char *, int); -protected Char *cv_next_word(EditLine*, Char *, Char *, int, int (*)(Int)); -protected Char *cv_prev_word(Char *, Char *, int, int (*)(Int)); -protected Char *c__next_word(Char *, Char *, int, int (*)(Int)); -protected Char *c__prev_word(Char *, Char *, int, int (*)(Int)); +protected Char *cv_next_word(EditLine*, Char *, Char *, int, int (*)(wint_t)); +protected Char *cv_prev_word(Char *, Char *, int, int (*)(wint_t)); +protected Char *c__next_word(Char *, Char *, int, int (*)(wint_t)); +protected Char *c__prev_word(Char *, Char *, int, int (*)(wint_t)); protected void c_insert(EditLine *, int); protected void c_delbefore(EditLine *, int); protected void c_delbefore1(EditLine *); |
