(Fx_backspace_delete_keys_p): In case we cannot determine

the answer, return `lambda', not nil.

diff --git a/src/ChangeLog b/src/ChangeLog
index 275477a765f52eb76cec4d3b96600887d96a05d8..511f507242ba3fc69d7d17b326ad3475d763e31e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/xfns.c b/src/xfns.c
index ead4d76c710921fc46e4a04e7ee355dac67fef05..52cb99d9ad36ef798400db90b83f7b7b271001c1 100644 (file)
--- 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 */
 }