Back that out, as it braks Linux :(

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

diff --git a/ChangeLog b/ChangeLog
index f0db883aff7ec3fc1c0f2242bca61dc514d3996a..c3ba93ee89c37aacb0978637171ecd5c575460fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,6 @@ CVS code -
        - Allow --tiny and --multibuffer to cooperate (who the heck
          would want this is beyond me but ;-).  Changes to 
          configure.ac, global.c, ,  (David Benbennick).
-       - FreeBSD compat.  Remove KEY_DC from the delete shortcut in 
-         global.c:shortcut_init(), add case for 330 under nano.c:main().
 - configure.ac:
        - Define NDEBUG to silence asserts (David Benbennick).
 - files.c:

diff --git a/global.c b/global.c
index f3ed1f68f265cb29596d229418761d8eb9196c4b..a46b4b3ebd9e7032d45d96ee42c494f21cf3fad6 100644 (file)
--- a/global.c
+++ b/global.c
@@ -453,7 +453,7 @@ void shortcut_init(int unjustify)
                nano_mark_msg, NANO_ALT_MARK_KEY, 0, 0, NOVIEW, do_mark);
 
     sc_init_one(&main_list, NANO_DELETE_KEY, _("Delete"),
-               nano_delete_msg, 0, 0,
+               nano_delete_msg, 0, KEY_DC,
                NANO_CONTROL_D, NOVIEW, do_delete);
 
     sc_init_one(&main_list, NANO_BACKSPACE_KEY, _("Backspace"),

diff --git a/nano.c b/nano.c
index 22238efa3f88e58e87e51d1ce9015565de66f461..72ac3c17e63e77b266ae7f7d41ebc35369994edb 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -3332,9 +3332,6 @@ int main(int argc, char *argv[])
            case 545:           /* Right alt key */
 #endif
 
-               break;
-           case 330:           /* Delete key in *BSD with keypad() */
-               do_backspace();
                break;
            default:
 #ifdef DEBUG