Commit d29d2492 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de

parents b765f1fe df907af0
2014-06-11 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_INSTALL): Update for 2013-08-28 DOCMISC_W32 change.
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
......
......@@ -72,7 +72,7 @@ INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
url vhdl-mode vip viper widget wisent woman
## Info files to install on current platform.
INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_INFO_W32)
INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)
## Info files to build on current platform.
## This is all of them, even though they might not all get installed,
......
This diff is collapsed.
2014-06-11 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (set_cursor_from_row): Fix an off-by-one error when
matching overlay strings with 'cursor' property against buffer
positions traversed in the glyph row. (Bug#17744)
2014-06-11 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.h (EmacsApp): Always compile in shouldKeepRunning, isFirst
......
......@@ -14413,7 +14413,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
pos_after, 0);
 
if (prop_pos >= pos_before)
bpos_max = prop_pos - 1;
bpos_max = prop_pos;
}
if (INTEGERP (chprop))
{
......@@ -14487,7 +14487,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
pos_after, 0);
 
if (prop_pos >= pos_before)
bpos_max = prop_pos - 1;
bpos_max = prop_pos;
}
if (INTEGERP (chprop))
{
......@@ -14517,7 +14517,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
GLYPH_BEFORE and GLYPH_AFTER. */
if (!((row->reversed_p ? glyph > glyphs_end : glyph < glyphs_end)
&& BUFFERP (glyph->object) && glyph->charpos == pt_old)
&& !(bpos_max < pt_old && pt_old <= bpos_covered))
&& !(bpos_max <= pt_old && pt_old <= bpos_covered))
{
/* An empty line has a single glyph whose OBJECT is zero and
whose CHARPOS is the position of a newline on that line.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment