(Fnewline): If we don't do the first SET_PT,

clear flag, so we don't do the second SET_PT.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/cmds.c b/src/cmds.c
index 43c919d7c3f..fc0a174198f 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -253,14 +253,17 @@ In Auto Fill mode, if no numeric arg, break the preceding line if it's long.")
      features all do nothing in that case.  */
 
   flag = point > BEGV && FETCH_CHAR (point - 1) == '\n';
-  if (flag)
-    /* We cannot use this optimization if properties change
-       in the vicinity.
-       ??? We need to check for change hook properties, etc.  */
 #ifdef USE_TEXT_PROPERTIES
-    if (point - 1 > BEGV && ! property_change_between_p (point - 2, point))
+  /* We cannot use this optimization if properties change
+     in the vicinity.
+     ??? We need to check for change hook properties, etc.  */
+  if (flag)
+    if (! (point - 1 > BEGV && ! property_change_between_p (point - 2, point)))
+      flag = 0;
 #endif
-      SET_PT (point - 1);
+
+  if (flag)
+    SET_PT (point - 1);
 
   while (XINT (arg) > 0)
     {