Oops, I guess that's MY right alt key also =). And right control is ASCII 543

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

ChangeLog

@@ -8,8 +8,8 @@ CVS code -
 	  username_tab_completion is more than a stub now =-).
 	- New options --enable-extra.  New code in nano.c:version() to 
 	  print out various options from ./configure, function do_credits().
-	- Ignore key sequence 545, Alt-Gr key on german keyboard.  Affects
-	  main() and winio.c:nanogetstr().
+	- Ignore key sequence 543 & 545, right control and alt keys in
+	  windows. Affects main() and winio.c:nanogetstr().
 - files.c:
   write_file()
 	- Unsetting modified on temp files bug fixed (Rocco Corsi).

nano.c

@@ -2394,11 +2394,12 @@ int main(int argc, char *argv[])
 	    case 331:		/* Stuff that we don't want to do squat */
 	    case -1:
 	    case 410:		/* Must ignore this, it gets sent when we resize */
-	    case 545:		/* Alt-Gr on Gernam keyboard */
 #ifdef PDCURSES
 	    case 541:		/* ???? */
 	    case 542:		/* Control and alt in Windows *shrug* */
+	    case 543:		/* Right ctrl key */
 	    case 544:
+	    case 545:		/* Right alt key */
 #endif
 
 		break;

po/nano.pot

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-11-29 18:39-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: cut.c:44
+#, c-format
+msgid "add_to_cutbuffer called with inptr->data = %s\n"
+msgstr ""
+
+#: cut.c:150
+msgid "Blew away cutbuffer =)\n"
+msgstr ""
+
+#: files.c:122
+msgid "read_line: not on first line and prev is NULL"
+msgstr ""
+
+#: files.c:184 files.c:201
+#, c-format
+msgid "Read %d lines"
+msgstr ""
+
+#: files.c:219 search.c:188
+#, c-format
+msgid "\"%s\" not found"
+msgstr ""
+
+#. We have a new file
+#: files.c:223
+msgid "New File"
+msgstr ""
+
+#: files.c:232
+#, c-format
+msgid "File \"%s\" is a directory"
+msgstr ""
+
+#: files.c:238
+msgid "Reading File"
+msgstr ""
+
+#: files.c:252
+msgid "File to insert [from ./] "
+msgstr ""
+
+#: files.c:280 files.c:305 files.c:513 nano.c:1381
+msgid "Cancelled"
+msgstr ""
+
+#: files.c:335 files.c:356 files.c:370 files.c:387 files.c:393
+#, c-format
+msgid "Could not open file for writing: %s"
+msgstr ""
+
+#: files.c:344
+msgid "Could not open file: Path length exceeded."
+msgstr ""
+
+#: files.c:375
+#, c-format
+msgid "Wrote >%s\n"
+msgstr ""
+
+#: files.c:402
+#, c-format
+msgid "Could not close %s: %s"
+msgstr ""
+
+#. Try a rename??
+#: files.c:423 files.c:434 files.c:439
+#, c-format
+msgid "Could not open %s for writing: %s"
+msgstr ""
+
+#: files.c:445
+#, c-format
+msgid "Could not set permissions %o on %s: %s"
+msgstr ""
+
+#: files.c:452
+#, c-format
+msgid "Wrote %d lines"
+msgstr ""
+
+#: files.c:484
+msgid "File Name to write"
+msgstr ""
+
+#: files.c:489
+#, c-format
+msgid "filename is %s"
+msgstr ""
+
+#: files.c:502
+msgid "File exists, OVERWRITE ?"
+msgstr ""
+
+#: files.c:991
+msgid "(more)"
+msgstr ""
+
+#: global.c:124
+msgid "Constant cursor position"
+msgstr ""
+
+#: global.c:125
+msgid "Auto indent"
+msgstr ""
+
+#: global.c:126
+msgid "Suspend"
+msgstr ""
+
+#: global.c:127
+msgid "Help mode"
+msgstr ""
+
+#: global.c:128
+msgid "Pico mode"
+msgstr ""
+
+#: global.c:129
+msgid "Mouse support"
+msgstr ""
+
+#: global.c:130
+msgid "Cut to end"
+msgstr ""
+
+#: global.c:132
+msgid "Regular expressions"
+msgstr ""
+
+#: global.c:134
+msgid "Auto wrap"
+msgstr ""
+
+#: global.c:176
+msgid "Invoke the help menu"
+msgstr ""
+
+#: global.c:177
+msgid "Write the current file to disk"
+msgstr ""
+
+#: global.c:178
+msgid "Exit from nano"
+msgstr ""
+
+#: global.c:179
+msgid "Goto a specific line number"
+msgstr ""
+
+#: global.c:180
+msgid "Justify the current paragraph"
+msgstr ""
+
+#: global.c:181
+msgid "Unjustify after a justify"
+msgstr ""
+
+#: global.c:182
+msgid "Replace text within the editor"
+msgstr ""
+
+#: global.c:183
+msgid "Insert another file into the current one"
+msgstr ""
+
+#: global.c:184
+msgid "Search for text within the editor"
+msgstr ""
+
+#: global.c:185
+msgid "Move to the previous screen"
+msgstr ""
+
+#: global.c:186
+msgid "Move to the next screen"
+msgstr ""
+
+#: global.c:187
+msgid "Cut the current line and store it in the cutbuffer"
+msgstr ""
+
+#: global.c:188
+msgid "Uncut from the cutbuffer into the current line"
+msgstr ""
+
+#: global.c:189
+msgid "Show the posititon of the cursor"
+msgstr ""
+
+#: global.c:190
+msgid "Invoke the spell checker (if available)"
+msgstr ""
+
+#: global.c:191
+msgid "Move up one line"
+msgstr ""
+
+#: global.c:192
+msgid "Move down one line"
+msgstr ""
+
+#: global.c:193
+msgid "Move forward one character"
+msgstr ""
+
+#: global.c:194
+msgid "Move back one character"
+msgstr ""
+
+#: global.c:195
+msgid "Move to the beginning of the current line"
+msgstr ""
+
+#: global.c:196
+msgid "Move to the end of the current line"
+msgstr ""
+
+#: global.c:197
+msgid "Go to the first line of the file"
+msgstr ""
+
+#: global.c:198
+msgid "Go to the last line of the file"
+msgstr ""
+
+#: global.c:199
+msgid "Refresh (redraw) the current screen"
+msgstr ""
+
+#: global.c:200
+msgid "Mark text at the current cursor location"
+msgstr ""
+
+#: global.c:201
+msgid "Delete the character under the cursor"
+msgstr ""
+
+#: global.c:203
+msgid "Delete the character to the left of the cursor"
+msgstr ""
+
+#: global.c:204
+msgid "Insert a tab character"
+msgstr ""
+
+#: global.c:205
+msgid "Insert a carriage return at the cursor position"
+msgstr ""
+
+#: global.c:207
+msgid "Make the current search or replace case (in)sensitive"
+msgstr ""
+
+#: global.c:208
+msgid "Cancel the current function"
+msgstr ""
+
+#: global.c:212 global.c:328 global.c:413
+msgid "Get Help"
+msgstr ""
+
+#: global.c:215 global.c:223
+msgid "WriteOut"
+msgstr ""
+
+#: global.c:219 global.c:402
+msgid "Exit"
+msgstr ""
+
+#: global.c:227 global.c:324 global.c:346 global.c:366
+msgid "Goto Line"
+msgstr ""
+
+#: global.c:232 global.c:315
+msgid "Justify"
+msgstr ""
+
+#: global.c:236 global.c:311 global.c:342
+msgid "Replace"
+msgstr ""
+
+#: global.c:240
+msgid "Read File"
+msgstr ""
+
+#: global.c:244
+msgid "Where Is"
+msgstr ""
+
+#: global.c:248 global.c:394
+msgid "Prev Page"
+msgstr ""
+
+#: global.c:252 global.c:398
+msgid "Next Page"
+msgstr ""
+
+#: global.c:256
+msgid "Cut Text"
+msgstr ""
+
+#: global.c:260
+msgid "UnJustify"
+msgstr ""
+
+#: global.c:263
+msgid "UnCut Txt"
+msgstr ""
+
+#: global.c:267
+msgid "Cur Pos"
+msgstr ""
+
+#: global.c:271
+msgid "To Spell"
+msgstr ""
+
+#: global.c:275
+msgid "Up"
+msgstr ""
+
+#: global.c:278
+msgid "Down"
+msgstr ""
+
+#: global.c:281
+msgid "Forward"
+msgstr ""
+
+#: global.c:284
+msgid "Back"
+msgstr ""
+
+#: global.c:287
+msgid "Home"
+msgstr ""
+
+#: global.c:290
+msgid "End"
+msgstr ""
+
+#: global.c:293
+msgid "Refresh"
+msgstr ""
+
+#: global.c:296
+msgid "Mark Text"
+msgstr ""
+
+#: global.c:299
+msgid "Delete"
+msgstr ""
+
+#: global.c:303
+msgid "Backspace"
+msgstr ""
+
+#: global.c:307
+msgid "Tab"
+msgstr ""
+
+#: global.c:319
+msgid "Enter"
+msgstr ""
+
+#: global.c:332 global.c:353 global.c:374 global.c:384
+msgid "First Line"
+msgstr ""
+
+#: global.c:335 global.c:356 global.c:377 global.c:387
+msgid "Last Line"
+msgstr ""
+
+#: global.c:338 global.c:359
+msgid "Case Sens"
+msgstr ""
+
+#: global.c:349 global.c:369 global.c:380 global.c:390 global.c:406
+#: global.c:410 global.c:416 winio.c:1028
+msgid "Cancel"
+msgstr ""
+
+#: global.c:362
+msgid "No Replace"
+msgstr ""
+
+#: nano.c:131
+msgid ""
+"\n"
+"Buffer written to 'nano.save'\n"
+msgstr ""
+
+#: nano.c:138
+msgid "Key illegal in VIEW mode"
+msgstr ""
+
+#: nano.c:175
+msgid ""
+" nano help text\n"
+"\n"
+" The nano editor is designed to emulate the functionality and ease-of-use of "
+"the UW Pico text editor.  There are four main sections of the editor: The "
+"top line shows the program version, the current filename being edited, and "
+"whether or not the file has been modified.  Next is the main editor window "
+"showing the file being edited.  The status line is the third line from the "
+"bottom and shows important messages. The bottom two lines show the most "
+"commonly used shortcuts in the editor.\n"
+"\n"
+" The notation for shortcuts is as follows: Control-key sequences are notated "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"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"
+msgstr ""
+
+#: nano.c:278
+msgid "free_node(): free'd a node, YAY!\n"
+msgstr ""
+
+#: nano.c:283
+msgid "free_node(): free'd last node.\n"
+msgstr ""
+
+#: nano.c:335
+msgid ""
+"Usage: nano [GNU long option] [option] +LINE <file>\n"
+"\n"
+msgstr ""
+
+#: nano.c:336
+msgid "Option\t\tLong option\t\tMeaning\n"
+msgstr ""
+
+#: nano.c:338
+msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
+msgstr ""
+
+#: nano.c:341
+msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
+msgstr ""
+
+#: nano.c:345
+msgid " -V \t\t--version\t\tPrint version information and exit\n"
+msgstr ""
+
+#: nano.c:347
+msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
+msgstr ""
+
+#: nano.c:349
+msgid " -h \t\t--help\t\t\tShow this message\n"
+msgstr ""
+
+#: nano.c:352
+msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:355
+msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
+msgstr ""
+
+#: nano.c:357
+msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
+msgstr ""
+
+#: nano.c:360
+msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
+msgstr ""
+
+#: nano.c:365
+msgid ""
+" -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
+msgstr ""
+
+#: nano.c:367
+msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
+msgstr ""
+
+#: nano.c:369
+msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
+msgstr ""
+
+#: nano.c:371
+msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
+msgstr ""
+
+#: nano.c:373
+msgid " -v \t\t--view\t\t\tView (read only) mode\n"
+msgstr ""
+
+#: nano.c:375
+msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
+msgstr ""
+
+#: nano.c:377
+msgid " -x \t\t--nohelp\t\tDon't show help window\n"
+msgstr ""
+
+#: nano.c:379
+msgid " -z \t\t--suspend\t\tEnable suspend\n"
+msgstr ""
+
+#: nano.c:381
+msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
+msgstr ""
+
+#: nano.c:383
+msgid ""
+"Usage: nano [option] +LINE <file>\n"
+"\n"
+msgstr ""
+
+#: nano.c:384
+msgid "Option\t\tMeaning\n"
+msgstr ""
+
+#: nano.c:385
+msgid " -T [num]\tSet width of a tab to num\n"
+msgstr ""
+
+#: nano.c:386
+msgid " -R\t\tUse regular expressions for search\n"
+msgstr ""
+
+#: nano.c:387
+msgid " -V \t\tPrint version information and exit\n"
+msgstr ""
+
+#: nano.c:388
+msgid " -c \t\tConstantly show cursor position\n"
+msgstr ""
+
+#: nano.c:389
+msgid " -h \t\tShow this message\n"
+msgstr ""
+
+#: nano.c:391
+msgid " -k \t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:393
+msgid " -i \t\tAutomatically indent new lines\n"
+msgstr ""
+
+#: nano.c:395
+msgid " -l \t\tDon't follow symbolic links, overwrite\n"
+msgstr ""
+
+#: nano.c:398
+msgid " -m \t\tEnable mouse\n"
+msgstr ""
+
+#: nano.c:402
+msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
+msgstr ""
+
+#: nano.c:403
+msgid " -s [prog]  \tEnable alternate speller\n"
+msgstr ""
+
+#: nano.c:404
+msgid " -p \t\tEmulate Pico as closely as possible\n"
+msgstr ""
+
+#: nano.c:405
+msgid " -t \t\tAuto save on exit, don't prompt\n"
+msgstr ""
+
+#: nano.c:406
+msgid " -v \t\tView (read only) mode\n"
+msgstr ""
+
+#: nano.c:407
+msgid " -w \t\tDon't wrap long lines\n"
+msgstr ""
+
+#: nano.c:408
+msgid " -x \t\tDon't show help window\n"
+msgstr ""
+
+#: nano.c:409
+msgid " -z \t\tEnable suspend\n"
+msgstr ""
+
+#: nano.c:410
+msgid " +LINE\t\tStart at line number LINE\n"
+msgstr ""
+
+#: nano.c:417
+#, c-format
+msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
+msgstr ""
+
+#: nano.c:420
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
+msgstr ""
+
+#: nano.c:423
+msgid ""
+"\n"
+" Compiled options:"
+msgstr ""
+
+#: nano.c:473
+msgid "Mark Set"
+msgstr ""
+
+#: nano.c:478
+msgid "Mark UNset"
+msgstr ""
+
+#: nano.c:905
+#, c-format
+msgid "check_wrap called with inptr->data=\"%s\"\n"
+msgstr ""
+
+#: nano.c:956
+#, c-format
+msgid "current->data now = \"%s\"\n"
+msgstr ""
+
+#: nano.c:1009
+#, c-format
+msgid "After, data = \"%s\"\n"
+msgstr ""
+
+#: nano.c:1109
+msgid "Edit a replacement"
+msgstr ""
+
+#: nano.c:1330
+#, c-format
+msgid "Could not create a temporary filename: %s"
+msgstr ""
+
+#: nano.c:1346
+msgid "Finished checking spelling"
+msgstr ""
+
+#: nano.c:1348
+msgid "Spell checking failed"
+msgstr ""
+
+#: nano.c:1368
+msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+msgstr ""
+
+#: nano.c:1531
+msgid "Cannot resize top win"
+msgstr ""
+
+#: nano.c:1533
+msgid "Cannot move top win"
+msgstr ""
+
+#: nano.c:1535
+msgid "Cannot resize edit win"
+msgstr ""
+
+#: nano.c:1537
+msgid "Cannot move edit win"
+msgstr ""
+
+#: nano.c:1539
+msgid "Cannot resize bottom win"
+msgstr ""
+
+#: nano.c:1541
+msgid "Cannot move bottom win"
+msgstr ""
+
+#: nano.c:1823
+msgid "Can now UnJustify!"
+msgstr ""
+
+#: nano.c:1921
+#, c-format
+msgid "%s enable/disable"
+msgstr ""
+
+#: nano.c:1933
+msgid "enabled"
+msgstr ""
+
+#: nano.c:1934
+msgid "disabled"
+msgstr ""
+
+#: nano.c:2164
+msgid "Main: set up windows\n"
+msgstr ""
+
+#: nano.c:2177
+msgid "Main: bottom win\n"
+msgstr ""
+
+#: nano.c:2183
+msgid "Main: open file\n"
+msgstr ""
+
+#: nano.c:2220
+#, c-format
+msgid "I got Alt-O-%c! (%d)\n"
+msgstr ""
+
+#: nano.c:2242
+#, c-format
+msgid "I got Alt-[-1-%c! (%d)\n"
+msgstr ""
+
+#: nano.c:2275
+#, c-format
+msgid "I got Alt-[-2-%c! (%d)\n"
+msgstr ""
+
+#: nano.c:2323
+#, c-format
+msgid "I got Alt-[-%c! (%d)\n"
+msgstr ""
+
+#: nano.c:2349
+#, c-format
+msgid "I got Alt-%c! (%d)\n"
+msgstr ""
+
+#: search.c:118
+#, c-format
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr ""
+
+#: search.c:120
+#, c-format
+msgid "Regexp Search%s%s"
+msgstr ""
+
+#: search.c:122
+#, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr ""
+
+#: search.c:124
+#, c-format
+msgid "Search%s%s"
+msgstr ""
+
+#: search.c:127
+msgid " (to replace)"
+msgstr ""
+
+#: search.c:136 search.c:321
+msgid "Search Cancelled"
+msgstr ""
+
+#: search.c:194
+#, c-format
+msgid "\"%s...\" not found"
+msgstr ""
+
+#: search.c:243
+msgid "Search Wrapped"
+msgstr ""
+
+#: search.c:343
+#, c-format
+msgid "Replaced %d occurences"
+msgstr ""
+
+#: search.c:345
+msgid "Replaced 1 occurence"
+msgstr ""
+
+#: search.c:504 search.c:608 search.c:624
+msgid "Replace Cancelled"
+msgstr ""
+
+#: search.c:554
+msgid "Replace this instance?"
+msgstr ""
+
+#: search.c:566
+msgid "Replace failed: unknown subexpression!"
+msgstr ""
+
+#: search.c:649
+#, c-format
+msgid "Replace with [%s]"
+msgstr ""
+
+#: search.c:653 search.c:657
+msgid "Replace with"
+msgstr ""
+
+#. Ask for it
+#: search.c:692
+msgid "Enter line number"
+msgstr ""
+
+#: search.c:694
+msgid "Aborted"
+msgstr ""
+
+#: search.c:714
+msgid "Come on, be reasonable"
+msgstr ""
+
+#: search.c:719
+#, c-format
+msgid "Only %d lines available, skipping to last line"
+msgstr ""
+
+#: winio.c:121
+#, c-format
+msgid "actual_x_from_start for xplus=%d returned %d\n"
+msgstr ""
+
+#: winio.c:441
+#, c-format
+msgid "input '%c' (%d)\n"
+msgstr ""
+
+#: winio.c:479
+msgid "New Buffer"
+msgstr ""
+
+#: winio.c:482
+msgid "  File: ..."
+msgstr ""
+
+#: winio.c:490
+msgid "Modified"
+msgstr ""
+
+#: winio.c:942
+#, c-format
+msgid "Moved to (%d, %d) in edit buffer\n"
+msgstr ""
+
+#: winio.c:953
+#, c-format
+msgid "current->data = \"%s\"\n"
+msgstr ""
+
+#: winio.c:998
+#, c-format
+msgid "I got \"%s\"\n"
+msgstr ""
+
+#: winio.c:1023
+msgid "Yes"
+msgstr ""
+
+#: winio.c:1025
+msgid "All"
+msgstr ""
+
+#: winio.c:1027
+msgid "No"
+msgstr ""
+
+#: winio.c:1164
+#, c-format
+msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
+msgstr ""
+
+#: winio.c:1168
+msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
+msgstr ""
+
+#: winio.c:1296
+msgid "Dumping file buffer to stderr...\n"
+msgstr ""
+
+#: winio.c:1298
+msgid "Dumping cutbuffer to stderr...\n"
+msgstr ""
+
+#: winio.c:1300
+msgid "Dumping a buffer to stderr...\n"
+msgstr ""
+
+#: winio.c:1341
+msgid "The nano text editor"
+msgstr ""
+
+#: winio.c:1342
+msgid "version "
+msgstr ""
+
+#: winio.c:1343
+msgid "Brought to you by:"
+msgstr ""
+
+#: winio.c:1344
+msgid "Special thanks to:"
+msgstr ""
+
+#: winio.c:1345
+msgid "The Free Software Foundation"
+msgstr ""
+
+#: winio.c:1346
+msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
+msgstr ""
+
+#: winio.c:1347
+msgid "and anyone else we forgot..."
+msgstr ""
+
+#: winio.c:1348
+msgid "Thank you for using nano!\n"
+msgstr ""

winio.c

@@ -291,11 +291,12 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 	    ungetch(13);	/* Enter on iris-ansi $TERM, sometimes */
 	    break;
 	/* Stuff we want to ignore */
-	case 545: 			/* German Alt-Gr key */
 #ifdef PDCURSES
 	case 541:
 	case 542:
+	case 543:			/* Right ctrl again */
 	case 544:
+	case 545: 			/* Right alt again */
 #endif
 		break;
 	case KEY_HOME: