Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-15

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 66-84)

   - Update from CVS
   - rcirc: Add flexible response formatting; Add nick abbrevs
   - Merge from gnus--rel--5.10
   - Update from CVS: man/dired.texi (Tumme): More tumme documentation.
   - Merge from erc--emacs--0
   - Make ERC comply with the new copyright year guidelines.
   - (rcirc-format-response-string): Fix small bugs
   - Fix compiler error in erc-dcc.el.

 * gnus--rel--5.10  (patch 29)

   - Add sendmail.el and smptmail.el from Emacs tree to contrib/

1 files changed, 2 insertions, 1 deletions

diff --git a/src/cmds.c b/src/cmds.c
index e035ef7fd68..72d35b8cefd 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -536,7 +536,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;