From: Kenichi Handa <handa@m17n.org>
Date: Thu, 18 Jan 2001 12:14:48 +0000 (+0000)
Subject: (display_string): Fix previous change.
X-Git-Tag: emacs-pretest-21.0.96~226
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9299cb15209728712e23eeddf6c7b158a48e2606;p=emacs.git

(display_string): Fix previous change.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 00e325b3251..6ca639bcbfa 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13790,14 +13790,18 @@ display_string (string, lisp_string, face_string, face_string_pos,
 		{
 		  int i, n;
 
-		  for (i = row->used[TEXT_AREA] - 1; i > 0; --i)
-		    if (!CHAR_GLYPH_PADDING_P (row->glyphs[TEXT_AREA][i]))
-		      break;
-		  for (n = row->used[TEXT_AREA]; i < n; ++i)
+		  if (it->current_x > it->last_visible_x)
 		    {
-		      row->used[TEXT_AREA] = i;
-		      produce_special_glyphs (it, IT_TRUNCATION);
+		      for (i = row->used[TEXT_AREA] - 1; i > 0; --i)
+			if (!CHAR_GLYPH_PADDING_P (row->glyphs[TEXT_AREA][i]))
+			  break;
+		      for (n = row->used[TEXT_AREA]; i < n; ++i)
+			{
+			  row->used[TEXT_AREA] = i;
+			  produce_special_glyphs (it, IT_TRUNCATION);
+			}
 		    }
+		  produce_special_glyphs (it, IT_TRUNCATION);
 		}
 	      it->glyph_row->truncated_on_right_p = 1;
 	    }