averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vim73' into macvim73

Browse Source
This commit is contained in:
Bjorn Winckler
2010-06-09 19:10:45 +02:00
parent 3099f063a9 8b7f3067e2
commit 6f31fa5b89
6 changed files with 174 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Make_ivc.mak
+8
View File
@@ -326,6 +326,10 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
# Begin Source File
SOURCE=.\blowfish.c
# End Source File
# Begin Source File
SOURCE=.\buffer.c
# End Source File
# Begin Source File
@@ -620,6 +624,10 @@ SOURCE=.\search.c
# End Source File
# Begin Source File
SOURCE=.\sha256.c
# End Source File
# Begin Source File
SOURCE=.\spell.c
# End Source File
# Begin Source File
src/fileio.c
+1
View File
@@ -8830,6 +8830,7 @@ aucmd_prepbuf(aco, buf)
aco->use_aucmd_win = TRUE;
aucmd_win_used = TRUE;
aucmd_win->w_buffer = buf;
aucmd_win->w_s = &buf->b_s;
++buf->b_nwindows;
win_init_empty(aucmd_win); /* set cursor and topline to safe values */
vim_free(aucmd_win->w_localdir);
src/normal.c
+41 -1
View File
@@ -6692,7 +6692,7 @@ nv_percent(cap)
cmdarg_T *cap;
{
pos_T *pos;
#ifdef FEAT_FOLDING
#if defined(FEAT_FOLDING) || defined(FEAT_CONCEAL)
linenr_T lnum = curwin->w_cursor.lnum;
#endif
@@ -6744,6 +6744,13 @@ nv_percent(cap)
&& KeyTyped)
foldOpenCursor();
#endif
#ifdef FEAT_CONCEAL
if (curwin->w_p_conceal && lnum != curwin->w_cursor.lnum)
{
update_single_line(curwin, lnum);
update_single_line(curwin, curwin->w_cursor.lnum);
}
#endif
}
/*
@@ -6798,6 +6805,9 @@ nv_mark(cap)
nv_findpar(cap)
cmdarg_T *cap;
{
#ifdef FEAT_CONCEAL
linenr_T oldline = curwin->w_cursor.lnum;
#endif
cap->oap->motion_type = MCHAR;
cap->oap->inclusive = FALSE;
cap->oap->use_reg_one = TRUE;
@@ -6812,6 +6822,13 @@ nv_findpar(cap)
#ifdef FEAT_FOLDING
if ((fdo_flags & FDO_BLOCK) && KeyTyped && cap->oap->op_type == OP_NOP)
foldOpenCursor();
#endif
#ifdef FEAT_CONCEAL
if (curwin->w_p_conceal && oldline != curwin->w_cursor.lnum)
{
update_single_line(curwin, oldline);
update_single_line(curwin, curwin->w_cursor.lnum);
}
#endif
}
}
@@ -7734,6 +7751,9 @@ nv_g_cmd(cap)
#endif
int i;
int flag = FALSE;
#ifdef FEAT_CONCEAL
linenr_T oldline;
#endif
switch (cap->nchar)
{
@@ -7875,6 +7895,9 @@ nv_g_cmd(cap)
case K_DOWN:
/* with 'nowrap' it works just like the normal "j" command; also when
* in a closed fold */
#ifdef FEAT_CONCEAL
oldline = curwin->w_cursor.lnum;
#endif
if (!curwin->w_p_wrap
#ifdef FEAT_FOLDING
|| hasFolding(curwin->w_cursor.lnum, NULL, NULL)
@@ -7888,12 +7911,22 @@ nv_g_cmd(cap)
i = nv_screengo(oap, FORWARD, cap->count1);
if (i == FAIL)
clearopbeep(oap);
#ifdef FEAT_CONCEAL
else if (curwin->w_p_conceal && oldline != curwin->w_cursor.lnum)
{
update_single_line(curwin, oldline);
update_single_line(curwin, curwin->w_cursor.lnum);
}
#endif
break;
case 'k':
case K_UP:
/* with 'nowrap' it works just like the normal "k" command; also when
* in a closed fold */
#ifdef FEAT_CONCEAL
oldline = curwin->w_cursor.lnum;
#endif
if (!curwin->w_p_wrap
#ifdef FEAT_FOLDING
|| hasFolding(curwin->w_cursor.lnum, NULL, NULL)
@@ -7907,6 +7940,13 @@ nv_g_cmd(cap)
i = nv_screengo(oap, BACKWARD, cap->count1);
if (i == FAIL)
clearopbeep(oap);
#ifdef FEAT_CONCEAL
else if (curwin->w_p_conceal && oldline != curwin->w_cursor.lnum)
{
update_single_line(curwin, oldline);
update_single_line(curwin, curwin->w_cursor.lnum);
}
#endif
break;
/*
src/po/it.po
+116 -13
View File
@@ -11,9 +11,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: vim 7.2\n"
"POT-Creation-Date: 2010-05-17 10:05+0200\n"
"PO-Revision-Date: 2009-05-17 10:05+0200\n"
"Project-Id-Version: vim 7.3\n"
"POT-Creation-Date: 2010-06-08 12:54+0200\n"
"PO-Revision-Date: 2010-06-08 16:55+0200\n"
"Last-Translator: Vlad Sandrini <vlad.gently@gmail.com>\n"
"Language-Team: Italian"
" Antonio Colombo <azc100@gmail.com>"
@@ -24,6 +24,21 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
"Report-Msgid-Bugs-To: \n"
msgid "E831: bf_key_init() called with empty password"
msgstr "E831: chiamata a bf_key_init() con password nulla"
msgid "E820: sizeof(uint32_t) != 4"
msgstr "E820: sizeof(uint32_t) != 4"
msgid "E817: Blowfish big/little endian use wrong"
msgstr "E817: uso errato di big/little endian in Blowfish"
msgid "E818: sha256 test failed"
msgstr "E818: test sha256 fallito"
msgid "E819: Blowfish test failed"
msgstr "E819: test Blowfish fallito"
msgid "E82: Cannot allocate any buffer, exiting..."
msgstr "E82: Non riesco ad allocare alcun buffer, esco..."
@@ -192,7 +207,7 @@ msgid "E810: Cannot read or write temp files"
msgstr "E810: Non riesco a leggere o scrivere file temporanei"
msgid "E97: Cannot create diffs"
msgstr "E97: Non riesco a creare differenze "
msgstr "E97: Non riesco a creare differenze"
msgid "Patch file"
msgstr "File di differenze"
@@ -915,7 +930,7 @@ msgid "(Interrupted) "
msgstr "(Interrotto) "
msgid "1 match"
msgstr "1 corrisp. "
msgstr "1 corrisp."
msgid "1 substitution"
msgstr "1 sostituzione"
@@ -1173,7 +1188,7 @@ msgid "End of sourced file"
msgstr "Fine del file di comandi"
msgid "End of function"
msgstr "Fine funzione "
msgstr "Fine funzione"
msgid "E464: Ambiguous use of user-defined command"
msgstr "E464: Uso ambiguo di comando definito dall'utente"
@@ -1627,6 +1642,9 @@ msgstr "Conversione fallita con 'charconvert'"
msgid "can't read output of 'charconvert'"
msgstr "non riesco a leggere il risultato di 'charconvert'"
msgid "E821: File is encrypted with unknown method"
msgstr "E821: File cifrato con metodo sconosciuto"
msgid "E676: No matching autocommands for acwrite buffer"
msgstr "E676: Nessun autocomando corrispondente per buffer acwrite"
@@ -1786,6 +1804,10 @@ msgstr "%ld linee,"
msgid "1 character"
msgstr "1 carattere"
#, c-format
msgid "%lld characters"
msgstr "%lld caratteri"
#, c-format
msgid "%ld characters"
msgstr "%ld caratteri"
@@ -2141,7 +2163,7 @@ msgstr "&U Disfa"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Non riesco a caricate il fonte Zap '%s'"
msgstr "E610: Non riesco a caricate il font Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
@@ -2866,6 +2888,9 @@ msgstr "Argomento non valido per"
msgid "%d files to edit\n"
msgstr "%d file da elaborare\n"
msgid "netbeans is not supported with this GUI\n"
msgstr "netbeans non è supportato con questa GUI\n"
msgid "This Vim was not compiled with the diff feature."
msgstr "Vim non compilato con funzionalità 'diff'."
@@ -3516,14 +3541,20 @@ msgstr ""
"\n"
"(Potresti salvare questo file con un altro nome ed eseguire\n"
msgid "and run diff with the original file to check for changes)\n"
msgstr "'diff' rispetto al file originale per vedere le differenze)\n"
msgid "and run diff with the original file to check for changes)"
msgstr "'diff' rispetto al file originale per vedere le differenze)"
msgid "Recovery completed. Buffer contents equals file contents."
msgstr "Ripristino effettuato. Il contenuto del buffer coincide con quello del file."
#, fuzzy
msgid ""
"Delete the .swp file afterwards.\n"
"\n"
"You may want to delete the .swp file now.\n"
"\n"
msgstr ""
"Cancella il file .swp in seguito.\n"
"\n"
"È consigliato cancellare il file .swp adesso.\n"
"\n"
#. use msg() to start the scrolling properly
@@ -4049,6 +4080,9 @@ msgstr "lettura da socket Netbeans"
msgid "E658: NetBeans connection lost for buffer %ld"
msgstr "E658: Connessione NetBeans persa per il buffer %ld"
msgid "E511: netbeans already connected"
msgstr "E511: netbeans già connesso"
msgid "E505: "
msgstr "E505: "
@@ -5544,6 +5578,75 @@ msgstr "Uso CUT_BUFFER0 invece che una scelta nulla"
msgid "No undo possible; continue anyway"
msgstr "'undo' non più possibile; continuo comunque"
#, c-format
msgid "E828: Cannot open undo file for writing: %s"
msgstr "E828: Non posso aprire il file Undo in scrittura: %s"
#, c-format
msgid "E825: Corrupted undo file (%s): %s"
msgstr "E825: File Undo corrotto (%s): %s"
msgid "Cannot write undo file in any directory in 'undodir'"
msgstr "Non posso scrivere un file Undo in alcuna directory di 'undodir'"
#, c-format
msgid "Will not overwrite with undo file, cannot read: %s"
msgstr "File Undo non sovrascritto, non riesco a leggere: %s"
#, c-format
msgid "Will not overwrite, this is not an undo file: %s"
msgstr "Non sovrascritto, non è un file Undo: %s"
msgid "Skipping undo file write, noting to undo"
msgstr "Ometto scrittura del file Undo, non ci sono modifiche"
#, c-format
msgid "Writing undo file: %s"
msgstr "Scrivo file Undo: %s"
#, fuzzy, c-format
msgid "E829: write error in undo file: %s"
msgstr "E829: errore scrivendo nel file Undo: %s"
#, c-format
msgid "Not reading undo file, owner differs: %s"
msgstr "Non leggo file Undo, appartiene a un altro utente: %s"
#, c-format
msgid "Reading undo file: %s"
msgstr "Lettura file Undo: %s"
#, c-format
msgid "E822: Cannot open undo file for reading: %s"
msgstr "E822: Non posso aprire il file Undo in lettura: %s"
#, c-format
msgid "E823: Not an undo file: %s"
msgstr "E823: Non è un file Undo: %s"
#, fuzzy, c-format
msgid "E832: Non-encrypted file has encrypted undo file: %s"
msgstr "E832: File non cifrato con file Undo cifrato: %s"
#, c-format
msgid "E826: Undo file decryption failed: %s"
msgstr "E826: Decifratura fallita del file Undo: %s"
#, c-format
msgid "E827: Undo file is encrypted: %s"
msgstr "E827: File Undo cifrato: %s"
#, c-format
msgid "E824: Incompatible undo file: %s"
msgstr "E824: File Undo incompatibile: %s"
msgid "File contents changed, cannot use undo info"
msgstr "File ulteriormente modificato, non posso usare informazioni di Undo"
#, c-format
msgid "Finished reading undo file %s"
msgstr "Lettura del file Undo %s effettuata"
msgid "Already at oldest change"
msgstr "Questa è già la prima modifica"
@@ -5551,8 +5654,8 @@ msgid "Already at newest change"
msgstr "Questa è già l'ultima modifica"
#, c-format
msgid "Undo number %ld not found"
msgstr "Undo numero %ld non trovato"
msgid "E830: Undo number %ld not found"
msgstr "E830: Undo numero %ld non trovato"
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: numeri linee errati"
src/po/ko.UTF-8.po
+4 -4
View File
@@ -202,7 +202,7 @@ msgid "E99: Current buffer is not in diff mode"
msgstr "E99: 현재 버퍼는 diff 상태가 아닙니다"
msgid "E793: No other buffer in diff mode is modifiable"
msgstr "E100: 수정 가능한 diff 상태 버퍼는 없습니다"
msgstr "E793: 수정 가능한 diff 상태 버퍼는 없습니다"
msgid "E100: No other buffer in diff mode"
msgstr "E100: 다른 버퍼중에 diff 상태인 게 없습니다"
@@ -855,7 +855,7 @@ msgstr "스왑 파일 \"%s\"가 있습니다, 덮어쓸까요?"
#, c-format
msgid "E768: Swap file exists: %s (:silent! overrides)"
msgstr "E13: 스왑 파일 있슴: %s (덮어쓰려면 :silent! 사용)"
msgstr "E768: 스왑 파일 있슴: %s (덮어쓰려면 :silent! 사용)"
#, c-format
msgid "E141: No file name for buffer %ld"
@@ -1444,10 +1444,10 @@ msgid "E587: :break without :while or :for"
msgstr "E587: :while 혹은 :for없이 :break가 있습니다"
msgid "E732: Using :endfor with :while"
msgstr "E170: :while에 :endfor가 사용되었습니다"
msgstr "E732: :while에 :endfor가 사용되었습니다"
msgid "E733: Using :endwhile with :for"
msgstr "E170: :for에 :endwhile이 사용되었습니다"
msgstr "E733: :for에 :endwhile이 사용되었습니다"
msgid "E601: :try nesting too deep"
msgstr "E601: :try가 너무 깊게 중첩되었습니다"
src/po/ko.po
+4 -4
View File
@@ -202,7 +202,7 @@ msgid "E99: Current buffer is not in diff mode"
msgstr "E99: 현재 버퍼는 diff 상태가 아닙니다"
msgid "E793: No other buffer in diff mode is modifiable"
msgstr "E100: 수정 가능한 diff 상태 버퍼는 없습니다"
msgstr "E793: 수정 가능한 diff 상태 버퍼는 없습니다"
msgid "E100: No other buffer in diff mode"
msgstr "E100: 다른 버퍼중에 diff 상태인 게 없습니다"
@@ -855,7 +855,7 @@ msgstr "
#, c-format
msgid "E768: Swap file exists: %s (:silent! overrides)"
msgstr "E13: 스왑 파일 있슴: %s (덮어쓰려면 :silent! 사용)"
msgstr "E768: 스왑 파일 있슴: %s (덮어쓰려면 :silent! 사용)"
#, c-format
msgid "E141: No file name for buffer %ld"
@@ -1444,10 +1444,10 @@ msgid "E587: :break without :while or :for"
msgstr "E587: :while 혹은 :for없이 :break가 있습니다"
msgid "E732: Using :endfor with :while"
msgstr "E170: :while에 :endfor가 사용되었습니다"
msgstr "E732: :while에 :endfor가 사용되었습니다"
msgid "E733: Using :endwhile with :for"
msgstr "E170: :for에 :endwhile이 사용되었습니다"
msgstr "E733: :for에 :endwhile이 사용되었습니다"
msgid "E601: :try nesting too deep"
msgstr "E601: :try가 너무 깊게 중첩되었습니다"