Commit afeee3e5 authored by Paul Eggert's avatar Paul Eggert
Browse files

* configure.ac (HAVE_XKBGETKEYBOARD): Remove; subsumed by HAVE_XKB.

All uses changed.
parent ab9a3f05
2013-03-27 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (HAVE_XKBGETKEYBOARD): Remove.
Subsumed by HAVE_XKB. All uses changed.
2013-03-27 Aidan Gauland <aidalgol@no8wireless.co.nz
* lisp/eshell/em-unix.el: Moved su and sudo to...
......
......@@ -377,7 +377,6 @@ HAVE_WS2TCPIP_H
HAVE_XAW3D
HAVE_XFT
HAVE_XIM
HAVE_XKBGETKEYBOARD
HAVE_XPM
HAVE_XRMSETDATABASE
HAVE_XSCREENNUMBEROFSCREEN
......
......@@ -1821,7 +1821,6 @@ if test "${HAVE_X11}" = "yes"; then
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
......
......@@ -5591,7 +5591,7 @@ nil, it defaults to the selected frame. */)
Keyboard
***********************************************************************/
#ifdef HAVE_XKBGETKEYBOARD
#ifdef HAVE_XKB
#include <X11/XKBlib.h>
#include <X11/keysym.h>
#endif
......@@ -5605,7 +5605,9 @@ usual X keysyms. Value is `lambda' if we cannot determine if both keys are
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 @@ present and mapped to the usual X keysyms. */)
}
unblock_input ();
return have_keys;
#else /* not HAVE_XKBGETKEYBOARD */
return Qlambda;
#endif /* not HAVE_XKBGETKEYBOARD */
#endif
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment