Add and fix bug #59

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

diff --git a/BUGS b/BUGS
index 578854a594443981fa94df1e4f55837f3467f0b2..4f3acded41fb7c85de6f3f1e711c3e341ed405b2 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -105,6 +105,8 @@
   Krebs (57) [FIXED].
 - File browser aborts on Solaris in qsort() call.  (Reported by
   Matthias Andree) (58) [FIXED].
+- Can modify the current file in view mode with ^W^R (discovered by Rocco
+  Corsi) (58) [FIXED].
 
 ** Open BUGS **
 

diff --git a/ChangeLog b/ChangeLog
index 30e496390af5e1ad1ce1886beeb60dc5d8b4c256..3a2472d491cfebeeee8f7f08b042b9231eeb8a73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 Cvs code -
+- search.c:
+  do_replace()
+        - If we manage to make it in somehow with VIEW_MODE on, abort 
+          nicely (fixes BUG #59).                          
+
 nano 1.0.1 - 04/06/2001
 - General:
        - added configure option --disable-wrapping.  Does what it says,

diff --git a/proto.h b/proto.h
index 68634d3fbb7ccbc3131440386550fba28b164ee1..aa0a53bc947df5f386576375950c06625cf19b3e 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -140,6 +140,7 @@ void add_to_cutbuffer(filestruct * inptr);
 void do_replace_highlight(int highlight_flag, char *word);
 void nano_disabled_msg(void);
 void window_init(void);
+void print_view_warning(void);
 #ifdef NANO_EXTRA
 void do_credits(void);
 #endif

diff --git a/search.c b/search.c
index 97f1ece763d3770f8fb22a7325b6428d638573d2..34004a77b154b3fa07964106aecd73cc9405b305 100644 (file)
--- a/search.c
+++ b/search.c
@@ -586,6 +586,12 @@ int do_replace(void)
     filestruct *begin;
     char *prevanswer = NULL, *buf = NULL;
 
+    if (ISSET(VIEW_MODE)) {
+       print_view_warning();
+       replace_abort();
+       return 0;
+    }
+
     i = search_init(1);
     switch (i) {
     case -1: