From 645841fd253942a0eaa2b048b87a4f2dfd04ef78 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 1 Jul 2014 11:42:28 +0000 Subject: [PATCH] Not passing the menu but setting it earlier. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5045 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ src/prompt.c | 7 +++---- src/proto.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ed99bdb..0ef3d6f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ stop passing it around. * src/help.c (help_init), src/winio.c (bottombars): There are no tagless functions, so there is no need to check. + * src/prompt.c (do_prompt, get_prompt_string): Don't pass the + menu, just set it earlier. 2014-06-30 Mark Majeres * src/cut.c, src/global.c, src/nano.c: Rename 'cut_till_end' to diff --git a/src/prompt.c b/src/prompt.c index 66031a11..6aa539ed 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -729,7 +729,7 @@ const sc *get_prompt_string(int *actual, bool allow_tabs, #ifndef DISABLE_HISTORIES filestruct **history_list, #endif - void (*refresh_func)(void), int menu + void (*refresh_func)(void) #ifndef DISABLE_TABCOMP , bool *list #endif @@ -779,8 +779,6 @@ const sc *get_prompt_string(int *actual, bool allow_tabs, statusbar_pww = statusbar_xplustabs(); } - currmenu = menu; - #ifdef DEBUG fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x); #endif @@ -979,6 +977,7 @@ int do_prompt(bool allow_tabs, prompt = charalloc(((COLS - 4) * mb_cur_max()) + 1); + currmenu = menu; bottombars(menu); va_start(ap, msg); @@ -994,7 +993,7 @@ int do_prompt(bool allow_tabs, #ifndef DISABLE_HISTORIES history_list, #endif - refresh_func, menu + refresh_func #ifndef DISABLE_TABCOMP , &list #endif diff --git a/src/proto.h b/src/proto.h index dcc634fe..4ee11ecc 100644 --- a/src/proto.h +++ b/src/proto.h @@ -530,7 +530,7 @@ const sc *get_prompt_string(int *value, bool allow_tabs, #ifndef DISABLE_HISTORIES filestruct **history_list, #endif - void (*refresh_func)(void), int menu + void (*refresh_func)(void) #ifndef DISABLE_TABCOMP , bool *list #endif