From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 13 Sep 2015 16:13:22 +0000 (-0700)
Subject: * src/indent.c (Fvertical_motion): Simplify bugfix (Bug#21468).
X-Git-Tag: emacs-25.0.90~1224^2~145
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=59e3f2df9314e160b37bb1375b4bad15976cd56f;p=emacs.git

* src/indent.c (Fvertical_motion): Simplify bugfix (Bug#21468).
---

diff --git a/src/indent.c b/src/indent.c
index 777cd36cc52..ded18439fd9 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2203,10 +2203,7 @@ whether or not it is currently displayed in some window.  */)
 	     and then reposition point at the requested X coordinate;
 	     if we don't, the cursor will be placed just after the
 	     string, which might not be the requested column.  */
-	  if (nlines > 0
-	      && it.method == GET_FROM_STRING
-	      && !it.string_from_display_prop_p
-	      && it.area == TEXT_AREA)
+	  if (nlines > 0 && it.area == TEXT_AREA)
 	    {
 	      while (it.method == GET_FROM_STRING
 		     && !it.string_from_display_prop_p