[Emacs-diffs] /srv/bzr/emacs/trunk r112150: * configure.ac (HAVE_XKBGETKEYBOARD): Remove; subsumed by HAVE_XKB.

[Paul Eggert]

------------------------------------------------------------
revno: 112150
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-26 22:13:31 -0700
message:
  * configure.ac (HAVE_XKBGETKEYBOARD): Remove; subsumed by HAVE_XKB.
  
  All uses changed.
modified:
  ChangeLog
  admin/CPP-DEFINES
  configure.ac
  src/xfns.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-03-26 22:08:58 +0000
+++ b/ChangeLog 2013-03-27 05:13:31 +0000
@@ -1,3 +1,8 @@
+2013-03-27  Paul Eggert  <address@hidden>
+
+       * configure.ac (HAVE_XKBGETKEYBOARD): Remove.
+       Subsumed by HAVE_XKB.  All uses changed.
+
 2013-03-27  Aidan Gauland  <address@hidden
 
        * lisp/eshell/em-unix.el: Moved su and sudo to...

=== modified file 'admin/CPP-DEFINES'
--- a/admin/CPP-DEFINES 2013-03-13 18:42:22 +0000
+++ b/admin/CPP-DEFINES 2013-03-27 05:13:31 +0000
@@ -377,7 +377,6 @@
 HAVE_XAW3D
 HAVE_XFT
 HAVE_XIM
-HAVE_XKBGETKEYBOARD
 HAVE_XPM
 HAVE_XRMSETDATABASE
 HAVE_XSCREENNUMBEROFSCREEN

=== modified file 'configure.ac'
--- a/configure.ac      2013-03-25 17:58:35 +0000
+++ b/configure.ac      2013-03-27 05:13:31 +0000
@@ -1821,7 +1821,6 @@
        emacs_xkb=yes, emacs_xkb=no)
   AC_MSG_RESULT($emacs_xkb)
   if test $emacs_xkb = yes; then
-    AC_DEFINE(HAVE_XKBGETKEYBOARD, 1, [Define to 1 if you have the 
XkbGetKeyboard function.])
     AC_DEFINE(HAVE_XKB, 1, [Define to 1 if you have the Xkb extension.])
   fi
 

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2013-03-24 12:59:45 +0000
+++ b/src/xfns.c        2013-03-27 05:13:31 +0000
@@ -5591,7 +5591,7 @@
                               Keyboard
  ***********************************************************************/
 
-#ifdef HAVE_XKBGETKEYBOARD
+#ifdef HAVE_XKB
 #include <X11/XKBlib.h>
 #include <X11/keysym.h>
 #endif
@@ -5605,7 +5605,9 @@
 present and mapped to the usual X keysyms.  */)
   (Lisp_Object frame)
 {
-#ifdef HAVE_XKBGETKEYBOARD
+#ifndef HAVE_XKB
+  return Qlambda;
+#else
   XkbDescPtr kb;
   struct frame *f = check_x_frame (frame);
   Display *dpy = FRAME_X_DISPLAY (f);
@@ -5683,9 +5685,7 @@
     }
   unblock_input ();
   return have_keys;
-#else /* not HAVE_XKBGETKEYBOARD */
-  return Qlambda;
-#endif /* not HAVE_XKBGETKEYBOARD */
+#endif
 }