masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
All uses changed.
This commit is contained in:
Paul Eggert 2013-03-26 22:13:31 -07:00
parent ab9a3f05c8
commit afeee3e578
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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 2013-03-27 Aidan Gauland <aidalgol@no8wireless.co.nz
* lisp/eshell/em-unix.el: Moved su and sudo to... * lisp/eshell/em-unix.el: Moved su and sudo to...

1
admin/CPP-DEFINES
View file

@ -377,7 +377,6 @@ HAVE_WS2TCPIP_H
HAVE_XAW3D HAVE_XAW3D
HAVE_XFT HAVE_XFT
HAVE_XIM HAVE_XIM
HAVE_XKBGETKEYBOARD
HAVE_XPM HAVE_XPM
HAVE_XRMSETDATABASE HAVE_XRMSETDATABASE
HAVE_XSCREENNUMBEROFSCREEN HAVE_XSCREENNUMBEROFSCREEN

1
configure.ac
View file

@ -1821,7 +1821,6 @@ if test "${HAVE_X11}" = "yes"; then
emacs_xkb=yes, emacs_xkb=no) emacs_xkb=yes, emacs_xkb=no)
AC_MSG_RESULT($emacs_xkb) AC_MSG_RESULT($emacs_xkb)
if test $emacs_xkb = yes; then 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.]) AC_DEFINE(HAVE_XKB, 1, [Define to 1 if you have the Xkb extension.])
fi fi

10
src/xfns.c
View file

@ -5591,7 +5591,7 @@ nil, it defaults to the selected frame. */)
Keyboard Keyboard
***********************************************************************/ ***********************************************************************/
#ifdef HAVE_XKBGETKEYBOARD #ifdef HAVE_XKB
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#endif #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. */) present and mapped to the usual X keysyms. */)
(Lisp_Object frame) (Lisp_Object frame)
{ {
#ifdef HAVE_XKBGETKEYBOARD #ifndef HAVE_XKB
return Qlambda;
#else
XkbDescPtr kb; XkbDescPtr kb;
struct frame *f = check_x_frame (frame); struct frame *f = check_x_frame (frame);
Display *dpy = FRAME_X_DISPLAY (f); Display *dpy = FRAME_X_DISPLAY (f);
@ -5683,9 +5685,7 @@ present and mapped to the usual X keysyms. */)
} }
unblock_input (); unblock_input ();
return have_keys; return have_keys;
#else /* not HAVE_XKBGETKEYBOARD */ #endif
return Qlambda;
#endif /* not HAVE_XKBGETKEYBOARD */
} }