mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-01 11:14:55 +00:00
Code Issues Releases Activity

Fix bug #14306 with whitespace mode together with linum-mode.

Browse Source 
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.
This commit is contained in:
Eli Zaretskii 2013-05-05 20:41:09 +03:00
parent 02502a5fd2
commit 14c7ed056d
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/mail/rmail.el
View File

@ -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" "\

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2013-05-05 Eli Zaretskii <eliz@gnu.org>
* 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 <jan.h.d@swipnet.se>
* nsmenu.m (ns_update_menubar): Move initialization of submenuTitle

1
src/xdisp.c
View File

@ -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;