procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Fx_backspace_delete_keys_p): In case we cannot determine

Browse source 
the answer, return `lambda', not nil.
This commit is contained in:
Dan Nicolaescu 2005-12-19 04:28:01 +00:00
parent 7436d3ff74
commit 20d1c5c566
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2005-12-18 Dan Nicolaescu <dann@ics.uci.edu>
* xfns.c (Fx_backspace_delete_keys_p): In case we cannot determine
the answer, return `lambda', not nil.
2005-12-17 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (bootstrap-temacs): Warn that parts of commands

9
src/xfns.c
View file

@ -5522,7 +5522,8 @@ DEFUN ("x-backspace-delete-keys-p", Fx_backspace_delete_keys_p,
doc: /* Check if both Backspace and Delete keys are on the keyboard of FRAME.
FRAME nil means use the selected frame.
Value is t if we know that both keys are present, and are mapped to the
usual X keysyms. */)
usual X keysyms. Value is `lambda' if we cannot determine if both keys are
present and mapped to the usual X keysyms. */)
(frame)
Lisp_Object frame;
{
@ -5541,7 +5542,7 @@ usual X keysyms. */)
if (!XkbLibraryVersion (&major, &minor))
{
UNBLOCK_INPUT;
return Qnil;
return Qlambda;
}
/* Check that the server supports XKB. */
@ -5550,7 +5551,7 @@ usual X keysyms. */)
if (!XkbQueryExtension (dpy, &op, &event, &error, &major, &minor))
{
UNBLOCK_INPUT;
return Qnil;
return Qlambda;
}
/* In this code we check that the keyboard has physical keys with names
@ -5605,7 +5606,7 @@ usual X keysyms. */)
UNBLOCK_INPUT;
return have_keys;
#else /* not HAVE_XKBGETKEYBOARD */
return Qnil;
return Qlambda;
#endif /* not HAVE_XKBGETKEYBOARD */
}