Accepting not just 'Uncut' but also 'Undo' for undoing a justification.

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

diff --git a/ChangeLog b/ChangeLog
index 364700026c512fd858320342e02030a7fc803bc6..e59f87196ca5202fcbcc54e8e27cbd8d632f9ad4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
        * doc/syntax/python.nanorc: Don't colour triple quotes by themselves.
        * doc/syntax/python.nanorc: Treat backslashed quotes properly, and
        don't colour triple-quoted strings in two manners.
+       * src/text.c (do_justify): Accept not just the Uncut keystroke but
+       also the Undo keystroke for undoing a justification.
 
 2015-12-02  Arturo Borrero Gonzalez  <arturo.borrero.glez@gmail.com>
        * doc/syntax/nftables.nanorc: New file; syntax colouring for nftables.

diff --git a/src/text.c b/src/text.c
index ba6bc645dc128a556295998f4f8dd5c72dbc6fc8..96998532215f3fc41773a7f8d30b057d2dd240eb 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -2256,7 +2256,7 @@ void do_justify(bool full_justify)
 
     func = func_from_key(&kbinput);
 
-    if (func == do_uncut_text) {
+    if (func == do_uncut_text || func == do_undo) {
        /* Splice the justify buffer back into the file, but only if we
         * actually justified something. */
        if (first_par_line != NULL) {
@@ -2307,7 +2307,8 @@ void do_justify(bool full_justify)
            edit_refresh_needed = TRUE;
        }
     } else {
-       unget_kbinput(kbinput, meta_key, func_key);
+       if (func != do_undo)
+           unget_kbinput(kbinput, meta_key, func_key);
 
        /* Blow away the text in the justify buffer. */
        free_filestruct(jusbuffer);