Fix for 23733: search history broken with nano-2.1.1+

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

diff --git a/ChangeLog b/ChangeLog
index 18cfe45aa48d71eef24f5e84b85159c0683dc651..416cb2d040e04752c436988df0d2f05bc2e00c59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-29 Chris Allegretta <chrisa@asty.org>
+       * global.c: Fix for not having search history when --disable-justify is used
+         (Savannah bug 23733)
+
 GNU nano 2.1.2 - 2008.06.24
 2008-06-24 Chris Allegretta <chrisa@asty.org>
        * rcfile.c: Added function check_bad_binding() to look for sequences which

diff --git a/src/global.c b/src/global.c
index 3e10886d278983aeff6603f85e5d197bcf6b8904..4f2a291c92b5a163b163ed6b86baf58708b2355b 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -1072,13 +1072,13 @@ void shortcut_init(bool unjustify)
     add_to_sclist(MALL, "khome", do_home, 0, TRUE);
     add_to_sclist(MALL, "^E", do_end, 0, TRUE);
     add_to_sclist(MALL, "kend", do_end, 0, TRUE);
-#ifndef DISABLE_JUSTIFY
 #ifndef NANO_TINY
     add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "^P", (void *) prev_history_msg, 0, FALSE);
     add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "kup", (void *) prev_history_msg, 0, FALSE);
     add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "^N", (void *) next_history_msg, 0, FALSE);
     add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "kdown", (void *) next_history_msg, 0, FALSE);
 #endif
+#ifndef DISABLE_JUSTIFY
     add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2,
        "^W", do_para_begin_void, 0, TRUE);
     add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2,