diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-03-26 22:13:31 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-03-26 22:13:31 -0700 |
| commit | afeee3e5783916f2860d1ab30b17d89b11abccb7 (patch) | |
| tree | c399a756b0d8edfebe4493f2bedcc4adea59df85 | |
| parent | ab9a3f05c8621bbd6b05c8e4c02192c852ea03bf (diff) | |
| download | emacs-afeee3e5783916f2860d1ab30b17d89b11abccb7.tar.gz | |
* configure.ac (HAVE_XKBGETKEYBOARD): Remove; subsumed by HAVE_XKB.
All uses changed.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | admin/CPP-DEFINES | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/xfns.c | 10 |
4 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 500c85d2350..d245f6e2f9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +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... diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index c11c3c3b489..a89d1764f7b 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -377,7 +377,6 @@ HAVE_WS2TCPIP_H HAVE_XAW3D HAVE_XFT HAVE_XIM -HAVE_XKBGETKEYBOARD HAVE_XPM HAVE_XRMSETDATABASE HAVE_XSCREENNUMBEROFSCREEN diff --git a/configure.ac b/configure.ac index 1c5c1725dab..0cff34b8a16 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/xfns.c b/src/xfns.c index a6a179be97d..e24d3981a09 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -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 } |