From 33fb1746dde857ec94fdc0cd7a0f7bce47b11d30 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 14 Jan 2016 14:34:05 +0000 Subject: [PATCH] Eliding an unneeded function. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5561 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/rcfile.c | 17 ++--------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 136a6af3..b6825ed8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * src/winio.c (edit_redraw): Elide an unneeded variable and adjust some wrappings and whitespace. * src/proto.h: Delete two duplicate declarations. + * src/rcfile.c (check_bad_binding): Elide this unneeded function. 2016-01-13 Benno Schulenberg * src/files.c (save_poshistory): Reduce the indentation. diff --git a/src/rcfile.c b/src/rcfile.c index 52a1b000..b4c1a29a 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -389,20 +389,6 @@ void parse_syntax(char *ptr) } #endif /* !DISABLE_COLOR */ -int check_bad_binding(sc *s) -{ -#define BADLISTLEN 1 - key_type badtypes[BADLISTLEN] = {META}; - int badseqs[BADLISTLEN] = { 91 }; - int i; - - for (i = 0; i < BADLISTLEN; i++) - if (s->type == badtypes[i] && s->seq == badseqs[i]) - return 1; - - return 0; -} - /* Check whether the given executable function is "universal" (meaning * any horizontal movement or deletion) and thus is present in almost * all menus. */ @@ -544,7 +530,8 @@ void parse_binding(char *ptr, bool dobind) fprintf(stderr, "s->seq = \"%d\"\n", newsc->seq); #endif - if (check_bad_binding(newsc)) { + /* Do not allow rebinding the equivalent of the Escape key. */ + if (newsc->type == META && newsc->seq == 91) { rcfile_error(N_("Sorry, keystroke \"%s\" may not be rebound"), newsc->keystr); free(newsc); goto free_copy;