From 930d429ccc5c5526569a7b5816958a0605fc35df Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 15 Mar 2011 10:16:01 -0700 Subject: [PATCH] * cmds.c (internal_self_insert): Rename local to avoid shadowing. --- src/ChangeLog | 2 ++ src/cmds.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 40ba15de954..bc2e0b972fa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-03-15 Paul Eggert + * cmds.c (internal_self_insert): Rename local to avoid shadowing. + * lisp.h (GCPRO2_VAR, GCPRO3_VAR, GCPRO4_VAR, GCPRO5_VAR, GCPRO6_VAR): New macros, so that the caller can use some names other than gcpro1, gcpro2, etc. diff --git a/src/cmds.c b/src/cmds.c index 5e6884c0807..fa1ac5028ae 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -485,18 +485,18 @@ internal_self_insert (int c, EMACS_INT n) : (c == ' ' || c == '\n')) && !NILP (BVAR (current_buffer, auto_fill_function))) { - Lisp_Object tem; + Lisp_Object auto_fill_result; if (c == '\n') /* After inserting a newline, move to previous line and fill that. Must have the newline in place already so filling and justification, if any, know where the end is going to be. */ SET_PT_BOTH (PT - 1, PT_BYTE - 1); - tem = call0 (BVAR (current_buffer, auto_fill_function)); + auto_fill_result = call0 (BVAR (current_buffer, auto_fill_function)); /* 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)) + if (!NILP (auto_fill_result)) hairy = 2; } -- 2.39.5