Added recursive loop check
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@156 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Этот коммит содержится в:
родитель
55d5455abd
Коммит
ed02216378
@ -26,6 +26,7 @@ CVS code
|
|||||||
- Added check for current line "running" off the screen.
|
- Added check for current line "running" off the screen.
|
||||||
Hopefully this will not cause any recursive lockups.
|
Hopefully this will not cause any recursive lockups.
|
||||||
(Who am I kidding, of course it will!)
|
(Who am I kidding, of course it will!)
|
||||||
|
- Added check to stop infinite loop calling edit_update.
|
||||||
edit_update()
|
edit_update()
|
||||||
- Rewritten, hopefully this will remove a lot of the
|
- Rewritten, hopefully this will remove a lot of the
|
||||||
scrolling the cursor back and forth needlessly.
|
scrolling the cursor back and forth needlessly.
|
||||||
|
Двоичные данные
po/de.gmo
Двоичные данные
po/de.gmo
Двоичный файл не отображается.
2
po/de.po
2
po/de.po
@ -6,7 +6,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: nano 0.9.14pre1\n"
|
"Project-Id-Version: nano 0.9.14pre1\n"
|
||||||
"POT-Creation-Date: 2000-07-31 08:56-0400\n"
|
"POT-Creation-Date: 2000-08-01 18:28-0400\n"
|
||||||
"PO-Revision-Date: 2000-07-27 11:44+0200\n"
|
"PO-Revision-Date: 2000-07-27 11:44+0200\n"
|
||||||
"Last-Translator: Florian KЎnig <floki@bigfoot.com>\n"
|
"Last-Translator: Florian KЎnig <floki@bigfoot.com>\n"
|
||||||
"Language-Team: German <floki@bigfoot.com>\n"
|
"Language-Team: German <floki@bigfoot.com>\n"
|
||||||
|
Двоичные данные
po/es.gmo
Двоичные данные
po/es.gmo
Двоичный файл не отображается.
2
po/es.po
2
po/es.po
@ -6,7 +6,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: 0.9.13\n"
|
"Project-Id-Version: 0.9.13\n"
|
||||||
"POT-Creation-Date: 2000-07-31 08:56-0400\n"
|
"POT-Creation-Date: 2000-08-01 18:28-0400\n"
|
||||||
"PO-Revision-Date: 2000-07-13 04:57+0200\n"
|
"PO-Revision-Date: 2000-07-13 04:57+0200\n"
|
||||||
"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
|
"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
|
||||||
"Language-Team: Spanish <jordi@sindominio.net>\n"
|
"Language-Team: Spanish <jordi@sindominio.net>\n"
|
||||||
|
Двоичные данные
po/fi.gmo
Двоичные данные
po/fi.gmo
Двоичный файл не отображается.
2
po/fi.po
2
po/fi.po
@ -5,7 +5,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: nano 0.9.11\n"
|
"Project-Id-Version: nano 0.9.11\n"
|
||||||
"POT-Creation-Date: 2000-07-31 08:56-0400\n"
|
"POT-Creation-Date: 2000-08-01 18:28-0400\n"
|
||||||
"PO-Revision-Date: 2000-06-21 23:08+03:00\n"
|
"PO-Revision-Date: 2000-06-21 23:08+03:00\n"
|
||||||
"Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
|
"Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
|
||||||
"Language-Team: Finnish <fi@li.org>\n"
|
"Language-Team: Finnish <fi@li.org>\n"
|
||||||
|
2
po/fr.po
2
po/fr.po
@ -6,7 +6,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: 0.8.9\n"
|
"Project-Id-Version: 0.8.9\n"
|
||||||
"POT-Creation-Date: 2000-07-31 08:56-0400\n"
|
"POT-Creation-Date: 2000-08-01 18:28-0400\n"
|
||||||
"PO-Revision-Date: 2000-07-09 01:32+0100\n"
|
"PO-Revision-Date: 2000-07-09 01:32+0100\n"
|
||||||
"Last-Translator: Clement Laforet <sheep.killer@free.fr>\n"
|
"Last-Translator: Clement Laforet <sheep.killer@free.fr>\n"
|
||||||
"Language-Team: French <LL@li.org>\n"
|
"Language-Team: French <LL@li.org>\n"
|
||||||
|
Двоичные данные
po/id.gmo
Двоичные данные
po/id.gmo
Двоичный файл не отображается.
2
po/id.po
2
po/id.po
@ -5,7 +5,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: nano-0.9.10\n"
|
"Project-Id-Version: nano-0.9.10\n"
|
||||||
"POT-Creation-Date: 2000-07-31 08:56-0400\n"
|
"POT-Creation-Date: 2000-08-01 18:28-0400\n"
|
||||||
"PO-Revision-Date: 2000-06-08 20:56+07:00\n"
|
"PO-Revision-Date: 2000-06-08 20:56+07:00\n"
|
||||||
"Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
|
"Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
|
||||||
"Language-Team: Indonesian <id@li.org>\n"
|
"Language-Team: Indonesian <id@li.org>\n"
|
||||||
|
Двоичные данные
po/it.gmo
Двоичные данные
po/it.gmo
Двоичный файл не отображается.
2
po/it.po
2
po/it.po
@ -6,7 +6,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: 0.8.7\n"
|
"Project-Id-Version: 0.8.7\n"
|
||||||
"POT-Creation-Date: 2000-07-31 08:56-0400\n"
|
"POT-Creation-Date: 2000-08-01 18:28-0400\n"
|
||||||
"PO-Revision-Date: 2000-03-03 04:57+0100\n"
|
"PO-Revision-Date: 2000-03-03 04:57+0100\n"
|
||||||
"Last-Translator: Daniele Medri <madrid@linux.it>\n"
|
"Last-Translator: Daniele Medri <madrid@linux.it>\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
|
26
po/nano.pot
26
po/nano.pot
@ -6,7 +6,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"POT-Creation-Date: 2000-07-31 08:56-0400\n"
|
"POT-Creation-Date: 2000-08-03 12:58-0400\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
@ -344,7 +344,7 @@ msgid "Case Sens"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: global.c:282 global.c:301 global.c:311 global.c:327 global.c:331
|
#: global.c:282 global.c:301 global.c:311 global.c:327 global.c:331
|
||||||
#: global.c:337 winio.c:975
|
#: global.c:337 winio.c:983
|
||||||
msgid "Cancel"
|
msgid "Cancel"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -758,50 +758,50 @@ msgstr ""
|
|||||||
msgid "Modified"
|
msgid "Modified"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:891
|
#: winio.c:899
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Moved to (%d, %d) in edit buffer\n"
|
msgid "Moved to (%d, %d) in edit buffer\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:902
|
#: winio.c:910
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "current->data = \"%s\"\n"
|
msgid "current->data = \"%s\"\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:945
|
#: winio.c:953
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "I got \"%s\"\n"
|
msgid "I got \"%s\"\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:970
|
#: winio.c:978
|
||||||
msgid "Yes"
|
msgid "Yes"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:972
|
#: winio.c:980
|
||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:974
|
#: winio.c:982
|
||||||
msgid "No"
|
msgid "No"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:1110
|
#: winio.c:1118
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
|
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:1114
|
#: winio.c:1122
|
||||||
msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
|
msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:1238
|
#: winio.c:1246
|
||||||
msgid "Dumping file buffer to stderr...\n"
|
msgid "Dumping file buffer to stderr...\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:1240
|
#: winio.c:1248
|
||||||
msgid "Dumping cutbuffer to stderr...\n"
|
msgid "Dumping cutbuffer to stderr...\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: winio.c:1242
|
#: winio.c:1250
|
||||||
msgid "Dumping a buffer to stderr...\n"
|
msgid "Dumping a buffer to stderr...\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
10
winio.c
10
winio.c
@ -822,6 +822,7 @@ void center_cursor(void)
|
|||||||
/* Refresh the screen without changing the position of lines */
|
/* Refresh the screen without changing the position of lines */
|
||||||
void edit_refresh(void)
|
void edit_refresh(void)
|
||||||
{
|
{
|
||||||
|
static int noloop = 0;
|
||||||
int lines = 0, i = 0, currentcheck = 0;
|
int lines = 0, i = 0, currentcheck = 0;
|
||||||
filestruct *temp, *hold = current;
|
filestruct *temp, *hold = current;
|
||||||
|
|
||||||
@ -839,8 +840,15 @@ void edit_refresh(void)
|
|||||||
temp = temp->next;
|
temp = temp->next;
|
||||||
lines++;
|
lines++;
|
||||||
}
|
}
|
||||||
if (!currentcheck) /* Then current has run off the screen... */
|
/* If noloop == 1, then we already did an edit_update without finishing
|
||||||
|
this function. So we don't run edit_update again */
|
||||||
|
if (!currentcheck && !noloop) /* Then current has run off the screen... */
|
||||||
|
{
|
||||||
edit_update(current, CENTER);
|
edit_update(current, CENTER);
|
||||||
|
noloop = 1;
|
||||||
|
}
|
||||||
|
else if (noloop)
|
||||||
|
noloop = 0;
|
||||||
|
|
||||||
if (lines <= editwinrows - 1)
|
if (lines <= editwinrows - 1)
|
||||||
while (lines <= editwinrows - 1) {
|
while (lines <= editwinrows - 1) {
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user