Add a nice (more) tag when there's too many completions

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@272 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/files.c b/files.c
index f12ce4fec6a1ca2f4411e3d8c94141bc0cd955e6..3864623996dca0f7aad2e316c6919cf4f491a450 100644 (file)
--- a/files.c
+++ b/files.c
@@ -726,6 +726,10 @@ int input_tab(char *buf, int place, int lastWasTab)
                if (col > (COLS - longestname)  && matches[i + 1] != NULL) {
                    editline++;
                    wmove(edit, editline, 0);
+                    if (editline == editwinrows - 1) {
+                        waddstr(edit, _("(more)"));
+                        break;
+                    }
                    col = 0;
                }
            }

diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 2a1e64ec405ba63ec1d6aeb4fc79c3c18663b9fa..6a379f0329161708d256d614ccf248a62ba870af 100644 (file)
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -28,80 +28,81 @@ const struct _msg_ent _msg_tbl[] = {
   {"File Name to write", 19},
   {"filename is %s", 20},
   {"File exists, OVERWRITE ?", 21},
-  {"Constant cursor position", 22},
-  {"Auto indent", 23},
-  {"Suspend", 24},
-  {"Help mode", 25},
-  {"Pico messages", 26},
-  {"Mouse support", 27},
-  {"Cut to end", 28},
-  {"Regular expressions", 29},
-  {"Auto wrap", 30},
-  {"Invoke the help menu", 31},
-  {"Write the current file to disk", 32},
-  {"Exit from nano", 33},
-  {"Goto a specific line number", 34},
-  {"Justify the current paragraph", 35},
-  {"Replace text within the editor", 36},
-  {"Insert another file into the current one", 37},
-  {"Search for text within the editor", 38},
-  {"Move to the previous screen", 39},
-  {"Move to the next screen", 40},
-  {"Cut the current line and store it in the cutbuffer", 41},
-  {"Uncut from the cutbuffer into the current line", 42},
-  {"Show the posititon of the cursor", 43},
-  {"Invoke the spell checker (if available)", 44},
-  {"Move up one line", 45},
-  {"Move down one line", 46},
-  {"Move forward one character", 47},
-  {"Move back one character", 48},
-  {"Move to the beginning of the current line", 49},
-  {"Move to the end of the current line", 50},
-  {"Go to the first line of the file", 51},
-  {"Go to the last line of the file", 52},
-  {"Refresh (redraw) the current screen", 53},
-  {"Mark text at the current cursor location", 54},
-  {"Delete the character under the cursor", 55},
-  {"Delete the character to the left of the cursor", 56},
-  {"Insert a tab character", 57},
-  {"Insert a carriage return at the cursor position", 58},
-  {"Make the current search or replace case (in)sensitive", 59},
-  {"Cancel the current function", 60},
-  {"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},
+  {"(more)", 22},
+  {"Constant cursor position", 23},
+  {"Auto indent", 24},
+  {"Suspend", 25},
+  {"Help mode", 26},
+  {"Pico messages", 27},
+  {"Mouse support", 28},
+  {"Cut to end", 29},
+  {"Regular expressions", 30},
+  {"Auto wrap", 31},
+  {"Invoke the help menu", 32},
+  {"Write the current file to disk", 33},
+  {"Exit from nano", 34},
+  {"Goto a specific line number", 35},
+  {"Justify the current paragraph", 36},
+  {"Replace text within the editor", 37},
+  {"Insert another file into the current one", 38},
+  {"Search for text within the editor", 39},
+  {"Move to the previous screen", 40},
+  {"Move to the next screen", 41},
+  {"Cut the current line and store it in the cutbuffer", 42},
+  {"Uncut from the cutbuffer into the current line", 43},
+  {"Show the posititon of the cursor", 44},
+  {"Invoke the spell checker (if available)", 45},
+  {"Move up one line", 46},
+  {"Move down one line", 47},
+  {"Move forward one character", 48},
+  {"Move back one character", 49},
+  {"Move to the beginning of the current line", 50},
+  {"Move to the end of the current line", 51},
+  {"Go to the first line of the file", 52},
+  {"Go to the last line of the file", 53},
+  {"Refresh (redraw) the current screen", 54},
+  {"Mark text at the current cursor location", 55},
+  {"Delete the character under the cursor", 56},
+  {"Delete the character to the left of the cursor", 57},
+  {"Insert a tab character", 58},
+  {"Insert a carriage return at the cursor position", 59},
+  {"Make the current search or replace case (in)sensitive", 60},
+  {"Cancel the current function", 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},
   {"\
 \n\
-Buffer written to 'nano.save'\n", 92},
-  {"Key illegal in VIEW mode", 93},
+Buffer written to 'nano.save'\n", 93},
+  {"Key illegal in VIEW mode", 94},
   {"\
  nano help text\n\
 \n\
@@ -119,120 +120,120 @@ 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", 94},
-  {"free_node(): free'd a node, YAY!\n", 95},
-  {"free_node(): free'd last node.\n", 96},
+\n", 95},
+  {"free_node(): free'd a node, YAY!\n", 96},
+  {"free_node(): free'd last node.\n", 97},
   {"\
 Usage: nano [GNU long option] [option] +LINE <file>\n\
-\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},
+\n", 98},
+  {"Option\t\tLong option\t\tMeaning\n", 99},
+  {" -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n", 100},
+  {" -R\t\t--regexp\t\tUse regular expressions for search\n", 101},
+  {" -V \t\t--version\t\tPrint version information and exit\n", 102},
+  {" -c \t\t--const\t\t\tConstantly show cursor position\n", 103},
+  {" -h \t\t--help\t\t\tShow this message\n", 104},
+  {" -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n", 105},
+  {" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 106},
+  {" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n", 107},
+  {" -m \t\t--mouse\t\t\tEnable mouse\n", 108},
   {"\
- -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},
+ -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 109},
+  {" -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n", 110},
+  {" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 111},
+  {" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 112},
+  {" -v \t\t--view\t\t\tView (read only) mode\n", 113},
+  {" -w \t\t--nowrap\t\tDon't wrap long lines\n", 114},
+  {" -x \t\t--nohelp\t\tDon't show help window\n", 115},
+  {" -z \t\t--suspend\t\tEnable suspend\n", 116},
+  {" +LINE\t\t\t\t\tStart at line number LINE\n", 117},
   {"\
 Usage: nano [option] +LINE <file>\n\
-\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},
-  {"Edit a replacement", 145},
-  {"Could not create a temporary filename: %s", 146},
-  {"Finished checking spelling", 147},
-  {"Spell checking failed", 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},
-  {"Justify Complete", 156},
-  {"%s enable/disable", 157},
-  {"enabled", 158},
-  {"disabled", 159},
-  {"Main: set up windows\n", 160},
-  {"Main: bottom win\n", 161},
-  {"Main: open file\n", 162},
-  {"I got Alt-O-%c! (%d)\n", 163},
-  {"I got Alt-[-1-%c! (%d)\n", 164},
-  {"I got Alt-[-2-%c! (%d)\n", 165},
-  {"I got Alt-[-%c! (%d)\n", 166},
-  {"I got Alt-%c! (%d)\n", 167},
-  {"Case Sensitive Regexp Search%s%s", 168},
-  {"Regexp Search%s%s", 169},
-  {"Case Sensitive Search%s%s", 170},
-  {"Search%s%s", 171},
-  {" (to replace)", 172},
-  {"Search Cancelled", 173},
-  {"\"%s...\" not found", 174},
-  {"Search Wrapped", 175},
-  {"Replaced %d occurences", 176},
-  {"Replaced 1 occurence", 177},
-  {"Replace Cancelled", 178},
-  {"Replace this instance?", 179},
-  {"Replace failed: unknown subexpression!", 180},
-  {"Replace with [%s]", 181},
-  {"Replace with", 182},
-  {"Enter line number", 183},
-  {"Aborted", 184},
-  {"Come on, be reasonable", 185},
-  {"Only %d lines available, skipping to last line", 186},
-  {"actual_x_from_start for xplus=%d returned %d\n", 187},
-  {"input '%c' (%d)\n", 188},
-  {"New Buffer", 189},
-  {"  File: ...", 190},
-  {"Modified", 191},
-  {"Moved to (%d, %d) in edit buffer\n", 192},
-  {"current->data = \"%s\"\n", 193},
-  {"I got \"%s\"\n", 194},
-  {"Yes", 195},
-  {"All", 196},
-  {"No", 197},
-  {"do_cursorpos: linepct = %f, bytepct = %f\n", 198},
-  {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 199},
-  {"Dumping file buffer to stderr...\n", 200},
-  {"Dumping cutbuffer to stderr...\n", 201},
-  {"Dumping a buffer to stderr...\n", 202},
+\n", 118},
+  {"Option\t\tMeaning\n", 119},
+  {" -T [num]\tSet width of a tab to num\n", 120},
+  {" -R\t\tUse regular expressions for search\n", 121},
+  {" -V \t\tPrint version information and exit\n", 122},
+  {" -c \t\tConstantly show cursor position\n", 123},
+  {" -h \t\tShow this message\n", 124},
+  {" -k \t\tLet ^K cut from cursor to end of line\n", 125},
+  {" -i \t\tAutomatically indent new lines\n", 126},
+  {" -l \t\tDon't follow symbolic links, overwrite\n", 127},
+  {" -m \t\tEnable mouse\n", 128},
+  {" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 129},
+  {" -s [prog]  \tEnable alternate speller\n", 130},
+  {" -p \t\tMake bottom 2 lines more Pico-like\n", 131},
+  {" -t \t\tAuto save on exit, don't prompt\n", 132},
+  {" -v \t\tView (read only) mode\n", 133},
+  {" -w \t\tDon't wrap long lines\n", 134},
+  {" -x \t\tDon't show help window\n", 135},
+  {" -z \t\tEnable suspend\n", 136},
+  {" +LINE\t\tStart at line number LINE\n", 137},
+  {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 138},
+  {" Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n", 139},
+  {"Mark Set", 140},
+  {"Mark UNset", 141},
+  {"check_wrap called with inptr->data=\"%s\"\n", 142},
+  {"current->data now = \"%s\"\n", 143},
+  {"After, data = \"%s\"\n", 144},
+  {"Error deleting tempfile, ack!", 145},
+  {"Edit a replacement", 146},
+  {"Could not create a temporary filename: %s", 147},
+  {"Finished checking spelling", 148},
+  {"Spell checking failed", 149},
+  {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 150},
+  {"Cannot resize top win", 151},
+  {"Cannot move top win", 152},
+  {"Cannot resize edit win", 153},
+  {"Cannot move edit win", 154},
+  {"Cannot resize bottom win", 155},
+  {"Cannot move bottom win", 156},
+  {"Justify Complete", 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},
+  {"\"%s...\" not found", 175},
+  {"Search Wrapped", 176},
+  {"Replaced %d occurences", 177},
+  {"Replaced 1 occurence", 178},
+  {"Replace Cancelled", 179},
+  {"Replace this instance?", 180},
+  {"Replace failed: unknown subexpression!", 181},
+  {"Replace with [%s]", 182},
+  {"Replace with", 183},
+  {"Enter line number", 184},
+  {"Aborted", 185},
+  {"Come on, be reasonable", 186},
+  {"Only %d lines available, skipping to last line", 187},
+  {"actual_x_from_start for xplus=%d returned %d\n", 188},
+  {"input '%c' (%d)\n", 189},
+  {"New Buffer", 190},
+  {"  File: ...", 191},
+  {"Modified", 192},
+  {"Moved to (%d, %d) in edit buffer\n", 193},
+  {"current->data = \"%s\"\n", 194},
+  {"I got \"%s\"\n", 195},
+  {"Yes", 196},
+  {"All", 197},
+  {"No", 198},
+  {"do_cursorpos: linepct = %f, bytepct = %f\n", 199},
+  {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 200},
+  {"Dumping file buffer to stderr...\n", 201},
+  {"Dumping cutbuffer to stderr...\n", 202},
+  {"Dumping a buffer to stderr...\n", 203},
 };
 
-int _msg_tbl_length = 202;
+int _msg_tbl_length = 203;

diff --git a/po/nano.pot b/po/nano.pot
index b817fa21c99813500d38829ae2fd806cd8a8de8b..69a030aa9497614934fb98fb79490d9ce1d0767b 100644 (file)
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-11-05 21:55-0500\n"
+"POT-Creation-Date: 2000-11-05 21:59-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"
@@ -107,6 +107,10 @@ msgstr ""
 msgid "File exists, OVERWRITE ?"
 msgstr ""
 
+#: files.c:730
+msgid "(more)"
+msgstr ""
+
 #: global.c:124
 msgid "Constant cursor position"
 msgstr ""