Removed null string code

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@253 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2000-10-31 05:32:09 +00:00
parent e364740aea
commit 4d29be19c8
5 changed files with 180 additions and 198 deletions

View File

@ -170,7 +170,7 @@ void shortcut_init(void)
"", *nano_mark_msg = "", *nano_delete_msg =
"", *nano_backspace_msg = "", *nano_tab_msg =
"", *nano_enter_msg = "", *nano_case_msg =
"", *nano_cancel_msg = "", *nano_null_msg = "";
"", *nano_cancel_msg = "";
#ifndef NANO_SMALL
nano_help_msg = _("Invoke the help menu");
@ -205,7 +205,6 @@ void shortcut_init(void)
nano_case_msg =
_("Make the current search or replace case (in)sensitive");
nano_cancel_msg = _("Cancel the current function");
nano_null_msg = _("Use the null string, \"\"");
#endif
if (ISSET(PICO_MSGS))
@ -373,10 +372,7 @@ void shortcut_init(void)
sc_init_one(&replace_list_2[1], NANO_LASTLINE_KEY, _("Last Line"),
nano_lastline_msg, 0, 0, 0, VIEW, do_last_line);
sc_init_one(&replace_list_2[2], NANO_NULL_KEY, _("Null Str"),
nano_null_msg, 0, 0, 0, VIEW, 0);
sc_init_one(&replace_list_2[3], NANO_CANCEL_KEY, _("Cancel"),
sc_init_one(&replace_list_2[2], NANO_CANCEL_KEY, _("Cancel"),
nano_cancel_msg, 0, 0, 0, VIEW, 0);

3
nano.h
View File

@ -225,7 +225,6 @@ know what you're doing */
#define NANO_SUSPEND_KEY NANO_CONTROL_Z
#define NANO_ENTER_KEY NANO_CONTROL_M
#define NANO_FROMSEARCHTOGOTO_KEY NANO_CONTROL_T
#define NANO_NULL_KEY NANO_CONTROL_N
#define TOGGLE_CONST_KEY NANO_ALT_C
#define TOGGLE_AUTOINDENT_KEY NANO_ALT_I
@ -241,7 +240,7 @@ know what you're doing */
#define MAIN_VISIBLE 12
#define WHEREIS_LIST_LEN 6
#define REPLACE_LIST_LEN 6
#define REPLACE_LIST_2_LEN 4
#define REPLACE_LIST_2_LEN 3
#define GOTO_LIST_LEN 3
#define WRITEFILE_LIST_LEN 1
#define HELP_LIST_LEN 3

View File

@ -67,43 +67,41 @@ const struct _msg_ent _msg_tbl[] = {
{"Insert a carriage return at the cursor position", 58},
{"Make the current search or replace case (in)sensitive", 59},
{"Cancel the current function", 60},
{"Use the null string, \"\"", 61},
{"Get Help", 62},
{"WriteOut", 63},
{"Exit", 64},
{"Goto Line", 65},
{"Justify", 66},
{"Replace", 67},
{"Read File", 68},
{"Where Is", 69},
{"Prev Page", 70},
{"Next Page", 71},
{"Cut Text", 72},
{"UnCut Txt", 73},
{"Cur Pos", 74},
{"To Spell", 75},
{"Up", 76},
{"Down", 77},
{"Forward", 78},
{"Back", 79},
{"Home", 80},
{"End", 81},
{"Refresh", 82},
{"Mark Text", 83},
{"Delete", 84},
{"Backspace", 85},
{"Tab", 86},
{"Enter", 87},
{"First Line", 88},
{"Last Line", 89},
{"Case Sens", 90},
{"Cancel", 91},
{"No Replace", 92},
{"Null Str", 93},
{"Get Help", 61},
{"WriteOut", 62},
{"Exit", 63},
{"Goto Line", 64},
{"Justify", 65},
{"Replace", 66},
{"Read File", 67},
{"Where Is", 68},
{"Prev Page", 69},
{"Next Page", 70},
{"Cut Text", 71},
{"UnCut Txt", 72},
{"Cur Pos", 73},
{"To Spell", 74},
{"Up", 75},
{"Down", 76},
{"Forward", 77},
{"Back", 78},
{"Home", 79},
{"End", 80},
{"Refresh", 81},
{"Mark Text", 82},
{"Delete", 83},
{"Backspace", 84},
{"Tab", 85},
{"Enter", 86},
{"First Line", 87},
{"Last Line", 88},
{"Case Sens", 89},
{"Cancel", 90},
{"No Replace", 91},
{"\
\n\
Buffer written to 'nano.save'\n", 94},
{"Key illegal in VIEW mode", 95},
Buffer written to 'nano.save'\n", 92},
{"Key illegal in VIEW mode", 93},
{"\
nano help text\n\
\n\
@ -121,116 +119,116 @@ Escape-key sequences are notated with the Meta (M) symbol and can be entered \
using either the Esc, Alt or Meta key depending on your keyboard setup. The \
following keystrokes are available in the main editor window. Optional keys \
are shown in parentheses:\n\
\n", 96},
{"free_node(): free'd a node, YAY!\n", 97},
{"free_node(): free'd last node.\n", 98},
\n", 94},
{"free_node(): free'd a node, YAY!\n", 95},
{"free_node(): free'd last node.\n", 96},
{"\
Usage: nano [GNU long option] [option] +LINE <file>\n\
\n", 99},
{"Option\t\tLong option\t\tMeaning\n", 100},
{" -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n", 101},
{" -R\t\t--regexp\t\tUse regular expressions for search\n", 102},
{" -V \t\t--version\t\tPrint version information and exit\n", 103},
{" -c \t\t--const\t\t\tConstantly show cursor position\n", 104},
{" -h \t\t--help\t\t\tShow this message\n", 105},
{" -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n", 106},
{" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 107},
{" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n", 108},
{" -m \t\t--mouse\t\t\tEnable mouse\n", 109},
\n", 97},
{"Option\t\tLong option\t\tMeaning\n", 98},
{" -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n", 99},
{" -R\t\t--regexp\t\tUse regular expressions for search\n", 100},
{" -V \t\t--version\t\tPrint version information and exit\n", 101},
{" -c \t\t--const\t\t\tConstantly show cursor position\n", 102},
{" -h \t\t--help\t\t\tShow this message\n", 103},
{" -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n", 104},
{" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 105},
{" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n", 106},
{" -m \t\t--mouse\t\t\tEnable mouse\n", 107},
{"\
-r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 110},
{" -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n", 111},
{" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 112},
{" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 113},
{" -v \t\t--view\t\t\tView (read only) mode\n", 114},
{" -w \t\t--nowrap\t\tDon't wrap long lines\n", 115},
{" -x \t\t--nohelp\t\tDon't show help window\n", 116},
{" -z \t\t--suspend\t\tEnable suspend\n", 117},
{" +LINE\t\t\t\t\tStart at line number LINE\n", 118},
-r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 108},
{" -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n", 109},
{" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 110},
{" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 111},
{" -v \t\t--view\t\t\tView (read only) mode\n", 112},
{" -w \t\t--nowrap\t\tDon't wrap long lines\n", 113},
{" -x \t\t--nohelp\t\tDon't show help window\n", 114},
{" -z \t\t--suspend\t\tEnable suspend\n", 115},
{" +LINE\t\t\t\t\tStart at line number LINE\n", 116},
{"\
Usage: nano [option] +LINE <file>\n\
\n", 119},
{"Option\t\tMeaning\n", 120},
{" -T [num]\tSet width of a tab to num\n", 121},
{" -R\t\tUse regular expressions for search\n", 122},
{" -V \t\tPrint version information and exit\n", 123},
{" -c \t\tConstantly show cursor position\n", 124},
{" -h \t\tShow this message\n", 125},
{" -k \t\tLet ^K cut from cursor to end of line\n", 126},
{" -i \t\tAutomatically indent new lines\n", 127},
{" -l \t\tDon't follow symbolic links, overwrite\n", 128},
{" -m \t\tEnable mouse\n", 129},
{" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 130},
{" -s [prog] \tEnable alternate speller\n", 131},
{" -p \t\tMake bottom 2 lines more Pico-like\n", 132},
{" -t \t\tAuto save on exit, don't prompt\n", 133},
{" -v \t\tView (read only) mode\n", 134},
{" -w \t\tDon't wrap long lines\n", 135},
{" -x \t\tDon't show help window\n", 136},
{" -z \t\tEnable suspend\n", 137},
{" +LINE\t\tStart at line number LINE\n", 138},
{" nano version %s by Chris Allegretta (compiled %s, %s)\n", 139},
{" Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n", 140},
{"Mark Set", 141},
{"Mark UNset", 142},
{"check_wrap called with inptr->data=\"%s\"\n", 143},
{"current->data now = \"%s\"\n", 144},
{"After, data = \"%s\"\n", 145},
{"Error deleting tempfile, ack!", 146},
{"Could not create a temporary filename: %s", 147},
{"Could not invoke spell program \"%s\"", 148},
{"Could not invoke \"ispell\"", 149},
{"Finished checking spelling", 150},
{"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 151},
{"Cannot resize top win", 152},
{"Cannot move top win", 153},
{"Cannot resize edit win", 154},
{"Cannot move edit win", 155},
{"Cannot resize bottom win", 156},
{"Cannot move bottom win", 157},
{"%s enable/disable", 158},
{"enabled", 159},
{"disabled", 160},
{"Main: set up windows\n", 161},
{"Main: bottom win\n", 162},
{"Main: open file\n", 163},
{"I got Alt-O-%c! (%d)\n", 164},
{"I got Alt-[-1-%c! (%d)\n", 165},
{"I got Alt-[-2-%c! (%d)\n", 166},
{"I got Alt-[-%c! (%d)\n", 167},
{"I got Alt-%c! (%d)\n", 168},
{"Case Sensitive Regexp Search%s%s", 169},
{"Regexp Search%s%s", 170},
{"Case Sensitive Search%s%s", 171},
{"Search%s%s", 172},
{" (to replace)", 173},
{"Search Cancelled", 174},
{"Search Wrapped", 175},
{"Replaced %d occurences", 176},
{"Replaced 1 occurence", 177},
{"Replace Cancelled", 178},
{"Replace with", 179},
{"Replace this instance?", 180},
{"Enter line number", 181},
{"Aborted", 182},
{"Come on, be reasonable", 183},
{"Only %d lines available, skipping to last line", 184},
{"actual_x_from_start for xplus=%d returned %d\n", 185},
{"input '%c' (%d)\n", 186},
{"New Buffer", 187},
{" File: ...", 188},
{"Modified", 189},
{"Moved to (%d, %d) in edit buffer\n", 190},
{"current->data = \"%s\"\n", 191},
{"I got \"%s\"\n", 192},
{"Yes", 193},
{"All", 194},
{"No", 195},
{"do_cursorpos: linepct = %f, bytepct = %f\n", 196},
{"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 197},
{"Dumping file buffer to stderr...\n", 198},
{"Dumping cutbuffer to stderr...\n", 199},
{"Dumping a buffer to stderr...\n", 200},
\n", 117},
{"Option\t\tMeaning\n", 118},
{" -T [num]\tSet width of a tab to num\n", 119},
{" -R\t\tUse regular expressions for search\n", 120},
{" -V \t\tPrint version information and exit\n", 121},
{" -c \t\tConstantly show cursor position\n", 122},
{" -h \t\tShow this message\n", 123},
{" -k \t\tLet ^K cut from cursor to end of line\n", 124},
{" -i \t\tAutomatically indent new lines\n", 125},
{" -l \t\tDon't follow symbolic links, overwrite\n", 126},
{" -m \t\tEnable mouse\n", 127},
{" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 128},
{" -s [prog] \tEnable alternate speller\n", 129},
{" -p \t\tMake bottom 2 lines more Pico-like\n", 130},
{" -t \t\tAuto save on exit, don't prompt\n", 131},
{" -v \t\tView (read only) mode\n", 132},
{" -w \t\tDon't wrap long lines\n", 133},
{" -x \t\tDon't show help window\n", 134},
{" -z \t\tEnable suspend\n", 135},
{" +LINE\t\tStart at line number LINE\n", 136},
{" nano version %s by Chris Allegretta (compiled %s, %s)\n", 137},
{" Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n", 138},
{"Mark Set", 139},
{"Mark UNset", 140},
{"check_wrap called with inptr->data=\"%s\"\n", 141},
{"current->data now = \"%s\"\n", 142},
{"After, data = \"%s\"\n", 143},
{"Error deleting tempfile, ack!", 144},
{"Could not create a temporary filename: %s", 145},
{"Could not invoke spell program \"%s\"", 146},
{"Could not invoke \"ispell\"", 147},
{"Finished checking spelling", 148},
{"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 149},
{"Cannot resize top win", 150},
{"Cannot move top win", 151},
{"Cannot resize edit win", 152},
{"Cannot move edit win", 153},
{"Cannot resize bottom win", 154},
{"Cannot move bottom win", 155},
{"%s enable/disable", 156},
{"enabled", 157},
{"disabled", 158},
{"Main: set up windows\n", 159},
{"Main: bottom win\n", 160},
{"Main: open file\n", 161},
{"I got Alt-O-%c! (%d)\n", 162},
{"I got Alt-[-1-%c! (%d)\n", 163},
{"I got Alt-[-2-%c! (%d)\n", 164},
{"I got Alt-[-%c! (%d)\n", 165},
{"I got Alt-%c! (%d)\n", 166},
{"Case Sensitive Regexp Search%s%s", 167},
{"Regexp Search%s%s", 168},
{"Case Sensitive Search%s%s", 169},
{"Search%s%s", 170},
{" (to replace)", 171},
{"Search Cancelled", 172},
{"Search Wrapped", 173},
{"Replaced %d occurences", 174},
{"Replaced 1 occurence", 175},
{"Replace Cancelled", 176},
{"Replace with", 177},
{"Replace this instance?", 178},
{"Enter line number", 179},
{"Aborted", 180},
{"Come on, be reasonable", 181},
{"Only %d lines available, skipping to last line", 182},
{"actual_x_from_start for xplus=%d returned %d\n", 183},
{"input '%c' (%d)\n", 184},
{"New Buffer", 185},
{" File: ...", 186},
{"Modified", 187},
{"Moved to (%d, %d) in edit buffer\n", 188},
{"current->data = \"%s\"\n", 189},
{"I got \"%s\"\n", 190},
{"Yes", 191},
{"All", 192},
{"No", 193},
{"do_cursorpos: linepct = %f, bytepct = %f\n", 194},
{"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 195},
{"Dumping file buffer to stderr...\n", 196},
{"Dumping cutbuffer to stderr...\n", 197},
{"Dumping a buffer to stderr...\n", 198},
};
int _msg_tbl_length = 200;
int _msg_tbl_length = 198;

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2000-10-31 00:29-0500\n"
"POT-Creation-Date: 2000-10-31 00:31-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -263,139 +263,131 @@ msgstr ""
msgid "Cancel the current function"
msgstr ""
#: global.c:208
msgid "Use the null string, \"\""
msgstr ""
#: global.c:212 global.c:324 global.c:412
#: global.c:211 global.c:323 global.c:408
msgid "Get Help"
msgstr ""
#: global.c:215 global.c:223
#: global.c:214 global.c:222
msgid "WriteOut"
msgstr ""
#: global.c:219 global.c:401
#: global.c:218 global.c:397
msgid "Exit"
msgstr ""
#: global.c:227 global.c:320 global.c:342 global.c:362
#: global.c:226 global.c:319 global.c:341 global.c:361
msgid "Goto Line"
msgstr ""
#: global.c:232 global.c:311
#: global.c:231 global.c:310
msgid "Justify"
msgstr ""
#: global.c:236 global.c:307 global.c:338
#: global.c:235 global.c:306 global.c:337
msgid "Replace"
msgstr ""
#: global.c:240
#: global.c:239
msgid "Read File"
msgstr ""
#: global.c:244
#: global.c:243
msgid "Where Is"
msgstr ""
#: global.c:248 global.c:393
#: global.c:247 global.c:389
msgid "Prev Page"
msgstr ""
#: global.c:252 global.c:397
#: global.c:251 global.c:393
msgid "Next Page"
msgstr ""
#: global.c:256
#: global.c:255
msgid "Cut Text"
msgstr ""
#: global.c:259
#: global.c:258
msgid "UnCut Txt"
msgstr ""
#: global.c:263
#: global.c:262
msgid "Cur Pos"
msgstr ""
#: global.c:267
#: global.c:266
msgid "To Spell"
msgstr ""
#: global.c:271
#: global.c:270
msgid "Up"
msgstr ""
#: global.c:274
#: global.c:273
msgid "Down"
msgstr ""
#: global.c:277
#: global.c:276
msgid "Forward"
msgstr ""
#: global.c:280
#: global.c:279
msgid "Back"
msgstr ""
#: global.c:283
#: global.c:282
msgid "Home"
msgstr ""
#: global.c:286
#: global.c:285
msgid "End"
msgstr ""
#: global.c:289
#: global.c:288
msgid "Refresh"
msgstr ""
#: global.c:292
#: global.c:291
msgid "Mark Text"
msgstr ""
#: global.c:295
#: global.c:294
msgid "Delete"
msgstr ""
#: global.c:299
#: global.c:298
msgid "Backspace"
msgstr ""
#: global.c:303
#: global.c:302
msgid "Tab"
msgstr ""
#: global.c:315
#: global.c:314
msgid "Enter"
msgstr ""
#: global.c:328 global.c:349 global.c:370 global.c:383
#: global.c:327 global.c:348 global.c:369 global.c:379
msgid "First Line"
msgstr ""
#: global.c:331 global.c:352 global.c:373 global.c:386
#: global.c:330 global.c:351 global.c:372 global.c:382
msgid "Last Line"
msgstr ""
#: global.c:334 global.c:355
#: global.c:333 global.c:354
msgid "Case Sens"
msgstr ""
#: global.c:345 global.c:365 global.c:379 global.c:389 global.c:405
#: global.c:409 global.c:415 winio.c:974
#: global.c:344 global.c:364 global.c:375 global.c:385 global.c:401
#: global.c:405 global.c:411 winio.c:974
msgid "Cancel"
msgstr ""
#: global.c:358
#: global.c:357
msgid "No Replace"
msgstr ""
#: global.c:376
msgid "Null Str"
msgstr ""
#: nano.c:115
msgid ""
"\n"
@ -782,24 +774,24 @@ msgstr ""
msgid "Replace with"
msgstr ""
#: search.c:476
#: search.c:473
msgid "Replace this instance?"
msgstr ""
#. Ask for it
#: search.c:537
#: search.c:534
msgid "Enter line number"
msgstr ""
#: search.c:539
#: search.c:536
msgid "Aborted"
msgstr ""
#: search.c:559
#: search.c:556
msgid "Come on, be reasonable"
msgstr ""
#: search.c:564
#: search.c:561
#, c-format
msgid "Only %d lines available, skipping to last line"
msgstr ""

View File

@ -445,9 +445,6 @@ int do_replace(void)
case 0: /* They actually entered something */
strncpy(last_replace, answer, 132);
break;
case NANO_NULL_KEY: /* They want the null string */
strcpy(last_replace, "");
break;
default:
if (i != -2) { /* First page, last page, for example
could get here */