From 14c7ed056d8e5e0388ad1b698cc81fdf11884957 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 5 May 2013 20:41:09 +0300 Subject: [PATCH] Fix bug #14306 with whitespace mode together with linum-mode. src/xdisp.c (set_iterator_to_next): Set the ignore_overlay_strings_at_pos_p flag only if we are _really_ iterating over an overlay string, as indicated by the current.overlay_string_index member. --- lisp/mail/rmail.el | 2 +- src/ChangeLog | 7 +++++++ src/xdisp.c | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 02703026e84..2a1d73faa65 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4752,7 +4752,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order. ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic ;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels -;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "119ce8b431f01e7f54bb6fa99603b3d9") +;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "61e7ad0931be1e07034dd57825ff326a") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ diff --git a/src/ChangeLog b/src/ChangeLog index 03d3a7e20f5..098af549ab9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2013-05-05 Eli Zaretskii + + * xdisp.c (set_iterator_to_next): Set the + ignore_overlay_strings_at_pos_p flag only if we are _really_ + iterating over an overlay string, as indicated by the + current.overlay_string_index member. (Bug#14306) + 2013-05-05 Jan Djärv * nsmenu.m (ns_update_menubar): Move initialization of submenuTitle diff --git a/src/xdisp.c b/src/xdisp.c index 41214880a56..6900c35c07c 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -7153,6 +7153,7 @@ set_iterator_to_next (struct it *it, int reseat_p) else if (it->dpvec_char_len > 0) { if (it->method == GET_FROM_STRING + && it->current.overlay_string_index >= 0 && it->n_overlay_strings > 0) it->ignore_overlay_strings_at_pos_p = 1; it->len = it->dpvec_char_len; -- 2.39.2