1 files changed, 2 insertions, 1 deletions

diff --git a/src/cmds.c b/src/cmds.c
index f1e92ab2f75..494ef14db99 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -528,7 +528,8 @@ internal_self_insert (c, noautofill)
            justification, if any, know where the end is going to be.  */
         SET_PT_BOTH (PT - 1, PT_BYTE - 1);
       tem = call0 (current_buffer->auto_fill_function);
-      if (c == '\n')
+      /* Test PT < ZV in case the auto-fill-function is strange.  */
+      if (c == '\n' && PT < ZV)
         SET_PT_BOTH (PT + 1, PT_BYTE + 1);
       if (!NILP (tem))
         hairy = 2;