Merge OpenBSD-current

2003-09-25 20:59:37 +00:00
parent 631b74793f
commit 434b10fb3c
4 changed files with 24 additions and 23 deletions
--- a/emacs.c
+++ b/emacs.c
@ -1,5 +1,5 @@
-/*	$MirBSD: emacs.c,v 1.5 2003/08/31 20:54:03 tg Exp $	*/
-/*	$OpenBSD: emacs.c,v 1.26 2003/08/27 14:56:11 fgsch Exp $	*/
+/*	$MirBSD: emacs.c,v 1.6 2003/09/25 20:59:35 tg Exp $	*/
+/*	$OpenBSD: emacs.c,v 1.27 2003/09/01 15:47:40 naddy Exp $	*/

 /*
 *  Emacs-like command line editing and history