Update 1.0 tree for Yesterdy's commit

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

diff --git a/BUGS b/BUGS
index e7479f9680d63071d329bce47eec61d2c2702822..26ac5c085e5c3da4d9cac1676b2e69490289f174 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -132,7 +132,8 @@
   Corsi) (67) [FIXED].
 - ^C does not work after a suspend in tcsh (discovered by
   Trevor Cordes) (68) [FIXED].
-
+- Home and End control keys (^A, ^E) do not always work in filename
+  prompt (bug found by Ian Turner) (69) [FIXED].
 
 ** Open BUGS **
 

diff --git a/ChangeLog b/ChangeLog
index 69e4371278b5e2f73e685a438529599109fd2760..4160d7a4fcbc115e977c1db8b3628b96bd086ca1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 CVS code -
+- winio.c:
+  nanogetstr()
+       - Add NANO_HOME_KEY and NANO_END_KEY to the home and
+         end key code (fixes BUG #69).
 - THANKS:
        - Added missing entry for Eivind Kjørstad.
 - po/no.po:

diff --git a/winio.c b/winio.c
index 9cb6410c122af428299af315d7264b99e04cff26..e468cae6a73f982f58d53990f6007e77450b8a5e 100644 (file)
--- a/winio.c
+++ b/winio.c
@@ -303,16 +303,17 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 #endif
                break;
        case KEY_HOME:
+       case NANO_HOME_KEY:
            x = x_left;
            nanoget_repaint(buf, inputbuf, x);
            break;
        case KEY_END:
+       case NANO_END_KEY:
            x = x_left + strlen(inputbuf);
            nanoget_repaint(buf, inputbuf, x);
            break;
        case KEY_RIGHT:
        case NANO_FORWARD_KEY:
-
            if (x < xend)
                x++;
            wmove(bottomwin, 0, x);