Mercurial > emacs
diff src/term.c @ 109793:b60dcdd855f0
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 08 Aug 2010 22:52:25 +0000 |
| parents | b6bdd59e60ff |
| children | 64732fa6188a |
line wrap: on
line diff
--- a/src/term.c Fri Aug 06 03:43:29 2010 +0000 +++ b/src/term.c Sun Aug 08 22:52:25 2010 +0000 @@ -34,6 +34,9 @@ #if HAVE_TERMIOS_H #include <termios.h> /* For TIOCNOTTY. */ #endif +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif #include <signal.h> #include <stdarg.h> @@ -1263,7 +1266,7 @@ other keys (as on the IBM PC keyboard) they get overridden. */ -static struct fkey_table keys[] = +static const struct fkey_table keys[] = { {"kh", "home"}, /* termcap */ {"kl", "left"}, /* termcap */ @@ -2903,7 +2906,6 @@ /* Look for a `help-echo' property. */ { Lisp_Object help; - extern Lisp_Object Qhelp_echo; /* Check overlays first. */ help = Qnil;