LineageOS/android_external_nano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undo: actually enable undoing/redoing an alternative spellcheck

Browse Source 
Make sure the inserts of the spell-checked text are undoable, and no
longer discard the undo stack after running the alternate spell checker.
This commit is contained in:
David Lawrence Ramsey
2018-07-30 17:07:43 -05:00
committed by Benno Schulenberg
parent 115f089d5f
commit c39c9c241b
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/files.c
View File

@@ -540,7 +540,7 @@ void replace_buffer(const char *filename)
cutbuffer = was_cutbuffer; cutbuffer = was_cutbuffer;
/* Insert the processed file into its place. */ /* Insert the processed file into its place. */
read_file(f, descriptor, filename, FALSE); read_file(f, descriptor, filename, TRUE);
#ifndef NANO_TINY #ifndef NANO_TINY
add_undo(COUPLE_END); add_undo(COUPLE_END);
@@ -577,7 +577,7 @@ void replace_marked_buffer(const char *filename)
cutbuffer = was_cutbuffer; cutbuffer = was_cutbuffer;
/* Insert the processed file where the marked text was. */ /* Insert the processed file where the marked text was. */
read_file(f, descriptor, filename, FALSE); read_file(f, descriptor, filename, TRUE);
/* Restore the magicline behavior now that we're done fiddling. */ /* Restore the magicline behavior now that we're done fiddling. */
if (!old_no_newlines) if (!old_no_newlines)

8
src/text.c
View File

@@ -2906,14 +2906,8 @@ const char *do_alt_speller(char *tempfile_name)
/* Stat the temporary file again, and mark the buffer as modified only /* Stat the temporary file again, and mark the buffer as modified only
* if this file was changed since it was written. */ * if this file was changed since it was written. */
stat(tempfile_name, &spellfileinfo); stat(tempfile_name, &spellfileinfo);
if (spellfileinfo.st_mtime != timestamp) { if (spellfileinfo.st_mtime != timestamp)
set_modified(); set_modified();
#ifndef NANO_TINY
/* Flush the undo stack, to avoid making a mess when the user
* tries to undo things in spell-corrected lines. */
discard_until(NULL, openfile, FALSE);
#endif
}
#ifndef NANO_TINY #ifndef NANO_TINY
/* Unblock SIGWINCHes again. */ /* Unblock SIGWINCHes again. */