Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 109649:1f8f03cfcd2b | 109793:b60dcdd855f0 |
|---|---|
| 31 #include <unistd.h> | 31 #include <unistd.h> |
| 32 #endif | 32 #endif |
| 33 | 33 |
| 34 #if HAVE_TERMIOS_H | 34 #if HAVE_TERMIOS_H |
| 35 #include <termios.h> /* For TIOCNOTTY. */ | 35 #include <termios.h> /* For TIOCNOTTY. */ |
| 36 #endif | |
| 37 #ifdef HAVE_SYS_IOCTL_H | |
| 38 #include <sys/ioctl.h> | |
| 36 #endif | 39 #endif |
| 37 | 40 |
| 38 #include <signal.h> | 41 #include <signal.h> |
| 39 #include <stdarg.h> | 42 #include <stdarg.h> |
| 40 #include <setjmp.h> | 43 #include <setjmp.h> |
| 1261 (Berkeley) termcap entries. They're listed in X keysym order; | 1264 (Berkeley) termcap entries. They're listed in X keysym order; |
| 1262 except we put the keypad keys first, so that if they clash with | 1265 except we put the keypad keys first, so that if they clash with |
| 1263 other keys (as on the IBM PC keyboard) they get overridden. | 1266 other keys (as on the IBM PC keyboard) they get overridden. |
| 1264 */ | 1267 */ |
| 1265 | 1268 |
| 1266 static struct fkey_table keys[] = | 1269 static const struct fkey_table keys[] = |
| 1267 { | 1270 { |
| 1268 {"kh", "home"}, /* termcap */ | 1271 {"kh", "home"}, /* termcap */ |
| 1269 {"kl", "left"}, /* termcap */ | 1272 {"kl", "left"}, /* termcap */ |
| 1270 {"ku", "up"}, /* termcap */ | 1273 {"ku", "up"}, /* termcap */ |
| 1271 {"kr", "right"}, /* termcap */ | 1274 {"kr", "right"}, /* termcap */ |
| 2901 } | 2904 } |
| 2902 | 2905 |
| 2903 /* Look for a `help-echo' property. */ | 2906 /* Look for a `help-echo' property. */ |
| 2904 { | 2907 { |
| 2905 Lisp_Object help; | 2908 Lisp_Object help; |
| 2906 extern Lisp_Object Qhelp_echo; | |
| 2907 | 2909 |
| 2908 /* Check overlays first. */ | 2910 /* Check overlays first. */ |
| 2909 help = Qnil; | 2911 help = Qnil; |
| 2910 for (i = noverlays - 1; i >= 0 && NILP (help); --i) | 2912 for (i = noverlays - 1; i >= 0 && NILP (help); --i) |
| 2911 { | 2913 { |
