comparison src/term.c @ 109531:1b2674e70efe

Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Sun, 25 Jul 2010 10:16:08 +0000
parents 68ca98ae70fb
children 4325622babca
comparison
equal deleted inserted replaced
109530:4714f535e450 109531:1b2674e70efe
181 181
182 /* Provided for lisp packages. */ 182 /* Provided for lisp packages. */
183 183
184 static int system_uses_terminfo; 184 static int system_uses_terminfo;
185 185
186 char *tparam (); 186 char *tparam (char *, char *, int, int, ...);
187 187
188 extern char *tgetstr (char *, char **); 188 extern char *tgetstr (char *, char **);
189 189
190 190
191 #ifdef HAVE_GPM 191 #ifdef HAVE_GPM
1361 {"%g", "S-redo"}, /*shifted redo key*/ 1361 {"%g", "S-redo"}, /*shifted redo key*/
1362 {"%i", "S-right"}, /*shifted right-arrow key*/ 1362 {"%i", "S-right"}, /*shifted right-arrow key*/
1363 {"!3", "S-undo"} /*shifted undo key*/ 1363 {"!3", "S-undo"} /*shifted undo key*/
1364 }; 1364 };
1365 1365
1366 #ifndef DOS_NT
1366 static char **term_get_fkeys_address; 1367 static char **term_get_fkeys_address;
1367 static KBOARD *term_get_fkeys_kboard; 1368 static KBOARD *term_get_fkeys_kboard;
1368 static Lisp_Object term_get_fkeys_1 (void); 1369 static Lisp_Object term_get_fkeys_1 (void);
1369 1370
1370 /* Find the escape codes sent by the function keys for Vinput_decode_map. 1371 /* Find the escape codes sent by the function keys for Vinput_decode_map.
1498 #undef CONDITIONAL_REASSIGN 1499 #undef CONDITIONAL_REASSIGN
1499 } 1500 }
1500 1501
1501 return Qnil; 1502 return Qnil;
1502 } 1503 }
1504 #endif /* not DOS_NT */
1503 1505
1504 1506
1505 /*********************************************************************** 1507 /***********************************************************************
1506 Character Display Information 1508 Character Display Information
1507 ***********************************************************************/ 1509 ***********************************************************************/