ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
Benno Schulenberg 2014-07-01 11:42:28 +00:00
parent 3cd3e32ec3
commit 645841fd25
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -5,6 +5,8 @@
stop passing it around. stop passing it around.
* src/help.c (help_init), src/winio.c (bottombars): There are * src/help.c (help_init), src/winio.c (bottombars): There are
no tagless functions, so there is no need to check. 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 <mark@engine12.com> 2014-06-30 Mark Majeres <mark@engine12.com>
* src/cut.c, src/global.c, src/nano.c: Rename 'cut_till_end' to * src/cut.c, src/global.c, src/nano.c: Rename 'cut_till_end' to

7
src/prompt.c
View File

@ -729,7 +729,7 @@ const sc *get_prompt_string(int *actual, bool allow_tabs,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
filestruct **history_list, filestruct **history_list,
#endif #endif
void (*refresh_func)(void), int menu void (*refresh_func)(void)
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
, bool *list , bool *list
#endif #endif
@ -779,8 +779,6 @@ const sc *get_prompt_string(int *actual, bool allow_tabs,
statusbar_pww = statusbar_xplustabs(); statusbar_pww = statusbar_xplustabs();
} }
currmenu = menu;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x); fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
#endif #endif
@ -979,6 +977,7 @@ int do_prompt(bool allow_tabs,
prompt = charalloc(((COLS - 4) * mb_cur_max()) + 1); prompt = charalloc(((COLS - 4) * mb_cur_max()) + 1);
currmenu = menu;
bottombars(menu); bottombars(menu);
va_start(ap, msg); va_start(ap, msg);
@ -994,7 +993,7 @@ int do_prompt(bool allow_tabs,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
history_list, history_list,
#endif #endif
refresh_func, menu refresh_func
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
, &list , &list
#endif #endif

2
src/proto.h
View File

@ -530,7 +530,7 @@ const sc *get_prompt_string(int *value, bool allow_tabs,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
filestruct **history_list, filestruct **history_list,
#endif #endif
void (*refresh_func)(void), int menu void (*refresh_func)(void)
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
, bool *list , bool *list
#endif #endif