JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge the import

Browse Source 
amd (automount dæmon) bites the dust
rewrite fake-NLS emulation, copyright to me
foobar! fnord!
This commit is contained in:
tg
2003-06-29 19:45:40 +00:00
parent 3373238ff4
commit 9a5869a50b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
edit.c
View File

@ -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 * Command line editing - common code
@ -630,6 +631,8 @@ struct path_order_info {
int path_order; int path_order;
}; };
static int path_order_cmp(const void *aa, const void *bb);
/* Compare routine used in x_command_glob() */ /* Compare routine used in x_command_glob() */
static int static int
path_order_cmp(aa, bb) path_order_cmp(aa, bb)

8
emacs.c
View File

@ -1,5 +1,5 @@
/* $MirBSD: emacs.c,v 1.2 2003/06/26 18:26:21 tg Exp $ */ /* $MirBSD: emacs.c,v 1.3 2003/06/29 19:45:40 tg Exp $ */
/* $OpenBSD: emacs.c,v 1.19 2003/04/16 23:11:52 tdeval Exp $ */ /* $OpenBSD: emacs.c,v 1.20 2003/06/26 00:09:45 deraadt Exp $ */
/* /*
* Emacs-like command line editing and history * Emacs-like command line editing and history
@ -438,6 +438,8 @@ x_ins_string(c)
return KSTD; return KSTD;
} }
static int x_do_ins(const char *cp, int len);
static int static int
x_do_ins(cp, len) x_do_ins(cp, len)
const char *cp; const char *cp;
@ -1533,6 +1535,8 @@ x_init_emacs()
Flag(FEMACSUSEMETA) = 1; Flag(FEMACSUSEMETA) = 1;
} }
static void bind_if_not_bound(int p, int k, int func);
static void static void
bind_if_not_bound(p, k, func) bind_if_not_bound(p, k, func)
int p, k; int p, k;