Mercurial > emacs
changeset 67654:f6416d33b0a2
(Fx_backspace_delete_keys_p): In case we cannot determine
the answer, return `lambda', not nil.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 19 Dec 2005 04:28:01 +0000 |
| parents | 26386850b9ca |
| children | 6cba278fc764 |
| files | src/ChangeLog src/xfns.c |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Dec 19 03:00:43 2005 +0000 +++ b/src/ChangeLog Mon Dec 19 04:28:01 2005 +0000 @@ -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
--- a/src/xfns.c Mon Dec 19 03:00:43 2005 +0000 +++ b/src/xfns.c Mon Dec 19 04:28:01 2005 +0000 @@ -5522,7 +5522,8 @@ 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 @@ if (!XkbLibraryVersion (&major, &minor)) { UNBLOCK_INPUT; - return Qnil; + return Qlambda; } /* Check that the server supports XKB. */ @@ -5550,7 +5551,7 @@ 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 @@ UNBLOCK_INPUT; return have_keys; #else /* not HAVE_XKBGETKEYBOARD */ - return Qnil; + return Qlambda; #endif /* not HAVE_XKBGETKEYBOARD */ }