Index: src/global.c
===================================================================
--- src/global.c	(revisión: 4736)
+++ src/global.c	(copia de trabajo)
@@ -170,6 +170,8 @@
 	/* Struct for the shortcut-key list. */
 subnfunc *allfuncs = NULL;
 	/* Struct for the function list. */
+subnfunc *uncutter = NULL;
+	/* Pointer to the special Uncut/Unjustify item. */
 
 #ifndef NANO_TINY
 filestruct *search_history = NULL;
@@ -823,14 +825,12 @@
     add_to_funcs(do_cut_text_void, MMAIN, N_("Cut Text"), IFSCHELP(nano_cut_msg),
 	FALSE, NOVIEW);
 
-    if (unjustify)
 	/* TRANSLATORS: Try to keep this at most 10 characters. */
-	add_to_funcs(do_uncut_text, MMAIN, N_("Unjustify"), "",
-	    FALSE, NOVIEW);
-    else
-	/* TRANSLATORS: Try to keep this at most 10 characters. */
 	add_to_funcs(do_uncut_text, MMAIN, N_("Uncut Text"), IFSCHELP(nano_uncut_msg),
 	    FALSE, NOVIEW);
+    /* Remember the entry for Uncut, to be able to replace it with Unjustify. */
+    for (uncutter = allfuncs; uncutter->next != NULL; uncutter = uncutter->next)
+	;
 
 #ifndef NANO_TINY
     /* TRANSLATORS: Try to keep this at most 10 characters. */
Index: src/proto.h
===================================================================
--- src/proto.h	(revisión: 4736)
+++ src/proto.h	(copia de trabajo)
@@ -99,6 +99,7 @@
 
 extern sc *sclist;
 extern subnfunc *allfuncs;
+extern subnfunc *uncutter;
 #ifndef DISABLE_COLOR
 extern syntaxtype *syntaxes;
 extern char *syntaxstr;
Index: src/text.c
===================================================================
--- src/text.c	(revisión: 4736)
+++ src/text.c	(copia de trabajo)
@@ -2281,7 +2281,7 @@
 	do_cursorpos(TRUE);
 
     /* Display the shortcut list with UnJustify. */
-    shortcut_init(TRUE);
+    uncutter->desc = "Unjiffify";
     display_main_list();
 
     /* Now get a keystroke and see if it's unjustify.  If not, put back
@@ -2351,7 +2351,7 @@
     blank_statusbar();
 
     /* Display the shortcut list with UnCut. */
-    shortcut_init(FALSE);
+    uncutter->desc = "Uncut Text";
     display_main_list();
 
 #ifndef NANO_TINY