Commit 1cc0b7fd authored by Chris Allegretta's avatar Chris Allegretta
Browse files

Fixed bug #45, stupid...

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@262 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
No related merge requests found
Showing with 1228 additions and 1165 deletions
+1228 -1165
......@@ -43,6 +43,8 @@
until a pageup/down occurs (22)[FIXED]
- In search/replace code there is too much refreshing in bottomwin (26)
[FIXED]
- In replace, there is no way to accept the default replace string. (27)
[FIXED]
- Using nano -t, user can not exit until a filename is given via ^O. (30)
[FIXED]
- Using -k cut text is not pasted properly. (34) [FIXED].
......@@ -65,6 +67,8 @@
- The keypad does not work when nano runs in the Gnome terminal (43). [FIXED]
- When reading in a file, if the file is a directory the contents of the
file being edited are blown away (discovered by Chris Pimlot) (44). [FIXED]
- in certain terms, nano will leave a "ghost" of screen upon exit
when called from inside mutt (among other settings) (45). [FIXED]
- In replace, hitting the Goto line shortcut key does nothing after a
search string is entered (discovered by Rocco Corsi) (46) [FIXED].
......@@ -75,9 +79,6 @@
the new line. (8) { Is this an issue? compare to pico 3.5 }
- Spelling support is not elegant like pico's integration of the 'spell'
program. Nano only uses ispell (for now) (12).
- In replace, there is no way to accept the default replace string. (27)
- totsize problems still abound in do_justify (33).
- in certain terms, nano will leave a "ghost" of screen upon exit
when called from inside mutt (among other settings) (45).
$Id$
......@@ -22,6 +22,11 @@ CVS Code -
toggle_init()
- Added #ifdef around toggle_regex_msg to get rid of compiler
warning.
- nano.c:
keypad_on()
- New function, toggles turning the keypad on and off in edit and
bottomwin(). Added call to this in finish(), fixes bug #45.
- search.c
findnexstr()
- New arg for begin_x variable, basically a rewrite that
......
......@@ -66,6 +66,12 @@ static char *help_text_init = "";
/* Initial message, not including shortcuts */
static struct sigaction act; /* For all out fun signal handlers */
void keypad_on(int yesno)
{
keypad(edit, yesno);
keypad(bottomwin, yesno);
}
/* What we do when we're all set to exit */
RETSIGTYPE finish(int sigage)
{
......@@ -74,7 +80,11 @@ RETSIGTYPE finish(int sigage)
mvwaddstr(bottomwin, 2, 0, hblank);
} else
mvwaddstr(bottomwin, 0, 0, hblank);
/* Apparently you REALLY can't get away with not calling keypad()
or your window looks awful when it exits. so we just call it right
before we exit, muhaha :-) */
keypad_on(TRUE);
wrefresh(bottomwin);
endwin();
......@@ -122,6 +132,7 @@ void print_view_warning(void)
statusbar(_("Key illegal in VIEW mode"));
}
/* Initialize global variables - no better way for now */
void global_init(void)
{
......@@ -1356,16 +1367,14 @@ void mouse_init(void)
#ifndef NANO_SMALL
#ifdef NCURSES_MOUSE_VERSION
if (ISSET(USE_MOUSE)) {
keypad(edit, TRUE);
keypad(bottomwin, TRUE);
keypad_on(TRUE);
mousemask(BUTTON1_RELEASED, NULL);
mouseinterval(50);
} else {
mousemask(0, NULL);
keypad(edit, FALSE);
keypad(bottomwin, FALSE);
keypad_on(FALSE);
}
#endif
#endif
......@@ -1884,8 +1893,7 @@ int main(int argc, char *argv[])
#ifdef PDCURSES
/* Must have this for the arrow, et al, keys to even work in
PDCurses+cygwin under Windows */
keypad(edit, TRUE);
keypad(bottomwin, TRUE);
keypad_on(TRUE);
#endif
#ifdef DEBUG
......
No preview for this file type
This diff is collapsed.
No preview for this file type
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.19+CVS\n"
"POT-Creation-Date: 2000-11-01 17:50+0100\n"
"POT-Creation-Date: 2000-11-02 20:21-0500\n"
"PO-Revision-Date: 2000-11-01 17:55+0100\n"
"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
"Language-Team: Spanish <es@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr "read_line: no estamos en la primera l
msgid "Read %d lines"
msgstr "%d lneas ledas"
#: files.c:217 search.c:161 search.c:196
#: files.c:217 search.c:148
#, c-format
msgid "\"%s\" not found"
msgstr "\"%s\" no encontrado"
......@@ -56,7 +56,7 @@ msgstr "Leyendo Fichero"
msgid "File to insert [from ./] "
msgstr "Fichero a insertar [desde ./] "
#: files.c:274 files.c:298 files.c:486 nano.c:1134
#: files.c:274 files.c:298 files.c:486 nano.c:1142
msgid "Cancelled"
msgstr "Cancelado"
......@@ -381,7 +381,7 @@ msgid "Case Sens"
msgstr "May/Min"
#: global.c:344 global.c:364 global.c:375 global.c:385 global.c:401
#: global.c:405 global.c:411 winio.c:974
#: global.c:405 global.c:411 winio.c:992
msgid "Cancel"
msgstr "Cancelar"
......@@ -389,7 +389,7 @@ msgstr "Cancelar"
msgid "No Replace"
msgstr "No Reemplazar"
#: nano.c:115
#: nano.c:122
msgid ""
"\n"
"Buffer written to 'nano.save'\n"
......@@ -397,11 +397,11 @@ msgstr ""
"\n"
"Buffer escrito en 'nano.save'\n"
#: nano.c:122
#: nano.c:129
msgid "Key illegal in VIEW mode"
msgstr "Tecla ilegal en modo VISUALIZACIN"
#: nano.c:158
#: nano.c:166
msgid ""
" nano help text\n"
"\n"
......@@ -440,15 +440,15 @@ msgstr ""
"teclas opcionales estn representadas entre parntesis:\n"
"\n"
#: nano.c:261
#: nano.c:269
msgid "free_node(): free'd a node, YAY!\n"
msgstr "free_node(): liberado un nodo, YEAH!\n"
#: nano.c:266
#: nano.c:274
msgid "free_node(): free'd last node.\n"
msgstr "free_node(): liberado el ltimo nodo.\n"
#: nano.c:318
#: nano.c:326
msgid ""
"Usage: nano [GNU long option] [option] +LINE <file>\n"
"\n"
......@@ -456,84 +456,84 @@ msgstr ""
"Uso: nano [opcin larga GNU] [opcin] +LNEA <fichero>\n"
"\n"
#: nano.c:319
#: nano.c:327
msgid "Option\t\tLong option\t\tMeaning\n"
msgstr "Opcion\t\tOpcion larga\t\tSignificado\n"
#: nano.c:321
#: nano.c:329
msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
msgstr " -T \t\t--tabsize=[num]\t\tFijar el ancho de tab a num\n"
#: nano.c:324
#: nano.c:332
msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
msgstr " -R\t\t--regexp\t\tUsar expresiones regulares para las bsquedas\n"
#: nano.c:328
#: nano.c:336
msgid " -V \t\t--version\t\tPrint version information and exit\n"
msgstr " -V \t\t--version\t\tImprimir versin y salir\n"
#: nano.c:330
#: nano.c:338
msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
msgstr " -c \t\t--const\t\t\tMostrar constantemente la posicin del cursor\n"
#: nano.c:332
#: nano.c:340
msgid " -h \t\t--help\t\t\tShow this message\n"
msgstr " -h \t\t--help\t\t\tMostrar este mensaje\n"
#: nano.c:335
#: nano.c:343
msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
msgstr " -k \t\t--cut\t\t\t^K corta desde el cursor al final de lnea\n"
#: nano.c:338
#: nano.c:346
msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
msgstr " -i \t\t--autoindent\t\tIndentar automticamente nuevas lneas\n"
#: nano.c:340
#: nano.c:348
msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
msgstr " -l \t\t--nofollow\t\tNo seguir enlaces simblicos, sobreescribirlos\n"
#: nano.c:343
#: nano.c:351
msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
msgstr " -m \t\t--mouse\t\t\tHabilitar ratn\n"
#: nano.c:348
#: nano.c:356
msgid ""
" -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
msgstr " -r [#cols] \t--fill=[#cols]\t\tRellenar columnas (wrapear en) #cols\n"
#: nano.c:350
#: nano.c:358
msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n"
msgstr " -p\t \t--pico\t\t\tHacer el men ms parecido a Pico\n"
#: nano.c:352
#: nano.c:360
msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
msgstr " -s [prog] \t--speller=[prog]\tHabilitar corrector alternativo\n"
#: nano.c:354
#: nano.c:362
msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
msgstr " -t \t\t--tempfile\t\tAutosalvar al salir, sin preguntar\n"
#: nano.c:356
#: nano.c:364
msgid " -v \t\t--view\t\t\tView (read only) mode\n"
msgstr " -v \t\t--view\t\t\tModo visualizacin (slo lectura)\n"
#: nano.c:358
#: nano.c:366
msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
msgstr " -w \t\t--nowrap\t\tNo wrapear lneas largas\n"
#: nano.c:360
#: nano.c:368
msgid " -x \t\t--nohelp\t\tDon't show help window\n"
msgstr " -x \t\t--nohelp\t\tNo mostrar la ventana de ayuda\n"
#: nano.c:362
#: nano.c:370
msgid " -z \t\t--suspend\t\tEnable suspend\n"
msgstr " -z \t\t--suspend\t\tHabilitar suspensin\n"
#: nano.c:364
#: nano.c:372
msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
msgstr " +LINE\t\t\t\t\tComenzar en la lnea nmero LNEA\n"
#: nano.c:366
#: nano.c:374
msgid ""
"Usage: nano [option] +LINE <file>\n"
"\n"
......@@ -541,291 +541,296 @@ msgstr ""
"Uso: nano [opcin] +LNEA <fichero>\n"
"\n"
#: nano.c:367
#: nano.c:375
msgid "Option\t\tMeaning\n"
msgstr "Opcin\t\tSignificado\n"
#: nano.c:368
#: nano.c:376
msgid " -T [num]\tSet width of a tab to num\n"
msgstr " -T [num]\tFijar el ancho de tab a num\n"
#: nano.c:369
#: nano.c:377
msgid " -R\t\tUse regular expressions for search\n"
msgstr " -R\t\tUsar expresiones regulares para las bsquedas\n"
#: nano.c:370
#: nano.c:378
msgid " -V \t\tPrint version information and exit\n"
msgstr " -V \t\tImprimir informacin sobre la versin y salir\n"
#: nano.c:371
#: nano.c:379
msgid " -c \t\tConstantly show cursor position\n"
msgstr " -c \t\tMostrar constantemente la posicin del cursor\n"
#: nano.c:372
#: nano.c:380
msgid " -h \t\tShow this message\n"
msgstr " -h \t\tMostrar este mensaje\n"
#: nano.c:374
#: nano.c:382
msgid " -k \t\tLet ^K cut from cursor to end of line\n"
msgstr " -k \t\t^K corta desde el cursor al final de lnea\n"
#: nano.c:376
#: nano.c:384
msgid " -i \t\tAutomatically indent new lines\n"
msgstr " -v \t\tIndentar automticamente nuevas lneas\n"
#: nano.c:378
#: nano.c:386
msgid " -l \t\tDon't follow symbolic links, overwrite\n"
msgstr " -l \t\tNo seguir enlaces simblicos, sobreescribirlos\n"
#: nano.c:381
#: nano.c:389
msgid " -m \t\tEnable mouse\n"
msgstr " -m \t\tHabilitar ratn\n"
#: nano.c:385
#: nano.c:393
msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
msgstr " -r [#cols] \tRellenar columnas (wrapear lneas en) #cols\n"
#: nano.c:386
#: nano.c:394
msgid " -s [prog] \tEnable alternate speller\n"
msgstr " -s [prog] \tHabilitar corrector alternativo\n"
#: nano.c:387
#: nano.c:395
msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
msgstr " -p \t\tHacer el men ms parecido a Pico\n"
#: nano.c:388
#: nano.c:396
msgid " -t \t\tAuto save on exit, don't prompt\n"
msgstr " -t \t\tAutosalvar al salir, no preguntar\n"
#: nano.c:389
#: nano.c:397
msgid " -v \t\tView (read only) mode\n"
msgstr " -v \t\tModo visualizacin (slo lectura)\n"
#: nano.c:390
#: nano.c:398
msgid " -w \t\tDon't wrap long lines\n"
msgstr " -w \t\tNo wrapear lneas largas\n"
#: nano.c:391
#: nano.c:399
msgid " -x \t\tDon't show help window\n"
msgstr " -x \t\tNo mostrar la ventana de ayuda\n"
#: nano.c:392
#: nano.c:400
msgid " -z \t\tEnable suspend\n"
msgstr " -z \t\tHabilitar suspensin\n"
#: nano.c:393
#: nano.c:401
msgid " +LINE\t\tStart at line number LINE\n"
msgstr " +LNEA\t\tComenzar en la lnea nmero LNEA\n"
#: nano.c:400
#: nano.c:408
#, c-format
msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
msgstr " nano versin %s por Chris Allegretta (compilado %s, %s)\n"
#: nano.c:403
#: nano.c:411
msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
msgstr " Correo-e: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
#: nano.c:438
#: nano.c:446
msgid "Mark Set"
msgstr "Marca Establecida"
#: nano.c:443
#: nano.c:451
msgid "Mark UNset"
msgstr "Marca Borrada"
#: nano.c:870
#: nano.c:878
#, c-format
msgid "check_wrap called with inptr->data=\"%s\"\n"
msgstr "check_wrap llamada con inptr->data=\"%s\"\n"
#: nano.c:921
#: nano.c:929
#, c-format
msgid "current->data now = \"%s\"\n"
msgstr "current->data ahora = \"%d\"\n"
#: nano.c:974
#: nano.c:982
#, c-format
msgid "After, data = \"%s\"\n"
msgstr "Despus, data = \"%s\"\n"
#: nano.c:1043
#: nano.c:1051
msgid "Error deleting tempfile, ack!"
msgstr "Error borrando el fichero temporal, ouch!"
#: nano.c:1061
#: nano.c:1069
#, c-format
msgid "Could not create a temporary filename: %s"
msgstr "No pude crear un fichero temporal: %s"
#: nano.c:1084
#: nano.c:1092
#, c-format
msgid "Could not invoke spell program \"%s\""
msgstr "No se pudo llamar al corrector \"%s\""
#. Why 32512? I dont know!
#: nano.c:1090
#: nano.c:1098
msgid "Could not invoke \"ispell\""
msgstr "No pude llamar a \"ispell\""
#: nano.c:1103
#: nano.c:1111
msgid "Finished checking spelling"
msgstr "Revisin de ortografa finalizada"
#: nano.c:1121
#: nano.c:1129
msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
msgstr "Salvar el buffer modificado (RESPONDER \"No\" DESTRUIR LOS CAMBIOS) ?"
#: nano.c:1284
#: nano.c:1292
msgid "Cannot resize top win"
msgstr "No se puede cambiar el tamao de la ventana superior"
#: nano.c:1286
#: nano.c:1294
msgid "Cannot move top win"
msgstr "No se puede mover la ventana superior"
#: nano.c:1288
#: nano.c:1296
msgid "Cannot resize edit win"
msgstr "No se puede cambiar el tamao de la ventana de edicin"
#: nano.c:1290
#: nano.c:1298
msgid "Cannot move edit win"
msgstr "No se puede mover la ventana de edicin"
#: nano.c:1292
#: nano.c:1300
msgid "Cannot resize bottom win"
msgstr "No se puede cambiar el tamao de la ventana inferior"
#: nano.c:1294
#: nano.c:1302
msgid "Cannot move bottom win"
msgstr "No se puede mover la ventana inferior"
#: nano.c:1567
#: nano.c:1573
#, fuzzy
msgid "Justify Complete"
msgstr "Justificar Completado"
#: nano.c:1635
#: nano.c:1641
#, c-format
msgid "%s enable/disable"
msgstr "%s habilitar/deshabilitar"
#: nano.c:1647
#: nano.c:1653
msgid "enabled"
msgstr "habilitado"
#: nano.c:1648
#: nano.c:1654
msgid "disabled"
msgstr "deshabilitado"
#: nano.c:1878
#: nano.c:1884
msgid "Main: set up windows\n"
msgstr "Main: configurar las ventanas\n"
#: nano.c:1892
#: nano.c:1897
msgid "Main: bottom win\n"
msgstr "Main: ventana inferior\n"
#: nano.c:1898
#: nano.c:1903
msgid "Main: open file\n"
msgstr "Main: abrir fichero\n"
#: nano.c:1932
#: nano.c:1937
#, fuzzy, c-format
msgid "I got Alt-O-%c! (%d)\n"
msgstr "Pill Alt-O-%c! (%d)\n"
#: nano.c:1954
#: nano.c:1959
#, fuzzy, c-format
msgid "I got Alt-[-1-%c! (%d)\n"
msgstr "Pill Alt-[-1-%c! (%d)\n"
#: nano.c:1987
#: nano.c:1992
#, fuzzy, c-format
msgid "I got Alt-[-2-%c! (%d)\n"
msgstr "Pill Alt-[-2-%c! (%d)\n"
#: nano.c:2035
#: nano.c:2040
#, c-format
msgid "I got Alt-[-%c! (%d)\n"
msgstr "Pill Alt-[-%c! (%d)\n"
#: nano.c:2061
#: nano.c:2066
#, c-format
msgid "I got Alt-%c! (%d)\n"
msgstr "Pill Alt-%c! (%d)\n"
#: search.c:79
#: search.c:88
#, c-format
msgid "Case Sensitive Regexp Search%s%s"
msgstr "Bsqueda con Regexp y Maysculas/Minsculas%s%s"
#: search.c:81
#: search.c:90
#, c-format
msgid "Regexp Search%s%s"
msgstr "Busqueda con Regexp%s%s"
#: search.c:83
#: search.c:92
#, c-format
msgid "Case Sensitive Search%s%s"
msgstr "Bsqueda con Maysculas/Minsculas%s%s"
#: search.c:85
#: search.c:94
#, c-format
msgid "Search%s%s"
msgstr "Buscar%s%s"
#: search.c:88
#: search.c:97
msgid " (to replace)"
msgstr " (a reemplazar)"
#: search.c:96 search.c:252
#: search.c:105 search.c:274
msgid "Search Cancelled"
msgstr "Bsqueda Cancelada"
#: search.c:177
#: search.c:152
#, fuzzy, c-format
msgid "\"%s...\" not found"
msgstr "\"%s\" no encontrado"
#: search.c:199
msgid "Search Wrapped"
msgstr "Bsqueda Recomenzada"
#: search.c:266
#: search.c:288
#, c-format
msgid "Replaced %d occurences"
msgstr "%d ocurrencias reemplazadas"
#: search.c:268
#: search.c:290
msgid "Replaced 1 occurence"
msgstr "1 ocurrencia reemplazada"
#: search.c:404 search.c:420 search.c:442
#: search.c:426 search.c:442 search.c:456
msgid "Replace Cancelled"
msgstr "Reemplazar Cancelado"
#: search.c:436
#: search.c:450
msgid "Replace with"
msgstr "Reemplazar con"
#: search.c:473
#: search.c:487
msgid "Replace this instance?"
msgstr "Reemplazar esta instancia?"
#: search.c:481
#: search.c:495
msgid "Replace failed: unknown subexpression!"
msgstr "Fallo en reemplazar: subexpresin desconocida!"
#. Ask for it
#: search.c:534
#: search.c:548
msgid "Enter line number"
msgstr "Introduce nmero de lnea"
#: search.c:536
#: search.c:550
msgid "Aborted"
msgstr "Abortado"
#: search.c:556
#: search.c:570
msgid "Come on, be reasonable"
msgstr "Venga ya, se razonable"
#: search.c:561
#: search.c:575
#, c-format
msgid "Only %d lines available, skipping to last line"
msgstr "Slo hay %d lneas, saltando hasta la ltima"
......@@ -835,68 +840,68 @@ msgstr "S
msgid "actual_x_from_start for xplus=%d returned %d\n"
msgstr "actual_x_from_start para xplus=%d devolvi %d\n"
#: winio.c:390
#: winio.c:408
#, c-format
msgid "input '%c' (%d)\n"
msgstr "entrada '%c' (%d)\n"
#: winio.c:427
#: winio.c:445
msgid "New Buffer"
msgstr "Nuevo Buffer"
#: winio.c:430
#: winio.c:448
msgid " File: ..."
msgstr "Fichero: ..."
#: winio.c:438
#: winio.c:456
msgid "Modified"
msgstr "Modificado"
#: winio.c:890
#: winio.c:908
#, c-format
msgid "Moved to (%d, %d) in edit buffer\n"
msgstr "Moviendo a (%d, %d) en buffer de edicin\n"
#: winio.c:901
#: winio.c:919
#, c-format
msgid "current->data = \"%s\"\n"
msgstr "current->data = \"%s\"\n"
#: winio.c:944
#: winio.c:962
#, c-format
msgid "I got \"%s\"\n"
msgstr "Pill \"%s\"\n"
#: winio.c:969
#: winio.c:987
msgid "Yes"
msgstr "S"
#: winio.c:971
#: winio.c:989
msgid "All"
msgstr "Todas"
#: winio.c:973
#: winio.c:991
msgid "No"
msgstr "No"
#: winio.c:1110
#: winio.c:1128
#, c-format
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
#: winio.c:1114
#: winio.c:1132
msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
msgstr "lnea %d de %d (%.0f%%), carcter %d de %d (%.0f%%)"
#: winio.c:1242
#: winio.c:1260
msgid "Dumping file buffer to stderr...\n"
msgstr "Volcando buffer de fichero a stderr...\n"
#: winio.c:1244
#: winio.c:1262
msgid "Dumping cutbuffer to stderr...\n"
msgstr "Volcando el cutbuffer a stderr...\n"
#: winio.c:1246
#: winio.c:1264
msgid "Dumping a buffer to stderr...\n"
msgstr "Volcando un buffer a stderr...\n"
......
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment