From 20d1c5c566c1d49e9344ed77a280735325c95576 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 19 Dec 2005 04:28:01 +0000 Subject: [PATCH] (Fx_backspace_delete_keys_p): In case we cannot determine the answer, return `lambda', not nil. --- src/ChangeLog | 5 +++++ src/xfns.c | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 275477a765f..511f507242b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-12-18 Dan Nicolaescu + + * xfns.c (Fx_backspace_delete_keys_p): In case we cannot determine + the answer, return `lambda', not nil. + 2005-12-17 Eli Zaretskii * makefile.w32-in (bootstrap-temacs): Warn that parts of commands diff --git a/src/xfns.c b/src/xfns.c index ead4d76c710..52cb99d9ad3 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -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 */ } -- 2.39.2