in search_init(), when we're replacing and the mark is on, display a

prompt indicating that we're replacing text only in the selection
instead of the usual prompt

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

diff --git a/ChangeLog b/ChangeLog
index 782b92e408b658e1a75f3aee1471b7005f0523cd..8998ca5f2b7f04bfe7042c3ef570087830f034bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -229,6 +229,9 @@ CVS code -
          the search prompt to the "Go To Line" prompt, since the
          toggling works both ways now and non-numeric text shouldn't be
          lost when going only one of those ways. (DLR)
+       - When we're replacing and the mark is on, display a prompt
+         indicating that we're replacing text only in the selection
+         instead of the usual prompt. (DLR)
   findnextstr()
        - Take the no_sameline parameter after can_display_wrap and
          wholewords, not after all other parameters. (DLR)

diff --git a/src/search.c b/src/search.c
index 67ecc03d76196a5333fc5dfb43d69e036f3cdc4b..de0aea72e062363cc612173b9200f906fcdee66b 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -188,7 +188,16 @@ int search_init(bool replacing, bool use_answer)
 #endif
                "",
 
-       replacing ? _(" (to replace)") : "",
+       replacing ?
+#ifndef NANO_SMALL
+               (ISSET(MARK_ISSET) ? _(" (to replace) in selection") :
+#endif
+               _(" (to replace)")
+#ifndef NANO_SMALL
+               )
+#endif
+               : "",
+
        buf);
 
     /* Release buf now that we don't need it anymore. */