2008-10-20 Chris Allegretta <chrisa@asty.org>

        * files.c (do_writeout): Add check for file modification when saving
          the file so the user can at least know they may be blowing away changes.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4344 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 36c011ee2a125865dda37c8d2d9f4ec9b8b6adab..3e59d1b0467db64a4ec9bd90a80a2e44f9fbac58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-20 Chris Allegretta <chrisa@asty.org>
+       * files.c (do_writeout): Add check for file modification when saving
+         the file so the user can at least know they may be blowing away changes.
+
 2008-10-14 Chris Allegretta <chrisa@asty.org>
        * nanorc.5: Fix redo man page entry and update explanation, reported by
          Eitan Adler <eitanadlerlist@gmail.com>

diff --git a/src/files.c b/src/files.c
index f1444b552a22d669df2e70f423a0066473c1a797..def24d72651657418356fbfd23e5e6e4ba82779c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2028,6 +2028,13 @@ bool do_writeout(bool exiting)
                            continue;
                    }
                }
+               if (openfile->current_stat && openfile->current_stat->st_mtime < st.st_mtime) {
+                   i = do_yesno_prompt(FALSE,
+                       _("File was modified since you opened it, continue saving ? "));
+                   if (i == 0 || i == -1)
+                       continue;
+               }
+
            }
 
            /* Convert newlines to nulls, just before we save the