From: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 7 Apr 2014 09:44:52 +0000 (+0000)
Subject: Allowing M-J (full-justify) after being configured with --enable-justify.
X-Git-Tag: v2.3.3~189
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d58fb902f4bbe56d4aef30eecc96a59a1ff751e5;p=nano.git

Allowing M-J (full-justify) after being configured with --enable-justify.


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

diff --git a/ChangeLog b/ChangeLog
index 2611d969..4cfd46ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 	returns and which shortcut_init() "sneakily" sets.
 	* src/{proto.h,files.c,global.c,nano.c,rcfile.c}: Drop the obsolete
 	argument of shortcut_init(), and remove two unneeded calls of it.
+	* src/global.c (shortcut_init): Allow M-J after an --enable-justify.
 
 2014-04-06  Benno Schulenberg  <bensberg@justemail.net>
 	* src/global.c (shortcut_init): Limit M-T (cut-till-end-of-file) to
diff --git a/src/global.c b/src/global.c
index e074bef0..deb93ae0 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1217,9 +1217,11 @@ void shortcut_init(void)
     add_to_sclist(MALL, "M-V", do_verbatim_input, 0, TRUE);
 #ifndef NANO_TINY
     add_to_sclist(MMAIN, "M-T", do_cut_till_end, 0, TRUE);
+#endif
 #ifndef DISABLE_JUSTIFY
     add_to_sclist(MMAIN|MWHEREIS, "M-J", do_full_justify, 0, TRUE);
 #endif
+#ifndef NANO_TINY
     add_to_sclist(MMAIN, "M-D", do_wordlinechar_count, 0, TRUE);
 
     add_to_sclist(MMAIN, "M-X", do_toggle_void, NO_HELP, TRUE);