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

Do not set any helpline tags to empty strings; 

compilation should fail if they are needed and not defined.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4738 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-04-06 20:55:21 +00:00
parent e6821736aa
commit 2ff9dc7090
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,8 +1,10 @@
2014-04-06 Benno Schulenberg <bensberg@justemail.net> 2014-04-06 Benno Schulenberg <bensberg@justemail.net>
* src/global.c (shortcut_init): Limit M-T (cut-till-end) to the main * src/global.c (shortcut_init): Limit M-T (cut-till-end-of-file) to
menu, and M-J (full-justify) to the main and search menus. the main menu, and M-J (full-justify) to the main and search menus.
* src/proto.h: There is no need for the helpline tags to be external, * src/proto.h: There is no need for the helpline tags to be external,
they are only ever used in src/global.c. they are only ever used in src/global.c.
* src/global.c: Do not set any helpline tags to empty strings;
compilation should fail if they are needed and not defined.
2014-04-05 Benno Schulenberg <bensberg@justemail.net> 2014-04-05 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (version): Print the correct configuration options. * src/nano.c (version): Print the correct configuration options.

35
src/global.c
View File

@ -510,52 +510,33 @@ const char *backwards_msg = N_("Backwards");
const char *regexp_msg = N_("Regexp"); const char *regexp_msg = N_("Regexp");
#endif #endif
/* Stuff we want to just stun out if we're in TINY mode. */ #ifndef NANO_TINY
#ifdef NANO_TINY /* TRANSLATORS: Try to keep the next two strings at most 10 characters. */
const char *gototext_msg = "";
const char *do_para_begin_msg = "";
const char *do_para_end_msg = "";
const char *case_sens_msg = "";
const char *backwards_msg = "";
const char *do_cut_till_end = "";
const char *dos_format_msg = "";
const char *mac_format_msg = "";
const char *append_msg = "";
const char *prepend_msg = "";
const char *backup_file_msg = "";
const char *to_files_msg = "";
const char *first_file_msg = "";
const char *whereis_next_msg = "";
const char *last_file_msg = "";
const char *new_buffer_msg = "";
const char *goto_dir_msg;
const char *ext_cmd_msg = "";
#else
/* TRANSLATORS: Try to keep the next three strings at most 10 characters. */
const char *prev_history_msg = N_("PrevHstory"); const char *prev_history_msg = N_("PrevHstory");
const char *next_history_msg = N_("NextHstory"); const char *next_history_msg = N_("NextHstory");
const char *gototext_msg = N_("Go To Text"); /* TRANSLATORS: Try to keep the next four strings at most 12 characters. */
/* TRANSLATORS: Try to keep the next three strings at most 12 characters. */
const char *whereis_next_msg = N_("WhereIs Next"); const char *whereis_next_msg = N_("WhereIs Next");
#endif
const char *gototext_msg = N_("Go To Text");
#ifndef DISABLE_BROWSER #ifndef DISABLE_BROWSER
const char *first_file_msg = N_("First File"); const char *first_file_msg = N_("First File");
const char *last_file_msg = N_("Last File"); const char *last_file_msg = N_("Last File");
/* TRANSLATORS: Try to keep the next nine strings at most 16 characters. */ /* TRANSLATORS: Try to keep the next nine strings at most 16 characters. */
const char *to_files_msg = N_("To Files"); const char *to_files_msg = N_("To Files");
const char *goto_dir_msg = N_("Go To Dir");
#endif #endif
#ifndef NANO_TINY
const char *dos_format_msg = N_("DOS Format"); const char *dos_format_msg = N_("DOS Format");
const char *mac_format_msg = N_("Mac Format"); const char *mac_format_msg = N_("Mac Format");
const char *append_msg = N_("Append"); const char *append_msg = N_("Append");
const char *prepend_msg = N_("Prepend"); const char *prepend_msg = N_("Prepend");
const char *backup_file_msg = N_("Backup File"); const char *backup_file_msg = N_("Backup File");
const char *ext_cmd_msg = N_("Execute Command"); const char *ext_cmd_msg = N_("Execute Command");
#endif
#ifndef DISABLE_MULTIBUFFER #ifndef DISABLE_MULTIBUFFER
const char *new_buffer_msg = N_("New Buffer"); const char *new_buffer_msg = N_("New Buffer");
#endif #endif
const char *goto_dir_msg = N_("Go To Dir");
#endif /* NANO_TINY */
/* Initialize all shortcut lists. If unjustify is TRUE, replace /* Initialize all shortcut lists. If unjustify is TRUE, replace
* the Uncut shortcut in the main shortcut list with UnJustify. */ * the Uncut shortcut in the main shortcut list with UnJustify. */