comparison src/keymap.c @ 4355:a2af1ff1761f

Provide a DEFAULT argument in #'intern-soft. 2007-12-24 Aidan Kehoe <kehoea@parhasard.net> * symbols.c (Fintern_soft): Provide a new optional third argument, DEFAULT, for those who want to check if "nil" is a symbol or not. (More realistically, general code that may get handed "nil" should probably use this argument.) * keymap.c (define_key_check_and_coerce_keysym): Call Fintern_soft with its new argument. * lisp.h: Update the declaration of Fintern_soft.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 24 Dec 2007 14:00:14 +0100
parents a75979634ce3
children 2fd201d73a92
comparison
equal deleted inserted replaced
4353:4143b78d0df0 4355:a2af1ff1761f
1386 { 1386 {
1387 /* Likewise, the obsolete keysym binding of kp_.* should not lose. */ 1387 /* Likewise, the obsolete keysym binding of kp_.* should not lose. */
1388 DECLARE_EISTRING (temp); 1388 DECLARE_EISTRING (temp);
1389 eicpy_raw (temp, name, qxestrlen (name)); 1389 eicpy_raw (temp, name, qxestrlen (name));
1390 eisetch_char (temp, 2, '-'); 1390 eisetch_char (temp, 2, '-');
1391 *keysym = Fintern_soft (eimake_string (temp), Qnil); 1391 *keysym = Fintern_soft (eimake_string (temp), Qnil, Qnil);
1392 } 1392 }
1393 else if (EQ (*keysym, QLFD)) 1393 else if (EQ (*keysym, QLFD))
1394 *keysym = QKlinefeed; 1394 *keysym = QKlinefeed;
1395 else if (EQ (*keysym, QTAB)) 1395 else if (EQ (*keysym, QTAB))
1396 *keysym = QKtab; 1396 *keysym = QKtab;