merge the import
amd (automount dæmon) bites the dust rewrite fake-NLS emulation, copyright to me foobar! fnord!
This commit is contained in:
parent
3373238ff4
commit
9a5869a50b
5
edit.c
5
edit.c
@ -1,4 +1,5 @@
|
||||
/* $OpenBSD: edit.c,v 1.16 2003/05/05 22:02:33 fgsch Exp $ */
|
||||
/* $MirBSD: edit.c,v 1.3 2003/06/29 19:45:40 tg Exp $ */
|
||||
/* $OpenBSD: edit.c,v 1.17 2003/06/26 00:09:45 deraadt Exp $ */
|
||||
|
||||
/*
|
||||
* Command line editing - common code
|
||||
@ -630,6 +631,8 @@ struct path_order_info {
|
||||
int path_order;
|
||||
};
|
||||
|
||||
static int path_order_cmp(const void *aa, const void *bb);
|
||||
|
||||
/* Compare routine used in x_command_glob() */
|
||||
static int
|
||||
path_order_cmp(aa, bb)
|
||||
|
8
emacs.c
8
emacs.c
@ -1,5 +1,5 @@
|
||||
/* $MirBSD: emacs.c,v 1.2 2003/06/26 18:26:21 tg Exp $ */
|
||||
/* $OpenBSD: emacs.c,v 1.19 2003/04/16 23:11:52 tdeval Exp $ */
|
||||
/* $MirBSD: emacs.c,v 1.3 2003/06/29 19:45:40 tg Exp $ */
|
||||
/* $OpenBSD: emacs.c,v 1.20 2003/06/26 00:09:45 deraadt Exp $ */
|
||||
|
||||
/*
|
||||
* Emacs-like command line editing and history
|
||||
@ -438,6 +438,8 @@ x_ins_string(c)
|
||||
return KSTD;
|
||||
}
|
||||
|
||||
static int x_do_ins(const char *cp, int len);
|
||||
|
||||
static int
|
||||
x_do_ins(cp, len)
|
||||
const char *cp;
|
||||
@ -1533,6 +1535,8 @@ x_init_emacs()
|
||||
Flag(FEMACSUSEMETA) = 1;
|
||||
}
|
||||
|
||||
static void bind_if_not_bound(int p, int k, int func);
|
||||
|
||||
static void
|
||||
bind_if_not_bound(p, k, func)
|
||||
int p, k;
|
||||
|
Loading…
x
Reference in New Issue
Block a user