diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-12-09 18:00:42 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-12-09 18:00:42 -0800 |
| commit | 265c2fbf11cb8bf9b805df63ecb9508631f08e35 (patch) | |
| tree | 808684294d7ec600f5300e0a5d5f868740096f7b /src/indent.c | |
| parent | 5f460827dd14fbfae26ac8451cedd4446817d1ec (diff) | |
| parent | f433306af510e86a614e9f9f082b6d2d5f56a968 (diff) | |
| download | emacs-265c2fbf11cb8bf9b805df63ecb9508631f08e35.tar.gz | |
Merge from emacs-24; up to 2012-11-26T19:56:14Z!monnier@iro.umontreal.ca
Diffstat (limited to 'src/indent.c')
| -rw-r--r-- | src/indent.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/indent.c b/src/indent.c index a3abf88feeb..327526eae2d 100644 --- a/src/indent.c +++ b/src/indent.c @@ -2025,7 +2025,11 @@ whether or not it is currently displayed in some window. */) const char *s = SSDATA (it.string); const char *e = s + SBYTES (it.string); - disp_string_at_start_p = it.string_from_display_prop_p; + /* If it.area is anything but TEXT_AREA, we need not bother + about the display string, as it doesn't affect cursor + positioning. */ + disp_string_at_start_p = + it.string_from_display_prop_p && it.area == TEXT_AREA; while (s < e) { if (*s++ == '\n') |