Mercurial > hg > xemacs-beta
annotate lwlib/lwlib-colors.h @ 5751:2b8edd304c2b
Avoid throwing an error with misc-user events in isearch-pre-command-hook.
lisp/ChangeLog addition:
2013-08-05 Aidan Kehoe <kehoea@parhasard.net>
* isearch-mode.el (isearch-pre-command-hook):
If this function is called and (this-command-keys) contains
misc-user events, #'key-binding throws an error.
Eddie Corns and Alex Belits describe this happening in tracker
issue 336, and we can avoid this by catching the error and
handling the misc-user event in the same way that #'dispatch-event
does.
I haven't reproduced the actual error they describe, and welcome
testing to make sure it's gone.
Thank you Eddie, thank you Alex!
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 05 Aug 2013 13:34:27 +0100 |
| parents | 308d34e9f07d |
| children | cb65bfaf7110 |
| rev | line source |
|---|---|
| 3094 | 1 /* Color data structures for X and Xft. |
| 2 | |
| 3 Copyright (C) 2004 Free Software Foundation, Inc. | |
| 4 | |
| 5 Author: Stephen J. Turnbull <stephen@xemacs.org> | |
| 6 Created: 24 Jul 2004 by Stephen J. Turnbull | |
| 7 | |
| 8 This file is part of XEmacs. | |
| 9 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
10 XEmacs is free software: you can redistribute it and/or modify it |
| 3094 | 11 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
12 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
13 option) any later version. |
| 3094 | 14 |
| 15 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 18 for more details. | |
| 19 | |
| 20 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
21 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 3094 | 22 |
| 23 /* Synched up with: Not in GNU Emacs. */ | |
| 24 | |
| 25 #ifndef INCLUDED_lwlib_colors_h_ | |
| 26 #define INCLUDED_lwlib_colors_h_ | |
| 27 | |
| 28 #include <X11/Xlib.h> | |
| 29 | |
| 30 /* WIDGET is an Xt widget, VISUAL and DEPTH are return values */ | |
| 31 void visual_info_from_widget (Widget widget, Visual **visual, int *depth); | |
| 32 | |
| 33 /* basic version from xlwmenu.c */ | |
| 34 int FIXME_allocate_nearest_color (Display *display, Colormap screen_colormap, | |
| 35 XColor *color_def); | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4916
diff
changeset
|
36 /* haired-up version from ../src/fontcolor-x.c */ |
| 3094 | 37 int x_allocate_nearest_color (Display *display, Colormap screen_colormap, |
| 38 Visual *visual, XColor *color_def); | |
| 39 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3094
diff
changeset
|
40 #ifdef HAVE_XFT |
| 3094 | 41 #define _XFT_NO_COMPAT_ |
| 42 /* shut up GCC */ | |
| 43 #define face_index face_index_arg | |
| 44 #define glyph_index glyph_index_arg | |
| 45 #include <X11/Xft/Xft.h> | |
| 46 #undef glyph_index | |
| 47 #undef face_index | |
| 48 | |
| 49 #if XFT_MAJOR < 2 | |
| 50 #error Xft versions < 2 not supported | |
| 51 #endif | |
| 52 | |
| 53 XftColor xft_convert_color (Display *dpy, Colormap cmap, Visual *visual, | |
| 54 int c, int dim); | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3094
diff
changeset
|
55 #endif /* HAVE_XFT */ |
| 3094 | 56 |
| 57 #endif /* INCLUDED_lwlib_colors_h_ */ |