Remove support for ':timeout' from w32 tray notifications

[gnu-emacs] / src / indent.c

diff --git a/src/indent.c b/src/indent.c
index 584f2179bc5ce1c0fcb78aa2997858b163606168..04837f8f513f299c933b9fe792a0f4e2cdf22632 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -26,10 +26,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "category.h"
 #include "composite.h"
 #include "indent.h"
-#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
-#include "termchar.h"
 #include "disptab.h"
 #include "intervals.h"
 #include "dispextern.h"
@@ -2082,7 +2080,11 @@ whether or not it is currently displayed in some window.  */)
        }
       else
        it_overshoot_count =
-         !(it.method == GET_FROM_IMAGE || it.method == GET_FROM_STRETCH);
+         (!(it.method == GET_FROM_IMAGE
+            || it.method == GET_FROM_STRETCH)
+           /* We will overshoot if lines are truncated and PT lies
+              beyond the right margin of the window.  */
+           || it.line_wrap == TRUNCATE);
 
       if (start_x_given)
        {