Renaming the variable 'totsize_save' to 'size_of_surrounding',

to better describe what it contains.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5294 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-07-12 19:27:26 +00:00
parent 3d01486409
commit aee86996de
2 changed files with 10 additions and 12 deletions

View File

@ -1,6 +1,8 @@
2015-07-12 Benno Schulenberg <bensberg@justemail.net> 2015-07-12 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_int_spell_fix, do_alt_speller): Remove the variable * src/text.c (do_int_spell_fix, do_alt_speller): Remove the variable
'added_magicline', as it will always be FALSE and thus does nothing. 'added_magicline', as it will always be FALSE and thus does nothing.
* src/text.c (do_alt_speller): Rename the variable 'totsize_save' to
'size_of_surrounding', to better describe what it contains.
2015-07-10 Benno Schulenberg <bensberg@justemail.net> 2015-07-10 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (delete_opennode): Plug a small memory leak. * src/nano.c (delete_opennode): Plug a small memory leak.

View File

@ -2656,9 +2656,8 @@ const char *do_alt_speller(char *tempfile_name)
* the alternate spell command. The line that mark_begin points * the alternate spell command. The line that mark_begin points
* to will be freed, so we save the line number and restore it * to will be freed, so we save the line number and restore it
* afterwards. */ * afterwards. */
size_t totsize_save = openfile->totsize; size_t size_of_surrounding;
/* Our saved value of totsize, used when we spell-check a marked /* The size of the text outside of a marked region. */
* selection. */
#endif #endif
/* Get the timestamp and the size of the temporary file. */ /* Get the timestamp and the size of the temporary file. */
@ -2749,9 +2748,8 @@ const char *do_alt_speller(char *tempfile_name)
(const filestruct **)&bot, &bot_x, &right_side_up); (const filestruct **)&bot, &bot_x, &right_side_up);
filepart = partition_filestruct(top, top_x, bot, bot_x); filepart = partition_filestruct(top, top_x, bot, bot_x);
/* Get the number of characters in the marked text, and subtract /* Compute the size of the text outside of the marked region. */
* it from the saved value of totsize. */ size_of_surrounding = openfile->totsize - get_totsize(top, bot);
totsize_save -= get_totsize(top, bot);
} }
#endif #endif
@ -2775,13 +2773,11 @@ const char *do_alt_speller(char *tempfile_name)
* temp file. */ * temp file. */
unpartition_filestruct(&filepart); unpartition_filestruct(&filepart);
/* Renumber starting with the beginning line of the old /* Renumber, starting with the beginning line of the old partition. */
* partition. Also add the number of characters in the
* spell-checked marked text to the saved value of totsize, and
* then make that saved value the actual value. */
renumber(top_save); renumber(top_save);
totsize_save += openfile->totsize;
openfile->totsize = totsize_save; /* Add back the size of the text surrounding the marked region. */
openfile->totsize += size_of_surrounding;
/* Assign mark_begin to the line where the mark began before. */ /* Assign mark_begin to the line where the mark began before. */
openfile->mark_begin = fsfromline(mb_lineno_save); openfile->mark_begin = fsfromline(mb_lineno_save);