Mercurial > emacs
view src/s/bsdos2.h @ 47827:9d7b63dcf005
(smerge-ediff): Autoload.
(smerge-match-conflict): Don't assume as much about smerge-begin-re.
(smerge-resolve-function): New var.
(smerge-resolve): New command.
(smerge-basic-map): Bind it.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 10 Oct 2002 17:30:20 +0000 |
parents | 5c2e5ccd0acb |
children | 695cf19ef79e |
line wrap: on
line source
/* s/ file for BSDI BSD/OS 2.0 system. */ #include "bsd386.h" #define TEXT_START 0x1020 /* for QMAGIC */ #define START_FILES pre-crt0.o /usr/lib/crt0.o #define HAVE_TERMIOS #define NO_TERMIO #undef KERNEL_FILE #define KERNEL_FILE "/bsd"