diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2016-07-04 20:05:06 +0300 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2016-07-04 20:05:06 +0300 |
| commit | e3ae3c44882085bf52f6bb8b02e98eb7d0b1f81b (patch) | |
| tree | 46db3a2184d01c10f1d48984d813e847af353814 /src/xterm.h | |
| parent | f24fe30cb8118f8e15688eaf61a6fefde87f597e (diff) | |
| download | emacs-e3ae3c44882085bf52f6bb8b02e98eb7d0b1f81b.tar.gz | |
Cleanup XEditRes hack
* configure.ac [USE_X_TOOLKIT]: Define X_TOOLKIT_EDITRES if
_XEditResCheckMessages is declared in X11/Xmu/Editres.h and may be
linked with -lXmu. This should work with any non-ancient Xmu library.
* xfns.c (toplevel): Remove old cruft.
(x_window) [USE_X_TOOLKIT]: Use X_TOOLKIT_EDITRES.
* xterm.c (toplevel): Remove old cruft.
(handle_one_xevent): Use X_TOOLKIT_EDITRES.
* xterm.h (toplevel): Include X11/Xmu/Editres.h if X_TOOLKIT_EDITRES.
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xterm.h b/src/xterm.h index 8e1fc788bc1..675a48443dc 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -38,6 +38,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <X11/CoreP.h> /* foul, but we need this to use our own window inside a widget instead of one that Xt creates... */ +#ifdef X_TOOLKIT_EDITRES +#include <X11/Xmu/Editres.h> +#endif + typedef Widget xt_or_gtk_widget; #endif |