[Emacs-diffs] /srv/bzr/emacs/trunk r112465: Fix bug #14306 with whitespace mode together with linum-mode.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112465
fixes bug: http://debbugs.gnu.org/14306
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2013-05-05 20:41:09 +0300
message:
  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.
modified:
  lisp/mail/rmail.el
  src/ChangeLog
  src/xdisp.c

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2013-02-12 04:46:18 +0000
+++ b/lisp/mail/rmail.el        2013-05-05 17:41:09 +0000
@@ -4752,7 +4752,7 @@
 
 ;;;### (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" "\

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-05-05 15:16:06 +0000
+++ b/src/ChangeLog     2013-05-05 17:41:09 +0000
@@ -1,3 +1,10 @@
+2013-05-05  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nsmenu.m (ns_update_menubar): Move initialization of submenuTitle

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-04-02 01:54:56 +0000
+++ b/src/xdisp.c       2013-05-05 17:41:09 +0000
@@ -7153,6 +7153,7 @@
          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;