[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105539: Fix crashes with completion
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105539: Fix crashes with completion and composed characters. |
Date: |
Tue, 23 Aug 2011 11:38:29 +0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105539
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2011-08-23 11:38:29 +0300
message:
Fix crashes with completion and composed characters.
src/dispnew.c (buffer_posn_from_coords): Use buf_charpos_to_bytepos
instead of CHAR_TO_BYTE. Fixes a crash when a completion
candidate is selected by the mouse, and that candidate has a
composed character under the mouse.
modified:
src/ChangeLog
src/dispnew.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-08-23 07:01:25 +0000
+++ b/src/ChangeLog 2011-08-23 08:38:29 +0000
@@ -1,5 +1,10 @@
2011-08-23 Eli Zaretskii <address@hidden>
+ * dispnew.c (buffer_posn_from_coords): Use buf_charpos_to_bytepos
+ instead of CHAR_TO_BYTE. Fixes a crash when a completion
+ candidate is selected by the mouse, and that candidate has a
+ composed character under the mouse.
+
* xdisp.c (x_produce_glyphs): Set it->nglyphs to 1. Fixes pixel
coordinates reported by pos-visible-in-window-p for a composed
character in column zero.
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2011-08-05 11:04:44 +0000
+++ b/src/dispnew.c 2011-08-23 08:38:29 +0000
@@ -5307,7 +5307,8 @@
if (STRINGP (it.string))
BYTEPOS (pos->pos) = string_char_to_byte (string, CHARPOS (pos->pos));
else
- BYTEPOS (pos->pos) = CHAR_TO_BYTE (CHARPOS (pos->pos));
+ BYTEPOS (pos->pos) = buf_charpos_to_bytepos (XBUFFER (w->buffer),
+ CHARPOS (pos->pos));
}
#ifdef HAVE_WINDOW_SYSTEM
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105539: Fix crashes with completion and composed characters.,
Eli Zaretskii <=