From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 4 Aug 2011 00:58:07 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~124^2~66
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b33f9238e98872b413c01f1ee1a1a74fe217eeb1;p=emacs.git

Merge from trunk.
---

b33f9238e98872b413c01f1ee1a1a74fe217eeb1
diff --cc src/xdisp.c
index fa4b3c4f9ab,d1598e5ed40..923f0aba591
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@@ -3163,10 -3163,9 +3163,11 @@@ compute_display_string_pos (struct text
    EMACS_INT lim =
      (charpos < eob - MAX_DISP_SCAN) ? charpos + MAX_DISP_SCAN : eob;
    struct text_pos tpos;
-   struct buffer *b;
+ 
+   *disp_prop_p = 1;
  
 +  *disp_prop_p = 1;
 +
    if (charpos >= eob
        /* We don't support display properties whose values are strings
  	 that have display string properties.  */