16,20c16
< * 3. All advertising materials mentioning features or use of this software
< * must display the following acknowledgement:
< * This product includes software developed by the University of
< * California, Berkeley and its contributors.
< * 4. Neither the name of the University nor the names of its contributors
---
> * 3. Neither the name of the University nor the names of its contributors
37,38c33,34
< * $NetBSD: chared.h,v 1.5 2000/09/04 22:06:29 lukem Exp $
< * $FreeBSD: head/lib/libedit/chared.h 108533 2003-01-01 18:49:04Z schweikh $
---
> * $NetBSD: chared.h,v 1.15 2005/08/01 23:00:15 christos Exp $
> * $FreeBSD: head/lib/libedit/chared.h 148834 2005-08-07 20:55:59Z stefanf $
68a65
> int offset;
70d66
< char *nline;
74c70
< * Undo information for both vi and emacs
---
> * Undo information for vi - no undo in emacs (yet)
77,81c73,75
< int action;
< size_t isize;
< size_t dsize;
< char *ptr;
< char *buf;
---
> int len; /* length of saved line */
> int cursor; /* position of saved cursor */
> char *buf; /* full saved text */
83a78,88
> /* redo for vi */
> typedef struct c_redo_t {
> char *buf; /* redo insert key sequence */
> char *pos;
> char *lim;
> el_action_t cmd; /* command to redo */
> char ch; /* char that invoked it */
> int count;
> int action; /* from cv_action() */
> } c_redo_t;
>
90d94
< char *ins;
108a113
> c_redo_t c_redo;
123c128
< #define CHANGE 0x04
---
> #define YANK 0x04
125,126c130,131
< #define CHAR_FWD 0
< #define CHAR_BACK 1
---
> #define CHAR_FWD (+1)
> #define CHAR_BACK (-1)
139a145
> protected int cv__isWord(int);
141c147
< protected char *cv__endword(char *, char *, int);
---
> protected char *cv__endword(char *, char *, int, int (*)(int));
143,144c149,150
< protected int c___isword(int);
< protected void cv_undo(EditLine *, int, size_t, char *);
---
> protected void cv_undo(EditLine *);
> protected void cv_yank(EditLine *, const char *, int);
146c152
< protected char *cv_prev_word(EditLine*, char *, char *, int, int (*)(int));
---
> protected char *cv_prev_word(char *, char *, int, int (*)(int));
150a157
> protected void c_delbefore1(EditLine *);
152c159,160
< protected int c_gets(EditLine *, char *);
---
> protected void c_delafter1(EditLine *);
> protected int c_gets(EditLine *, char *, const char *);
156c164
< protected void ch_reset(EditLine *);
---
> protected void ch_reset(EditLine *, int);