diff options
| author | Eli Zaretskii | 2018-10-13 19:47:01 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2018-10-13 19:47:01 +0300 |
| commit | e724a8f6694280fcb4753a87011abf9dc1c2771e (patch) | |
| tree | 47df91d0df519cb269db620c0863e4215dac7dc8 /src | |
| parent | 8fc892df37700d899d2851ef4918c56c5201ea19 (diff) | |
| download | emacs-e724a8f6694280fcb4753a87011abf9dc1c2771e.tar.gz emacs-e724a8f6694280fcb4753a87011abf9dc1c2771e.zip | |
Fix redisplay of glyphless characters
* src/conf_post.h (bool_bf): Use 'unsigned int' in the MinGW
builds. Suggested by Tom Tromey <tom@tromey.com>. (Bug#33017)
* src/dispnew.c (scrolling_window): Update commentary
regarding xwidget builds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf_post.h | 8 | ||||
| -rw-r--r-- | src/dispnew.c | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/conf_post.h b/src/conf_post.h index 69f686d72df..a09e529fc90 100644 --- a/src/conf_post.h +++ b/src/conf_post.h | |||
| @@ -48,9 +48,11 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||
| 50 | /* The type of bool bitfields. Needed to compile Objective-C with | 50 | /* The type of bool bitfields. Needed to compile Objective-C with |
| 51 | standard GCC. It was also needed to port to pre-C99 compilers, | 51 | standard GCC, and to make sure adjacent bool_bf fields are packed |
| 52 | although we don't care about that any more. */ | 52 | into the same 1-, 2-, or 4-byte allocation unit in the MinGW |
| 53 | #if NS_IMPL_GNUSTEP | 53 | builds. It was also needed to port to pre-C99 compilers, although |
| 54 | we don't care about that any more. */ | ||
| 55 | #if NS_IMPL_GNUSTEP || defined(__MINGW32__) | ||
| 54 | typedef unsigned int bool_bf; | 56 | typedef unsigned int bool_bf; |
| 55 | #else | 57 | #else |
| 56 | typedef bool bool_bf; | 58 | typedef bool bool_bf; |
diff --git a/src/dispnew.c b/src/dispnew.c index a81d6f64d1e..d3a31967ae0 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -4125,7 +4125,12 @@ scrolling_window (struct window *w, bool header_line_p) | |||
| 4125 | } | 4125 | } |
| 4126 | 4126 | ||
| 4127 | #ifdef HAVE_XWIDGETS | 4127 | #ifdef HAVE_XWIDGETS |
| 4128 | /* Currently this seems needed to detect xwidget movement reliably. */ | 4128 | /* Currently this seems needed to detect xwidget movement reliably. |
| 4129 | This is most probably because an xwidget glyph is represented in | ||
| 4130 | struct glyph's 'union u' by a pointer to a struct, which takes 8 | ||
| 4131 | bytes in 64-bit builds, and thus the comparison of u.val values | ||
| 4132 | done by GLYPH_EQUAL_P doesn't work reliably, since it assumes the | ||
| 4133 | size of the union is 4 bytes. FIXME. */ | ||
| 4129 | return 0; | 4134 | return 0; |
| 4130 | #endif | 4135 | #endif |
| 4131 | 4136 | ||