aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-03-15 10:16:01 -0700
committerPaul Eggert2011-03-15 10:16:01 -0700
commit930d429ccc5c5526569a7b5816958a0605fc35df (patch)
tree7acfe397e49c6cc3ecc79bb066c07a81b09e2561
parent7082eac6799bba5ebd39417c40c810ed0672c7d9 (diff)
downloademacs-930d429ccc5c5526569a7b5816958a0605fc35df.tar.gz
emacs-930d429ccc5c5526569a7b5816958a0605fc35df.zip
* cmds.c (internal_self_insert): Rename local to avoid shadowing.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/cmds.c6
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 @@
12011-03-15 Paul Eggert <eggert@cs.ucla.edu> 12011-03-15 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * cmds.c (internal_self_insert): Rename local to avoid shadowing.
4
3 * lisp.h (GCPRO2_VAR, GCPRO3_VAR, GCPRO4_VAR, GCPRO5_VAR, GCPRO6_VAR): 5 * lisp.h (GCPRO2_VAR, GCPRO3_VAR, GCPRO4_VAR, GCPRO5_VAR, GCPRO6_VAR):
4 New macros, so that the caller can use some names other than 6 New macros, so that the caller can use some names other than
5 gcpro1, gcpro2, etc. 7 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)
485 : (c == ' ' || c == '\n')) 485 : (c == ' ' || c == '\n'))
486 && !NILP (BVAR (current_buffer, auto_fill_function))) 486 && !NILP (BVAR (current_buffer, auto_fill_function)))
487 { 487 {
488 Lisp_Object tem; 488 Lisp_Object auto_fill_result;
489 489
490 if (c == '\n') 490 if (c == '\n')
491 /* After inserting a newline, move to previous line and fill 491 /* After inserting a newline, move to previous line and fill
492 that. Must have the newline in place already so filling and 492 that. Must have the newline in place already so filling and
493 justification, if any, know where the end is going to be. */ 493 justification, if any, know where the end is going to be. */
494 SET_PT_BOTH (PT - 1, PT_BYTE - 1); 494 SET_PT_BOTH (PT - 1, PT_BYTE - 1);
495 tem = call0 (BVAR (current_buffer, auto_fill_function)); 495 auto_fill_result = call0 (BVAR (current_buffer, auto_fill_function));
496 /* Test PT < ZV in case the auto-fill-function is strange. */ 496 /* Test PT < ZV in case the auto-fill-function is strange. */
497 if (c == '\n' && PT < ZV) 497 if (c == '\n' && PT < ZV)
498 SET_PT_BOTH (PT + 1, PT_BYTE + 1); 498 SET_PT_BOTH (PT + 1, PT_BYTE + 1);
499 if (!NILP (tem)) 499 if (!NILP (auto_fill_result))
500 hairy = 2; 500 hairy = 2;
501 } 501 }
502 502