From: Chris Allegretta Date: Fri, 28 Jul 2000 00:36:03 +0000 (+0000) Subject: official 0.9.14 sync X-Git-Tag: v0.9.14 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a1a55c79c89a1da0a61eeec63a44b3eb4a70f100;p=nano.git official 0.9.14 sync git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@136 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/BUGS b/BUGS index 2e0b1965..79727178 100644 --- a/BUGS +++ b/BUGS @@ -38,6 +38,8 @@ - Wrapping a line with autoindent mode sometimes causes a segfault (19)[FIXED] - When inserting files, the display sometimes fails to display properly until a pageup/down occurs (22)[FIXED] +- Using nano -t, user can not exit until a filename is given via ^O. (30) + [FIXED] ** Open BUGS ** @@ -51,6 +53,6 @@ causes a random segfault (16) - In search/replace code there is too much refreshing in bottomwin (26) - In replace, there is no way to accept the default replace string. (27) -- Using nano -t, user can not exit until a filename is given via ^O. (30) - totsize problems still abound in do_justify (33) -- Using -k cut text is not pasted properly. (34) +- Using -k cut text is not pasted properly. (34) [FIXED, mostly]. +- Using -k pasted text is not updated properly if it goes beyond editbot. (35) diff --git a/ChangeLog b/ChangeLog index 947e8810..35d6cf2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in CVS - +nano-0.9.14 - 07/27/2000 - nano.h: - Set CUT_TO_END to a different bit than TEMP_OPT. Fixes bug #32. - cut.c: @@ -9,7 +9,6 @@ Changes in CVS - processing by do_uncut_text(). do_uncut_text() - Added handler for uncutting with -k cuts. - - files.c: write_file() - Removed (redundant) check for writing out files with -t. diff --git a/NEWS b/NEWS index 15dd407e..59db07b8 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +07/27/2000 - Nano 0.9.14 is officially the "13 is so unlucky it should + be skipped as a version number" release. One typo + caused unending problems (calling nano with either -t or + -k caused both flags to be used). The -k code is also now + closer in functionality to Pico's -k mode, please + note that this code is not finished yet. Working on this + code has made me realize that there is not enough + abstraction in the code, and I will be working on that + for the next release. Until then, have fun with this + version. + 07/23/2000 - Nano 0.9.13 has a few new bits and bobs, most notably the -k option from Pico (cut to end of line). The majority of changes in this release are bugfixes however, including diff --git a/configure b/configure index bdc4b74a..1c592bd1 100755 --- a/configure +++ b/configure @@ -710,7 +710,7 @@ fi PACKAGE=nano -VERSION=0.9.13-cvs +VERSION=0.9.14 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff --git a/configure.in b/configure.in index b3c4d3e8..edf77cf6 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(nano.c) -AM_INIT_AUTOMAKE(nano, 0.9.13-cvs) +AM_INIT_AUTOMAKE(nano, 0.9.14) AM_CONFIG_HEADER(config.h:config.h.in) ALL_LINGUAS="es de fr it id fi" diff --git a/faq.html b/faq.html index 2356af41..4fc22255 100644 --- a/faq.html +++ b/faq.html @@ -183,7 +183,7 @@ nano was developed). of nano?
The current version of nano *should* -be 0.9.13.  Of course you should always check the nano hompage to +be 0.9.14.  Of course you should always check the nano hompage to see what the latest and greatest version is.

diff --git a/po/de.gmo b/po/de.gmo index 10b34390..91918edd 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 15d44443..5f02275e 100644 --- a/po/de.po +++ b/po/de.po @@ -3,17 +3,10 @@ # Copyright (C) 2000 Free Software Foundation, Inc. # Florian König , 2000. # -#: cut.c:252 files.c:53 files.c:213 files.c:246 files.c:295 global.c:101 -#: global.c:102 global.c:103 global.c:104 global.c:105 global.c:106 -#: global.c:107 global.c:108 global.c:109 global.c:110 global.c:111 -#: global.c:112 global.c:113 nano.c:61 nano.c:62 nano.c:66 nano.c:976 -#: nano.c:1029 nano.c:1584 nano.c:1681 nano.c:1686 nano.c:1693 search.c:62 -#: search.c:84 search.c:378 search.c:396 search.c:397 search.c:423 -#: search.c:515 winio.c:225 winio.c:245 winio.c:417 winio.c:442 msgid "" msgstr "" "Project-Id-Version: nano 0.9.14pre1\n" -"POT-Creation-Date: 2000-07-27 11:33+0200\n" +"POT-Creation-Date: 2000-07-27 20:16-0400\n" "PO-Revision-Date: 2000-07-27 11:44+0200\n" "Last-Translator: Florian König \n" "Language-Team: German \n" @@ -44,15 +37,11 @@ msgstr "%d Zeilen gelesen" msgid "\"%s\" not found" msgstr "\"%s\" nicht gefunden" +#. We have a new file #: files.c:220 msgid "New File" msgstr "Neue Datei" -#: files.c:225 -#, c-format -msgid "%s: %s" -msgstr "%s: %s" - #: files.c:229 #, c-format msgid "File \"%s\" is a directory" @@ -66,11 +55,6 @@ msgstr "Lese Datei" msgid "File to insert [from ./] " msgstr "Datei zum Einfügen [von ./] " -#: files.c:251 files.c:470 -#, c-format -msgid "filename is %s" -msgstr "Dateiname ist %s" - #: files.c:272 files.c:296 files.c:486 nano.c:1149 msgid "Cancelled" msgstr "Abgebrochen" @@ -84,24 +68,17 @@ msgstr "Konnte nicht in Datei schreiben: %s" msgid "Could not open file: Path length exceeded." msgstr "Konnte Datei nicht öffnen: Pfad zu lang." -#: files.c:332 -msgid ".XXXXXX" -msgstr ".XXXXXX" - #: files.c:356 #, c-format msgid "Wrote >%s\n" msgstr "Schrieb >%s\n" -#: files.c:359 files.c:372 nano.c:1532 -msgid "\n" -msgstr "\n" - #: files.c:383 #, c-format msgid "Could not close %s: %s" msgstr "Konnte %s nicht schließen: %s" +#. Try a rename?? #: files.c:404 files.c:415 files.c:420 #, c-format msgid "Could not open %s for writing: %s" @@ -121,6 +98,11 @@ msgstr "%d Zeilen geschrieben" msgid "File Name to write" msgstr "Dateiname zum Speichern" +#: files.c:470 +#, c-format +msgid "filename is %s" +msgstr "Dateiname ist %s" + #: files.c:475 msgid "File exists, OVERWRITE ?" msgstr "Datei exisitiert, ÜBERSCHREIBEN ?" @@ -371,14 +353,6 @@ msgstr "Abbrechen" msgid "No Replace" msgstr "Keine Ersetzung" -#: nano.c:99 nano.c:1215 -msgid "nano.save" -msgstr "nano.save" - -#: nano.c:103 -msgid ".save" -msgstr ".save" - #: nano.c:115 msgid "" "\n" @@ -626,15 +600,6 @@ msgstr "Markierung gesetzt" msgid "Mark UNset" msgstr "Markierung gelöscht" -#: nano.c:453 -msgid "Sorry, this function not available with nano-tiny option" -msgstr "" -"Tut mir leid, dies Funktion ist im Minimalmodus von nano nicht verfügbar" - -#: nano.c:806 -msgid " " -msgstr " " - #: nano.c:875 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" @@ -654,30 +619,17 @@ msgstr "Nachher, data = \"%s\"\n" msgid "Error deleting tempfile, ack!" msgstr "Konnte temporäre Datei nicht löschen" -#: nano.c:1075 -msgid "nano." -msgstr "nano." - #: nano.c:1076 #, c-format msgid "Could not create a temporary filename: %s" msgstr "Konnte keine temporäre Datei erzeugen: %s" -#: nano.c:1086 -#, c-format -msgid "%s %s" -msgstr "%s %s" - -#: nano.c:1093 -#, c-format -msgid "ispell %s" -msgstr "ispell %s" - #: nano.c:1099 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "Konnte Rechtschreibprogramm \"%s\" nicht aufrufen" +#. Why 32512? I dont know! #: nano.c:1105 msgid "Could not invoke \"ispell\"" msgstr "Konnte \"ispell\" nicht aufrufen" @@ -714,106 +666,6 @@ msgstr "Kann Gr msgid "Cannot move bottom win" msgstr "Kann unteres Fenster nicht verschieben" -#: nano.c:1480 -msgid "Justify Complete" -msgstr "Ausrichten abgeschlossen" - -#: nano.c:1514 -#, c-format -msgid "^%c\t" -msgstr "^%c\t" - -#: nano.c:1517 -#, c-format -msgid "(F%d)\t" -msgstr "(F%d)\t" - -#: nano.c:1520 nano.c:1526 -msgid "\t" -msgstr "\t" - -#: nano.c:1523 -#, c-format -msgid "(@%c)\t" -msgstr "(@%c)\t" - -#: nano.c:1529 -#, c-format -msgid "%s" -msgstr "%s" - -#: nano.c:1555 -msgid "regexp" -msgstr "regulärer Ausdruck" - -#: nano.c:1557 -msgid "version" -msgstr "Version" - -#: nano.c:1558 -msgid "const" -msgstr "const" - -#: nano.c:1559 -msgid "suspend" -msgstr "suspend" - -#: nano.c:1560 -msgid "nowrap" -msgstr "nowrap" - -#: nano.c:1561 -msgid "nohelp" -msgstr "nohelp" - -#: nano.c:1562 -msgid "help" -msgstr "help" - -#: nano.c:1564 -msgid "cut" -msgstr "cut" - -#: nano.c:1566 -msgid "autoindent" -msgstr "autoindent" - -#: nano.c:1567 -msgid "tempfile" -msgstr "tempfile" - -#: nano.c:1568 -msgid "speller" -msgstr "speller" - -#: nano.c:1569 -msgid "fill" -msgstr "fill" - -#: nano.c:1570 -msgid "mouse" -msgstr "mouse" - -#: nano.c:1571 nano.c:1676 nano.c:1677 -msgid "pico" -msgstr "pico" - -#: nano.c:1572 -msgid "nofollow" -msgstr "nofollow" - -#: nano.c:1574 -msgid "tabsize" -msgstr "tabsize" - -#: nano.c:1590 -msgid "?T:RVchiklmpr:s:tvwxz" -msgstr "?T:RVchiklmpr:s:tvwxz" - -#: nano.c:1593 -msgid "h?T:RVciklmpr:s:tvwxz" -msgstr "h?T:RVciklmpr:s:tvwxz" - #: nano.c:1742 msgid "Main: set up windows\n" msgstr "Hauptprogramm: Fenster konfigurieren\n" @@ -836,16 +688,6 @@ msgstr "Erhielt Alt-[-%c! (%d)\n" msgid "I got Alt-%c! (%d)\n" msgstr "Erhielt Alt-%c! (%d)\n" -#: nano.c:1897 -#, c-format -msgid "I got %c (%d)!\n" -msgstr "Erhielt %c (%d)!\n" - -#: search.c:65 -#, c-format -msgid " [%s]" -msgstr " [%s]" - #: search.c:71 #, c-format msgid "Case Sensitive Regexp Search%s%s" @@ -898,6 +740,7 @@ msgstr "Ersetzung abgebrochen" msgid "Replace with [%s]" msgstr "Ersetzen mit [%s]" +#. last_search is empty #: search.c:423 msgid "Replace with" msgstr "Ersetzen mit" @@ -906,10 +749,7 @@ msgstr "Ersetzen mit" msgid "Replace this instance?" msgstr "Ersetzen?" -#: search.c:472 -msgid "Replace failed: unknown subexpression!" -msgstr "Ersetzung gescheitert: unbekannter Unterausdruck" - +#. Ask for it #: search.c:515 msgid "Enter line number" msgstr "Zeilennummer eingeben" @@ -918,10 +758,6 @@ msgstr "Zeilennummer eingeben" msgid "Aborted" msgstr "Abgebrochen" -#: search.c:525 -msgid "$" -msgstr "DM" - #: search.c:537 msgid "Come on, be reasonable" msgstr "Komm schon, sei vernünftig" @@ -949,24 +785,10 @@ msgstr "Neuer Puffer" msgid " File: ..." msgstr " Datei: ..." -#: winio.c:449 -msgid "File: " -msgstr "Datei: " - #: winio.c:454 msgid "Modified" msgstr "Verändert" -#: winio.c:464 -#, c-format -msgid " %-11s" -msgstr " %-11s" - -#: winio.c:494 winio.c:503 -#, c-format -msgid "^%c" -msgstr "^%c" - #: winio.c:913 #, c-format msgid "Moved to (%d, %d) in edit buffer\n" @@ -977,51 +799,23 @@ msgstr "Nach (%d, %d) im Bearbeitungspuffer verschoben\n" msgid "current->data = \"%s\"\n" msgstr "current->data = \"%s\"\n" -#: winio.c:946 -msgid ": " -msgstr ": " - #: winio.c:967 #, c-format msgid "I got \"%s\"\n" msgstr "Erhielt \"%s\"\n" -#: winio.c:992 -msgid " Y" -msgstr " J" - #: winio.c:992 msgid "Yes" msgstr "Ja" -#: winio.c:994 -msgid " A" -msgstr " A" - #: winio.c:994 msgid "All" msgstr "Alle" -#: winio.c:996 -msgid " N" -msgstr " N" - #: winio.c:996 msgid "No" msgstr "Nein" -#: winio.c:997 -msgid "^C" -msgstr "^C" - -#: winio.c:1061 -msgid "[ " -msgstr "[ " - -#: winio.c:1063 -msgid " ]" -msgstr " ]" - #: winio.c:1132 #, c-format msgid "do_cursorpos: linepct = %f, bytepct = %f\n" @@ -1043,28 +837,171 @@ msgstr "Gebe Inhalt der Zwischenablage nach stderr aus...\n" msgid "Dumping a buffer to stderr...\n" msgstr "Gebe einen Puffer nach stderr aus...\n" -#: winio.c:1268 winio.c:1282 -#, c-format -msgid "(%ld) %s\n" -msgstr "(%ld) %s\n" +#~ msgid "%s: %s" +#~ msgstr "%s: %s" -msgid "To Replace" -msgstr "Ersetzen" +#~ msgid ".XXXXXX" +#~ msgstr ".XXXXXX" + +#~ msgid "\n" +#~ msgstr "\n" + +#~ msgid "nano.save" +#~ msgstr "nano.save" + +#~ msgid ".save" +#~ msgstr ".save" + +#~ msgid "Sorry, this function not available with nano-tiny option" +#~ msgstr "" +#~ "Tut mir leid, dies Funktion ist im Minimalmodus von nano nicht verfügbar" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "nano." +#~ msgstr "nano." + +#~ msgid "%s %s" +#~ msgstr "%s %s" + +#~ msgid "ispell %s" +#~ msgstr "ispell %s" + +#~ msgid "Justify Complete" +#~ msgstr "Ausrichten abgeschlossen" + +#~ msgid "^%c\t" +#~ msgstr "^%c\t" + +#~ msgid "(F%d)\t" +#~ msgstr "(F%d)\t" + +#~ msgid "\t" +#~ msgstr "\t" + +#~ msgid "(@%c)\t" +#~ msgstr "(@%c)\t" + +#~ msgid "%s" +#~ msgstr "%s" + +#~ msgid "regexp" +#~ msgstr "regulärer Ausdruck" + +#~ msgid "version" +#~ msgstr "Version" + +#~ msgid "const" +#~ msgstr "const" + +#~ msgid "suspend" +#~ msgstr "suspend" + +#~ msgid "nowrap" +#~ msgstr "nowrap" + +#~ msgid "nohelp" +#~ msgstr "nohelp" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "cut" +#~ msgstr "cut" + +#~ msgid "autoindent" +#~ msgstr "autoindent" + +#~ msgid "tempfile" +#~ msgstr "tempfile" + +#~ msgid "speller" +#~ msgstr "speller" + +#~ msgid "fill" +#~ msgstr "fill" + +#~ msgid "mouse" +#~ msgstr "mouse" + +#~ msgid "pico" +#~ msgstr "pico" + +#~ msgid "nofollow" +#~ msgstr "nofollow" + +#~ msgid "tabsize" +#~ msgstr "tabsize" + +#~ msgid "?T:RVchiklmpr:s:tvwxz" +#~ msgstr "?T:RVchiklmpr:s:tvwxz" + +#~ msgid "h?T:RVciklmpr:s:tvwxz" +#~ msgstr "h?T:RVciklmpr:s:tvwxz" + +#~ msgid "I got %c (%d)!\n" +#~ msgstr "Erhielt %c (%d)!\n" + +#~ msgid " [%s]" +#~ msgstr " [%s]" + +#~ msgid "Replace failed: unknown subexpression!" +#~ msgstr "Ersetzung gescheitert: unbekannter Unterausdruck" + +#~ msgid "$" +#~ msgstr "DM" + +#~ msgid "File: " +#~ msgstr "Datei: " + +#~ msgid " %-11s" +#~ msgstr " %-11s" + +#~ msgid "^%c" +#~ msgstr "^%c" + +#~ msgid ": " +#~ msgstr ": " + +#~ msgid " Y" +#~ msgstr " J" + +#~ msgid " A" +#~ msgstr " A" + +#~ msgid " N" +#~ msgstr " N" + +#~ msgid "^C" +#~ msgstr "^C" + +#~ msgid "[ " +#~ msgstr "[ " + +#~ msgid " ]" +#~ msgstr " ]" + +#~ msgid "(%ld) %s\n" +#~ msgstr "(%ld) %s\n" + +#~ msgid "To Replace" +#~ msgstr "Ersetzen" -msgid "To Search" -msgstr "Suche" +#~ msgid "To Search" +#~ msgstr "Suche" -msgid "nano: malloc: out of memory!" -msgstr "nano: malloc: Kein Speicher verfügbar!" +#~ msgid "nano: malloc: out of memory!" +#~ msgstr "nano: malloc: Kein Speicher verfügbar!" -msgid "nano: realloc: out of memory!" -msgstr "nano: realloc: Kein Speicher verfügbar!" +#~ msgid "nano: realloc: out of memory!" +#~ msgstr "nano: realloc: Kein Speicher verfügbar!" -msgid "Suspend" -msgstr "Suspend" +#~ msgid "Suspend" +#~ msgstr "Suspend" -msgid "Suspend nano if suspend is enabled" -msgstr "nano anhalten und zur Shell zurückkehren (nur wenn aktiviert)" +#~ msgid "Suspend nano if suspend is enabled" +#~ msgstr "nano anhalten und zur Shell zurückkehren (nur wenn aktiviert)" -msgid "xplustabs for current_x=%d returned %d\n" -msgstr "xplustabs für current_x=%d gab %d zurück\n" +#~ msgid "xplustabs for current_x=%d returned %d\n" +#~ msgstr "xplustabs für current_x=%d gab %d zurück\n" diff --git a/po/es.gmo b/po/es.gmo index 76b61d6b..4890e5c6 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index bd69596e..e6ed0b7f 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.9.13\n" -"POT-Creation-Date: 2000-07-24 23:24-0400\n" +"POT-Creation-Date: 2000-07-27 20:16-0400\n" "PO-Revision-Date: 2000-07-13 04:57+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Spanish \n" diff --git a/po/fi.gmo b/po/fi.gmo index 4b1c93f5..9c04662f 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index b97a536a..47c65688 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 0.9.11\n" -"POT-Creation-Date: 2000-07-24 23:24-0400\n" +"POT-Creation-Date: 2000-07-27 20:16-0400\n" "PO-Revision-Date: 2000-06-21 23:08+03:00\n" "Last-Translator: Pauli Virtanen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 5a840927..5793733e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.9\n" -"POT-Creation-Date: 2000-07-24 23:24-0400\n" +"POT-Creation-Date: 2000-07-27 20:16-0400\n" "PO-Revision-Date: 2000-07-09 01:32+0100\n" "Last-Translator: Clement Laforet \n" "Language-Team: French \n" diff --git a/po/id.gmo b/po/id.gmo index f4e954e3..197cd927 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index 4a031066..1561bac4 100644 --- a/po/id.po +++ b/po/id.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano-0.9.10\n" -"POT-Creation-Date: 2000-07-24 23:24-0400\n" +"POT-Creation-Date: 2000-07-27 20:16-0400\n" "PO-Revision-Date: 2000-06-08 20:56+07:00\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" diff --git a/po/it.gmo b/po/it.gmo index 55028a66..98a37dd7 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index 37346271..e95952ea 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.7\n" -"POT-Creation-Date: 2000-07-24 23:24-0400\n" +"POT-Creation-Date: 2000-07-27 20:16-0400\n" "PO-Revision-Date: 2000-03-03 04:57+0100\n" "Last-Translator: Daniele Medri \n" "MIME-Version: 1.0\n" diff --git a/po/nano.pot b/po/nano.pot index 5543e778..78bb3314 100644 --- a/po/nano.pot +++ b/po/nano.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-07-27 11:29-0400\n" +"POT-Creation-Date: 2000-07-27 20:16-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"