thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

First step in the Vim 7.3 branch. Changed version numbers.

Browse Source
This commit is contained in:
Bram Moolenaar
2010-05-15 13:56:02 +02:00
parent 00a927d62b
commit fff2beeeaa
171 changed files with 421 additions and 1145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GvimExt/GvimExt.reg
View File

@@ -15,6 +15,6 @@ REGEDIT4
[HKEY_LOCAL_MACHINE\Software\Vim\Gvim]
"path"="gvim.exe"
[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.2]
"DisplayName"="Vim 7.2: Edit with Vim popup menu entry"
[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.3a]
"DisplayName"="Vim 7.3a: Edit with Vim popup menu entry"
"UninstallString"="uninstal.exe"

18
src/INSTALLx.txt
View File

@@ -50,7 +50,7 @@ You need to set the following "configure" command line switches:
--host.
--with-tlib=... :
Which terminal library to.
Which terminal library to use.
For example, "ncurses".
@@ -68,26 +68,26 @@ ac_cv_sizeof_int:
machines.
vi_cv_path_python_conf:
If Python support is enabled, set this variables to the path for
If Python support is enabled, set this variable to the path for
Python's library implementation. This is a path like
"/usr/lib/pythonX.Y/config" (the directory contains a file
"config.c").
vi_cv_var_python_epfx:
If Python support is enabled, set this variables to the execution
If Python support is enabled, set this variable to the execution
prefix of your Python interpreter (that is, where it thinks it is
running).
This is the output of the following Python script:
import sys; print sys.exec_prefix
vi_cv_var_python_pfx:
If Python support is enabled, set this variables to the prefix of your
Python interpreter (that is, where was installed).
If Python support is enabled, set this variable to the prefix of your
Python interpreter (that is, where it was installed).
This is the output of the following Python script:
import sys; print sys.prefix
vi_cv_var_python_version:
If Python support is enabled, set this variables to the version of the
If Python support is enabled, set this variable to the version of the
Python interpreter that will be used.
This is the output of the following Python script:
import sys; print sys.version[:3]
@@ -133,11 +133,11 @@ vim_cv_toupper_broken:
vim_cv_tty_group:
The default group of pseudo terminals. Either set to the numeric value
of the your tty group or to "world" if they are world accessable.
of your tty group or to "world" if they are world accessible.
vim_cv_tty_mode:
The default mode of pseudo terminals if they are not world accessable.
Most propably the value "0620".
The default mode of pseudo terminals if they are not world accessible.
Most probably the value "0620".
4. EXAMPLE:

4
src/Makefile
View File

@@ -536,7 +536,7 @@ CClink = $(CC)
#CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
# Use this with GCC to check for mistakes, unused arguments, etc.
#CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
#CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -D_FORTIFY_SOURCE=1
#PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
#MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
@@ -914,7 +914,7 @@ MAN1DIR = /man1
### Vim version (adjusted by a script)
VIMMAJOR = 7
VIMMINOR = 2
VIMMINOR = 3a
### Location of Vim files (should not need to be changed, and {{{1
### some things might not work when they are changed!)

2
src/README.txt
View File

@@ -24,7 +24,7 @@ Most code can be found in a file with an obvious name (incomplete list):
fold.c folding
getchar.c getting characters and key mapping
mark.c marks
mbyte.c multy-byte character handling
mbyte.c multi-byte character handling
memfile.c storing lines for buffers in a swapfile
memline.c storing lines for buffers in memory
menu.c menus

5
src/dosinst.c
View File

@@ -63,7 +63,7 @@ char *(compat_choices[]) =
{
"\nChoose the default way to run Vim:",
"Vi compatible",
"with some Vim ehancements",
"with some Vim enhancements",
"with syntax highlighting and other features switched on",
};
int compat_choice = (int)compat_all_enhancements;
@@ -554,7 +554,7 @@ uninstall_check(void)
}
run_command(temp_string_buffer);
/* Check if an unistall reg key was deleted.
/* Check if an uninstall reg key was deleted.
* if it was, we want to decrement key_index.
* if we don't do this, we will skip the key
* immediately after any key that we delete. */
@@ -1131,7 +1131,6 @@ init_bat_choices(void)
/*
* Install the vimrc file.
*/
/*ARGSUSED*/
static void
install_vimrc(int idx)
{

1
src/globals.h
View File

@@ -50,6 +50,7 @@ EXTERN char_u *LineWraps INIT(= NULL); /* line wraps to next line */
* ScreenLinesUC[] contains the Unicode for the character at this position, or
* NUL when the character in ScreenLines[] is to be used (ASCII char).
* The composing characters are to be drawn on top of the original character.
* ScreenLinesC[0][off] is only to be used when ScreenLinesUC[off] != 0.
* Note: These three are only allocated when enc_utf8 is set!
*/
EXTERN u8char_T *ScreenLinesUC INIT(= NULL); /* decoded UTF-8 characters */

6
src/gui_gtk_x11.c
View File

@@ -4428,7 +4428,7 @@ gui_mch_set_shellsize(int width, int height,
/* this will cause the proper resizement to happen too */
update_window_manager_hints(0, 0);
#else /* HAVE_GTK2 */
#else
/* this will cause the proper resizement to happen too */
if (gtk_socket_id == 0)
update_window_manager_hints(0, 0);
@@ -4444,14 +4444,14 @@ gui_mch_set_shellsize(int width, int height,
else
update_window_manager_hints(width, height);
#if 0
# if 0
if (!resize_idle_installed)
{
g_idle_add_full(GDK_PRIORITY_EVENTS + 10,
&force_shell_resize_idle, NULL, NULL);
resize_idle_installed = TRUE;
}
#endif
# endif
/*
* Wait until all events are processed to prevent a crash because the
* real size of the drawing area doesn't reflect Vim's internal ideas.

26
src/if_sniff.c
View File

@@ -969,20 +969,20 @@ get_request(fd, buf, maxlen)
#ifdef HAVE_SELECT
if (select(fd + 1, &rfds, NULL, NULL, &tval) > 0)
#else
if (poll(&fds, 1, 0) > 0)
if (poll(&fds, 1, 0) > 0)
#endif
{
pos = 0;
bytes = read(fd, inbuf, sizeof(inbuf));
if (bytes <= 0)
return bytes;
}
else
{
pos = pos-len;
buf[0] = '\0';
return 0;
}
{
pos = 0;
bytes = read(fd, inbuf, sizeof(inbuf));
if (bytes <= 0)
return bytes;
}
else
{
pos = pos-len;
buf[0] = '\0';
return 0;
}
}
if ((buf[len] = inbuf[pos++]) =='\n')
break;

2
src/if_sniff.h
View File

@@ -1,7 +1,5 @@
/*
* if_sniff.h Interface between Vim and SNiFF+
*
* $Id$
*/
#ifndef __if_sniff_h__

12
src/integration.h
View File

@@ -283,23 +283,26 @@ void workshop_file_opened(char *filename, int readOnly);
void workshop_file_saved(char *filename);
#if 0
/* A file has been closed */
void workshop_file_closed(char *filename);
#endif
/* Like workshop_file_closed, but also inform eserve what line the
cursor was on when you left the file. That way eserve can put you
back where you left off when you return to this file. */
void workshop_file_closed_lineno(char *filename, int line);
#if 0
/* A file has been modified */
void workshop_file_modified(char *filename);
/*
* A mark has been moved. Only call this as a response to
* a workshop_moved_marks request call.
*/
void workshop_move_mark(char *filename, int markId, int newLineno);
#endif
/* Tell the integration library about a new frame being added.
* Supply a form for the toolbar, a label for the footer, and an
@@ -377,7 +380,9 @@ int workshop_get_balloon_text(Position x, Position y,
*/
void workshop_frame_moved(int new_x, int new_y, int new_w, int new_h);
Boolean workshop_get_width_height(int *, int *);
#if 0
Boolean workshop_get_rows_cols(int *, int *);
#endif
/* This function should be invoked when you press a hotkey
* set up by workshop_register_hotkey. Pass the clientData
@@ -396,20 +401,23 @@ void workshop_hotkey_pressed(void *frame, void *clientData);
*
*/
#if 0
/* Were we invoked by WorkShop? This function can be used early during startup
* if you want to do things differently if the editor is started standalone
* or in WorkShop mode. For example, in standalone mode you may not want to
* add a footer/message area or a sign gutter.
*/
int workshop_invoked(void);
#endif
#if 0
/*
*Set the desktop icon of the current shell to the given xpm icon.
* Standard WorkShop desktop icons should be 48x48.
*/
void workshop_set_icon(Display *display, Widget shell, char **xpmdata,
int width, int height);
#endif
/* Minimize (iconify) the given shell */

3
src/main.aap
View File

@@ -267,7 +267,8 @@ distclean: clean
# messages. Don't worry about that.
# If there is a real error, there will be a difference between "test.out" and
# a "test99.ok" file.
# If everything is alright, the final message will be "ALL DONE".
# If everything is alright, the final message will be "ALL DONE". If not you
# get "TEST FAILURE".
#
test check:
VimProg = ../$Target

1
src/mbyte.c
View File

@@ -1855,6 +1855,7 @@ utfc_ptr2char_len(p, pcc, maxlen)
* Convert the character at screen position "off" to a sequence of bytes.
* Includes the composing characters.
* "buf" must at least have the length MB_MAXBYTES.
* Only to be used when ScreenLinesUC[off] != 0.
* Returns the produced number of bytes.
*/
int

2
src/move.c
View File

@@ -696,7 +696,7 @@ validate_cline_row()
/*
* Compute wp->w_cline_row and wp->w_cline_height, based on the current value
* of wp->w_topine.
* of wp->w_topline.
*
* Returns OK when cursor is in the window, FAIL when it isn't.
*/

245
src/po/ga.po
View File

@@ -1,13 +1,13 @@
# Irish translations for vim.
# This file is distributed under the same license as the vim package.
# Kevin Patrick Scannell <scannell@SLU.EDU>, 2005, 2006, 2008.
# Kevin Patrick Scannell <kscanne@gmail.com>, 2005, 2006, 2008, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: vim 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-05-24 12:31-0500\n"
"PO-Revision-Date: 2008-05-24 12:49-0500\n"
"POT-Creation-Date: 2010-04-14 09:44-0500\n"
"PO-Revision-Date: 2010-04-14 10:01-0500\n"
"Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -30,21 +30,21 @@ msgid "E517: No buffers were wiped out"
msgstr "E517: Ní raibh aon mhaolán bánaithe"
msgid "1 buffer unloaded"
msgstr "Bhí 1 maolán díluchtaithe"
msgstr "Bhí maolán amháin díluchtaithe"
#, c-format
msgid "%d buffers unloaded"
msgstr "%d maolán folmhaithe"
msgid "1 buffer deleted"
msgstr "Bhí 1 maolán scriosta"
msgstr "Bhí maolán amháin scriosta"
#, c-format
msgid "%d buffers deleted"
msgstr "%d maolán scriosta"
msgid "1 buffer wiped out"
msgstr "Bhí 1 maolán bánaithe"
msgstr "Bhí maolán amháin bánaithe"
#, c-format
msgid "%d buffers wiped out"
@@ -161,6 +161,9 @@ msgstr "[Liosta Su
msgid "[Quickfix List]"
msgstr "[Liosta Ceartúchán Tapa]"
msgid "[Scratch]"
msgstr "[Sealadach]"
msgid ""
"\n"
"--- Signs ---"
@@ -180,14 +183,20 @@ msgstr " l
msgid "E96: Can not diff more than %ld buffers"
msgstr "E96: Ní féidir diff a dhéanamh ar níos mó ná %ld maolán"
msgid "E810: Cannot read or write temp files"
msgstr "E810: Ní féidir comhaid shealadacha a léamh nó a scríobh"
msgid "E97: Cannot create diffs"
msgstr "E97: Ní féidir diffeanna a chruthú"
msgid "Patch file"
msgstr "Comhad paiste"
msgid "E816: Cannot read patch output"
msgstr "E816: Ní féidir aschur ó 'patch' a léamh"
msgid "E98: Cannot read diff output"
msgstr "E98: Ní féidir an t-aschur diff a léamh"
msgstr "E98: Ní féidir aschur ó 'diff' a léamh"
msgid "E99: Current buffer is not in diff mode"
msgstr "E99: Níl an maolán reatha sa mhód diff"
@@ -292,7 +301,6 @@ msgstr " (ionadaigh) Scrollaigh (^E/^Y)"
msgid "Scanning: %s"
msgstr "%s á scanadh"
#, c-format
msgid "Scanning tags."
msgstr "Clibeanna á scanadh."
@@ -420,7 +428,7 @@ msgstr "E690: \"in\" ar iarraidh i ndiaidh :for"
#, c-format
msgid "E107: Missing parentheses: %s"
msgstr "E107: Lúibíní slabhracha ar iarraidh: %s"
msgstr "E107: Lúibíní ar iarraidh: %s"
#, c-format
msgid "E108: No such variable: \"%s\""
@@ -450,6 +458,9 @@ msgstr "E693: Is f
msgid "E694: Invalid operation for Funcrefs"
msgstr "E694: Oibríocht neamhbhailí ar Funcref"
msgid "E804: Cannot use '%' with Float"
msgstr "E804: Ní féidir '%' a úsáid le Snámhphointe"
msgid "E110: Missing ')'"
msgstr "E110: ')' ar iarraidh"
@@ -499,6 +510,14 @@ msgstr "E723: '}' ar iarraidh ag deireadh focl
msgid "E724: variable nested too deep for displaying"
msgstr "E724: athróg neadaithe ródhomhain chun í a thaispeáint"
#, c-format
msgid "E740: Too many arguments for function %s"
msgstr "E740: An iomarca argóintí d'fheidhm %s"
#, c-format
msgid "E116: Invalid arguments for function %s"
msgstr "E116: Argóintí neamhbhailí d'fheidhm %s"
#, c-format
msgid "E117: Unknown function: %s"
msgstr "E117: Feidhm anaithnid: %s"
@@ -515,6 +534,9 @@ msgstr "E120: <SID>
msgid "E725: Calling dict function without Dictionary: %s"
msgstr "E725: Feidhm 'dict' á ghlao gan Foclóir: %s"
msgid "E808: Number or Float required"
msgstr "E808: Uimhir nó Snámhphointe de dhíth"
msgid "E699: Too many arguments"
msgstr "E699: An iomarca argóintí"
@@ -591,14 +613,17 @@ msgstr "(Neamhbhail
msgid "E677: Error writing temp file"
msgstr "E677: Earráid agus comhad sealadach á scríobh"
msgid "E805: Using a Float as a Number"
msgstr "E805: Snámhphointe á úsáid mar Uimhir"
msgid "E703: Using a Funcref as a Number"
msgstr "E703: Funcref á úsáid mar uimhir"
msgstr "E703: Funcref á úsáid mar Uimhir"
msgid "E745: Using a List as a Number"
msgstr "E745: Liosta á úsáid mar uimhir"
msgstr "E745: Liosta á úsáid mar Uimhir"
msgid "E728: Using a Dictionary as a Number"
msgstr "E728: Foclóir á úsáid mar uimhir"
msgstr "E728: Foclóir á úsáid mar Uimhir"
msgid "E729: using Funcref as a String"
msgstr "E729: Funcref á úsáid mar Theaghrán"
@@ -609,6 +634,9 @@ msgstr "E730: Liosta
msgid "E731: using Dictionary as a String"
msgstr "E731: Foclóir á úsáid mar Theaghrán"
msgid "E806: using Float as a String"
msgstr "E806: Snámhphointe á úsáid mar Theaghrán"
#, c-format
msgid "E704: Funcref variable name must start with a capital: %s"
msgstr "E704: Caithfidh ceannlitir a bheith ar dtús ainm Funcref: %s"
@@ -639,6 +667,10 @@ msgstr "E742: N
msgid "E698: variable nested too deep for making a copy"
msgstr "E698: athróg neadaithe ródhomhain chun í a chóipeáil"
#, c-format
msgid "E123: Undefined function: %s"
msgstr "E123: Feidhm gan sainmhíniú: %s"
#, c-format
msgid "E124: Missing '(': %s"
msgstr "E124: '(' ar iarraidh: %s"
@@ -650,6 +682,14 @@ msgstr "E125: Arg
msgid "E126: Missing :endfunction"
msgstr "E126: :endfunction ar iarraidh"
#, c-format
msgid "E707: Function name conflicts with variable: %s"
msgstr "E707: Tagann ainm na feidhme salach ar athróg: %s"
#, c-format
msgid "E127: Cannot redefine function %s: It is in use"
msgstr "E127: Ní féidir sainmhíniú nua a dhéanamh ar fheidhm %s: In úsáid cheana"
#, c-format
msgid "E746: Function name does not match script file name: %s"
msgstr ""
@@ -709,6 +749,9 @@ msgstr ""
"\n"
"\tSocraithe is déanaí ó "
msgid "No old files"
msgstr "Gan seanchomhaid"
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, Heics %02x, Ocht %03o"
@@ -725,7 +768,7 @@ msgid "E134: Move lines into themselves"
msgstr "E134: Bog línte isteach iontu féin"
msgid "1 line moved"
msgstr "Bogadh 1 líne"
msgstr "Bogadh líne amháin"
#, c-format
msgid "%ld lines moved"
@@ -760,6 +803,9 @@ msgstr " eolas"
msgid " marks"
msgstr " marcanna"
msgid " oldfiles"
msgstr " seanchomhad"
msgid " FAILED"
msgstr " TEIPTHE"
@@ -885,7 +931,7 @@ msgid "%ld substitutions"
msgstr "%ld ionadaíocht"
msgid " on 1 line"
msgstr " ar 1 líne"
msgstr " ar líne amháin"
#, c-format
msgid " on %ld lines"
@@ -1011,8 +1057,8 @@ msgstr "N
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s líne %ld"
msgid "E750: First use :profile start <fname>"
msgstr "E750: Úsáid :profile start <ainm> ar dtús"
msgid "E750: First use \":profile start {fname}\""
msgstr "E750: Úsáid \":profile start {ainm}\" ar dtús"
#, c-format
msgid "Save changes to \"%s\"?"
@@ -1162,7 +1208,7 @@ msgid "%d more files to edit. Quit anyway?"
msgstr "%d comhad le cur in eagar fós. Scoir mar sin féin?"
msgid "E173: 1 more file to edit"
msgstr "E173: 1 comhad le heagrú"
msgstr "E173: 1 chomhad le heagrú fós"
#, c-format
msgid "E173: %ld more files to edit"
@@ -1304,6 +1350,9 @@ msgstr "E191: Caithfidh an arg
msgid "E192: Recursive use of :normal too deep"
msgstr "E192: athchúrsáil :normal ródhomhain"
msgid "E809: #< is not available without the +eval feature"
msgstr "E809: níl #< ar fáil gan ghné +eval"
msgid "E194: No alternate file name to substitute for '#'"
msgstr "E194: Níl aon ainm comhaid a chur in ionad '#'"
@@ -1445,6 +1494,9 @@ msgstr "E193: Caithfidh :endfunction a bheith isteach i bhfeidhm"
msgid "E788: Not allowed to edit another buffer now"
msgstr "E788: Níl cead agat maolán eile a chur in eagar anois"
msgid "E811: Not allowed to change buffer information now"
msgstr "E811: Níl cead agat faisnéis an mhaoláin a athrú anois"
msgid "tagname"
msgstr "clibainm"
@@ -1482,6 +1534,10 @@ msgstr "E198: cmd_pchar os cionn fad an ordaithe"
msgid "E199: Active window or buffer deleted"
msgstr "E199: Scriosadh an fhuinneog reatha nó an maolán reatha"
msgid "E812: Autocommands changed buffer or buffer name"
msgstr ""
"E812: Bhí maolán nó ainm maoláin athraithe ag orduithe uathoibríocha"
msgid "Illegal file name"
msgstr "Ainm comhaid neamhcheadaithe"
@@ -1541,9 +1597,6 @@ msgstr "[L-A]"
msgid "[CR missing]"
msgstr "[CR ar iarraidh]"
msgid "[NL found]"
msgstr "[NL aimsithe]"
msgid "[long lines split]"
msgstr "[línte fada deighilte]"
@@ -1646,12 +1699,24 @@ msgstr ""
"E513: earráid le linn scríobh, theip ar thiontú (úsáid 'fenc' folamh chun "
"sárú)"
#, c-format
msgid ""
"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
"override)"
msgstr ""
"E513: earráid le linn scríofa, theip ar thiontú ar líne %ld (úsáid 'fenc' folamh le "
"sárú)"
msgid "E514: write error (file system full?)"
msgstr "E514: earráid le linn scríofa (an bhfuil an córas comhaid lán?)"
msgid " CONVERSION ERROR"
msgstr " EARRÁID TIONTAITHE"
#, c-format
msgid " in line %ld;"
msgstr " ar líne %ld;"
msgid "[Device]"
msgstr "[Gléas]"
@@ -2039,9 +2104,6 @@ msgstr "Vim: Milleadh an pr
msgid "Font Selection"
msgstr "Roghnú Cló"
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr "Úsáideadh CUT_BUFFER0 in ionad roghnúcháin folaimh"
msgid "&Filter"
msgstr "&Scagaire"
@@ -2385,8 +2447,29 @@ msgid "cscope commands:\n"
msgstr "Orduithe cscope:\n"
#, c-format
msgid "%-5s: %-30s (Usage: %s)"
msgstr "%-5s: %-30s (Úsáid: %s)"
msgid "%-5s: %s%*s (Usage: %s)"
msgstr "%-5s: %s%*s (Úsáid: %s)"
msgid ""
"\n"
" c: Find functions calling this function\n"
" d: Find functions called by this function\n"
" e: Find this egrep pattern\n"
" f: Find this file\n"
" g: Find this definition\n"
" i: Find files #including this file\n"
" s: Find this C symbol\n"
" t: Find assignments to\n"
msgstr ""
"\n"
" c: Aimsigh feidhmeanna a chuireann glaoch ar an bhfeidhm seo\n"
" d: Aimsigh feidhmeanna a gcuireann an fheidhm seo glaoch orthu\n"
" e: Aimsigh an patrún egrep seo\n"
" f: Aimsigh an comhad seo\n"
" g: Aimsigh an sainmhíniú seo\n"
" i: Aimsigh comhaid a #include-áil an comhad seo\n"
" s: Aimsigh an tsiombail C seo\n"
" t: Aimsigh sanntaí do\n"
#, c-format
msgid "E625: cannot open cscope database: %s"
@@ -2398,9 +2481,6 @@ msgstr "E626: n
msgid "E568: duplicate cscope database not added"
msgstr "E568: níor cuireadh bunachar sonraí dúblach cscope leis"
msgid "E569: maximum number of cscope connections reached"
msgstr "E569: ní cheadaítear níos mó ná an líon uasta nasc cscope"
#, c-format
msgid "E261: cscope connection %s not found"
msgstr "E261: nasc cscope %s gan aimsiú"
@@ -2441,10 +2521,10 @@ msgid " # pid database name prepend path\n"
msgstr " # pid ainm bunachair conair thosaigh\n"
msgid ""
"???: Sorry, this command is disabled, the MzScheme library could not be "
"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
"loaded."
msgstr ""
"???: Tá brón orm, níl an t-ordú seo le fáil, níorbh fhéidir an leabharlann "
"E815: Tá brón orm, bhí an t-ordú seo díchumasaithe, níorbh fhéidir leabharlanna "
"MzScheme a luchtú."
msgid "invalid expression"
@@ -2530,8 +2610,8 @@ msgid "line number out of range"
msgstr "líne-uimhir as raon"
#, c-format
msgid "<buffer object (deleted) at %8lX>"
msgstr "<maolán (scriosta) ag %8lX>"
msgid "<buffer object (deleted) at %p>"
msgstr "<réad maoláin (scriosta) ag %p>"
msgid "invalid mark name"
msgstr "ainm neamhbhailí mairc"
@@ -2549,12 +2629,12 @@ msgid "cursor position outside buffer"
msgstr "cúrsóir taobh amuigh den mhaolán"
#, c-format
msgid "<window object (deleted) at %.8lX>"
msgstr "<fuinneog (scriosta) ag %.8lX>"
msgid "<window object (deleted) at %p>"
msgstr "<réad fuinneoige (scriosta) ag %p>"
#, c-format
msgid "<window object (unknown) at %.8lX>"
msgstr "<fuinneog (anaithnid) ag %.8lX>"
msgid "<window object (unknown) at %p>"
msgstr "<réad fuinneoige (anaithnid) ag %p>"
#, c-format
msgid "<window %d>"
@@ -2792,6 +2872,9 @@ msgstr "%d comhad le heagr
msgid "This Vim was not compiled with the diff feature."
msgstr "Níor tiomsaíodh an leagan Vim seo le `diff' ar fáil."
msgid "'-nb' cannot be used: not enabled at compile time\n"
msgstr "Ní féidir '-nb' a úsáid: níor cumasaíodh é ag am tiomsaithe\n"
msgid "Attempt to open script file again: \""
msgstr "Déan iarracht ar oscailt na scripte arís: \""
@@ -3062,6 +3145,9 @@ msgstr "--serverlist\t\tTaispe
msgid "--servername <name>\tSend to/become the Vim server <name>"
msgstr "--servername <ainm>\tSeol chuig/Téigh i do fhreastalaí Vim <ainm>"
msgid "--startuptime <file>\tWrite startup timing messages to <file>"
msgstr "--startuptime <comhad>\tScríobh faisnéis maidir le tréimhse tosaithe i <comhad>"
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
msgstr "-i <viminfo>\t\tÚsáid <viminfo> in ionad .viminfo"
@@ -3843,17 +3929,22 @@ msgstr "E338: N
msgid "E766: Insufficient arguments for printf()"
msgstr "E766: Easpa argóintí d'fheidhm printf()"
msgid "E807: Expected Float argument for printf()"
msgstr "E807: Bhíothas ag súil le hargóint Snámhphointe d'fheidhm printf()"
msgid "E767: Too many arguments to printf()"
msgstr "E767: An iomarca argóintí d'fheidhm printf()"
msgid "W10: Warning: Changing a readonly file"
msgstr "W10: Rabhadh: Comhad inléite amháin á athrú"
msgid "Type number or click with mouse (<Enter> cancels): "
msgstr "Clóscríobh uimhir nó cliceáil le do luch (<Enter> = cealú): "
msgid "Type number and <Enter> or click with mouse (empty cancels): "
msgstr ""
"Clóscríobh uimhir agus <Enter> nó cliceáil leis an luch (fág folamh le "
"cealú): "
msgid "Choice number (<Enter> cancels): "
msgstr "Uimhir do rogha (<Enter> = cealú): "
msgid "Type number and <Enter> (empty cancels): "
msgstr "Clóscríobh uimhir agus <Enter> (fág folamh le cealú): "
msgid "1 more line"
msgstr "1 líne eile"
@@ -3965,7 +4056,6 @@ msgstr "E346: N
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: Níl comhad \"%s\" sa chonair a thuilleadh"
#. Get here when the server can't be found.
msgid "Cannot connect to Netbeans #2"
msgstr "Ní féidir nascadh le Netbeans #2"
@@ -3986,6 +4076,9 @@ msgstr "E658: Cailleadh nasc NetBeans le haghaidh maol
msgid "E505: "
msgstr "E505: "
msgid "E349: No identifier under cursor"
msgstr "E349: Níl aitheantóir faoin chúrsóir"
msgid "E774: 'operatorfunc' is empty"
msgstr "E774: 'operatorfunc' folamh"
@@ -3998,9 +4091,6 @@ msgstr "Rabhadh: n
msgid "E348: No string under cursor"
msgstr "E348: Níl teaghrán faoin chúrsóir"
msgid "E349: No identifier under cursor"
msgstr "E349: Níl aitheantóir faoin chúrsóir"
msgid "E352: Cannot erase folds with current 'foldmethod'"
msgstr "E352: Ní féidir fillteacha a léirscriosadh leis an 'foldmethod' reatha"
@@ -4041,7 +4131,7 @@ msgid "%ld lines to indent... "
msgstr "%ld líne le heangú... "
msgid "1 line indented "
msgstr "eangaíodh 1 líne "
msgstr "eangaíodh líne amháin "
#, c-format
msgid "%ld lines indented "
@@ -4055,7 +4145,7 @@ msgid "cannot yank; delete anyway"
msgstr "ní féidir a sracadh; scrios mar sin féin"
msgid "1 line changed"
msgstr "athraíodh 1 líne"
msgstr "athraíodh líne amháin"
#, c-format
msgid "%ld lines changed"
@@ -4066,10 +4156,10 @@ msgid "freeing %ld lines"
msgstr "%ld líne á saoradh"
msgid "block of 1 line yanked"
msgstr "sracadh bloc de 1 líne"
msgstr "sracadh bloc de líne amháin"
msgid "1 line yanked"
msgstr "sracadh 1 líne"
msgstr "sracadh líne amháin"
#, c-format
msgid "block of %ld lines yanked"
@@ -4808,6 +4898,9 @@ msgstr "E388: Sainmh
msgid "E389: Couldn't find pattern"
msgstr "E389: Patrún gan aimsiú"
msgid "Substitute "
msgstr "Ionadú "
# in .viminfo
#, c-format
msgid ""
@@ -4910,6 +5003,10 @@ msgstr ""
"Seans go bhfaighfidh tú torthaí míchearta má chuireann tú COMPOUNDPERMITFLAG "
"tar éis míre PFX i %s líne %d"
#, c-format
msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
msgstr "Luach mícheart ar COMPOUNDRULES i %s líne %d: %s"
#, c-format
msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
msgstr "Luach mícheart ar COMPOUNDWORDMAX i %s líne %d: %s"
@@ -5449,6 +5546,9 @@ msgstr "E432: Comhad clibeanna gan s
msgid "E433: No tags file"
msgstr "E433: Níl aon chomhad clibeanna"
msgid "Ignoring long line in tags file"
msgstr "Ag déanamh neamhaird de líne fhada sa chomhad clibeanna"
msgid "E434: Can't find tag pattern"
msgstr "E434: Patrún clibe gan aimsiú"
@@ -5491,6 +5591,9 @@ msgstr "tosa
msgid "Vim: Error reading input, exiting...\n"
msgstr "Vim: Earráid agus an t-inchomhad á léamh; ag scor...\n"
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr "Úsáideadh CUT_BUFFER0 in ionad roghnúcháin folaimh"
#. must display the prompt
msgid "No undo possible; continue anyway"
msgstr "Ní féidir a chealú; lean ar aghaidh mar sin féin"
@@ -5584,6 +5687,13 @@ msgstr " i m
msgid " with OLE support"
msgstr " le tacaíocht OLE"
msgid ""
"\n"
"MS-Windows 64-bit console version"
msgstr ""
"\n"
"Leagan consóil 64 giotán MS-Windows"
msgid ""
"\n"
"MS-Windows 32-bit console version"
@@ -5640,6 +5750,13 @@ msgstr ""
"\n"
"Leagan RISC OS"
msgid ""
"\n"
"OpenVMS version"
msgstr ""
"\n"
"Leagan OpenVMS"
msgid ""
"\n"
"Included patches: "
@@ -5647,6 +5764,13 @@ msgstr ""
"\n"
"Paistí san áireamh: "
msgid ""
"\n"
"Extra patches: "
msgstr ""
"\n"
"Paistí sa bhreis: "
msgid "Modified by "
msgstr "Mionathraithe ag "
@@ -5799,7 +5923,7 @@ msgid "by Bram Moolenaar et al."
msgstr "le Bram Moolenaar et al."
msgid "Vim is open source and freely distributable"
msgstr "Is saorbhogearraí Vim"
msgstr "Is saorbhogearra é Vim"
msgid "Help poor children in Uganda!"
msgstr "Tabhair cabhair do pháistí bochta in Uganda!"
@@ -5884,6 +6008,12 @@ msgstr "E443: N
msgid "E444: Cannot close last window"
msgstr "E444: Ní féidir an fhuinneog dheiridh a dhúnadh"
msgid "E813: Cannot close autocmd window"
msgstr "E813: Ní féidir fuinneog autocmd a dhúnadh"
msgid "E814: Cannot close window, only autocmd window would remain"
msgstr "E814: Ní féidir an fhuinneog a dhúnadh, ní bheadh ach fuinneog autocmd fágtha"
msgid "E445: Other window contains changes"
msgstr "E445: Tá athruithe ann san fhuinneog eile"
@@ -6058,19 +6188,19 @@ msgid "E477: No ! allowed"
msgstr "E477: Ní cheadaítear !"
msgid "E25: GUI cannot be used: Not enabled at compile time"
msgstr "E25: Ní féidir an GUI a úsáid: Níor cumasaíodh é agus Vim á thiomsú"
msgstr "E25: Ní féidir an GUI a úsáid: Níor cumasaíodh é ag am tiomsaithe"
msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
msgstr ""
"E26: Níl tacaíocht Eabhraise ar fáil: Níor cumasaíodh é agus Vim á thiomsú\n"
"E26: Níl tacaíocht Eabhraise ar fáil: Níor cumasaíodh é ag am tiomsaithe\n"
msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
msgstr ""
"E27: Níl tacaíocht Pheirsise ar fáil: Níor cumasaíodh é agus Vim á thiomsú\n"
"E27: Níl tacaíocht Pheirsise ar fáil: Níor cumasaíodh é ag am tiomsaithe\n"
msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
msgstr ""
"E800: Níl tacaíocht Araibise ar fáil: Níor cumasaíodh é agus Vim á thiomsú\n"
"E800: Níl tacaíocht Araibise ar fáil: Níor cumasaíodh é ag am tiomsaithe\n"
#, c-format
msgid "E28: No such highlight group name: %s"
@@ -6282,6 +6412,12 @@ msgstr "Buaileadh an BARR le linn an chuardaigh, ag lean
msgid "search hit BOTTOM, continuing at TOP"
msgstr "Buaileadh an BUN le linn an chuardaigh, ag leanúint ag an BHARR"
#~ msgid "E569: maximum number of cscope connections reached"
#~ msgstr "E569: ní cheadaítear níos mó ná an líon uasta nasc cscope"
#~ msgid "[NL found]"
#~ msgstr "[NL aimsithe]"
#~ msgid "-V[N]\t\tVerbose level"
#~ msgstr "-V[N]\t\tFoclachas"
@@ -6354,9 +6490,6 @@ msgstr "Buaileadh an BUN le linn an chuardaigh, ag lean
#~ msgid "Duplicate UPP in %s line %d"
#~ msgstr "UPP dúblach i %s líne %d"
#~ msgid "E130: Undefined function: %s"
#~ msgstr "E130: Feidhm gan sainmhíniú: %s"
#~ msgid "[string too long]"
#~ msgstr "[teaghrán rófhada]"

4
src/pty.c
View File

@@ -37,8 +37,6 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
/* RCS_ID("$Id$ FAU") */
#include "vim.h"
#include <signal.h>
@@ -134,7 +132,7 @@ static void initmaster __ARGS((int));
static void
initmaster(f)
int f;
int f UNUSED;
{
#ifndef VMS
# ifdef POSIX

12
src/undo.c
View File

@@ -242,7 +242,7 @@ u_save(top, bot)
}
/*
* save the line "lnum" (used by ":s" and "~" command)
* Save the line "lnum" (used by ":s" and "~" command).
* The line is replaced, so the new bottom line is lnum + 1.
*/
int
@@ -256,7 +256,7 @@ u_savesub(lnum)
}
/*
* a new line is inserted before line "lnum" (used by :s command)
* A new line is inserted before line "lnum" (used by :s command).
* The line is inserted, so the new bottom line is lnum + 1.
*/
int
@@ -270,7 +270,7 @@ u_inssub(lnum)
}
/*
* save the lines "lnum" - "lnum" + nlines (used by delete command)
* Save the lines "lnum" - "lnum" + nlines (used by delete command).
* The lines are deleted, so the new bottom line is lnum, unless the buffer
* becomes empty.
*/
@@ -1406,10 +1406,9 @@ u_sync(force)
/*
* ":undolist": List the leafs of the undo tree
*/
/*ARGSUSED*/
void
ex_undolist(eap)
exarg_T *eap;
exarg_T *eap UNUSED;
{
garray_T ga;
u_header_T *uhp;
@@ -1529,10 +1528,9 @@ u_add_time(buf, buflen, tt)
/*
* ":undojoin": continue adding to the last entry list
*/
/*ARGSUSED*/
void
ex_undojoin(eap)
exarg_T *eap;
exarg_T *eap UNUSED;
{
if (curbuf->b_u_newhead == NULL)
return; /* nothing changed before */

866
src/version.c
View File

@@ -681,872 +681,6 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
433,
/**/
432,
/**/
431,
/**/
430,
/**/
429,
/**/
428,
/**/
427,
/**/
426,
/**/
425,
/**/
424,
/**/
423,
/**/
422,
/**/
421,
/**/
420,
/**/
419,
/**/
418,
/**/
417,
/**/
416,
/**/
415,
/**/
414,
/**/
413,
/**/
412,
/**/
411,
/**/
410,
/**/
409,
/**/
408,
/**/
407,
/**/
406,
/**/
405,
/**/
404,
/**/
403,
/**/
402,
/**/
401,
/**/
400,
/**/
399,
/**/
398,
/**/
397,
/**/
396,
/**/
395,
/**/
394,
/**/
393,
/**/
392,
/**/
391,
/**/
390,
/**/
389,
/**/
388,
/**/
387,
/**/
386,
/**/
385,
/**/
384,
/**/
383,
/**/
382,
/**/
381,
/**/
380,
/**/
379,
/**/
378,
/**/
377,
/**/
376,
/**/
375,
/**/
374,
/**/
373,
/**/
372,
/**/
371,
/**/
370,
/**/
369,
/**/
368,
/**/
367,
/**/
366,
/**/
365,
/**/
364,
/**/
363,
/**/
362,
/**/
361,
/**/
360,
/**/
359,
/**/
358,
/**/
357,
/**/
356,
/**/
355,
/**/
354,
/**/
353,
/**/
352,
/**/
351,
/**/
350,
/**/
349,
/**/
348,
/**/
347,
/**/
346,
/**/
345,
/**/
344,
/**/
343,
/**/
342,
/**/
341,
/**/
340,
/**/
339,
/**/
338,
/**/
337,
/**/
336,
/**/
335,
/**/
334,
/**/
333,
/**/
332,
/**/
331,
/**/
330,
/**/
329,
/**/
328,
/**/
327,
/**/
326,
/**/
325,
/**/
324,
/**/
323,
/**/
322,
/**/
321,
/**/
320,
/**/
319,
/**/
318,
/**/
317,
/**/
316,
/**/
315,
/**/
314,
/**/
313,
/**/
312,
/**/
311,
/**/
310,
/**/
309,
/**/
308,
/**/
307,
/**/
306,
/**/
305,
/**/
304,
/**/
303,
/**/
302,
/**/
301,
/**/
300,
/**/
299,
/**/
298,
/**/
297,
/**/
296,
/**/
295,
/**/
294,
/**/
293,
/**/
292,
/**/
291,
/**/
290,
/**/
289,
/**/
288,
/**/
287,
/**/
286,
/**/
285,
/**/
284,
/**/
283,
/**/
282,
/**/
281,
/**/
280,
/**/
279,
/**/
278,
/**/
277,
/**/
276,
/**/
275,
/**/
274,
/**/
273,
/**/
272,
/**/
271,
/**/
270,
/**/
269,
/**/
268,
/**/
267,
/**/
266,
/**/
265,
/**/
264,
/**/
263,
/**/
262,
/**/
261,
/**/
260,
/**/
259,
/**/
258,
/**/
257,
/**/
256,
/**/
255,
/**/
254,
/**/
253,
/**/
252,
/**/
251,
/**/
250,
/**/
249,
/**/
248,
/**/
247,
/**/
246,
/**/
245,
/**/
244,
/**/
243,
/**/
242,
/**/
241,
/**/
240,
/**/
239,
/**/
238,
/**/
237,
/**/
236,
/**/
235,
/**/
234,
/**/
233,
/**/
232,
/**/
231,
/**/
230,
/**/
229,
/**/
228,
/**/
227,
/**/
226,
/**/
225,
/**/
224,
/**/
223,
/**/
222,
/**/
221,
/**/
220,
/**/
219,
/**/
218,
/**/
217,
/**/
216,
/**/
215,
/**/
214,
/**/
213,
/**/
212,
/**/
211,
/**/
210,
/**/
209,
/**/
208,
/**/
207,
/**/
206,
/**/
205,
/**/
204,
/**/
203,
/**/
202,
/**/
201,
/**/
200,
/**/
199,
/**/
198,
/**/
197,
/**/
196,
/**/
195,
/**/
194,
/**/
193,
/**/
192,
/**/
191,
/**/
190,
/**/
189,
/**/
188,
/**/
187,
/**/
186,
/**/
185,
/**/
184,
/**/
183,
/**/
182,
/**/
181,
/**/
180,
/**/
179,
/**/
178,
/**/
177,
/**/
176,
/**/
175,
/**/
174,
/**/
173,
/**/
172,
/**/
171,
/**/
170,
/**/
169,
/**/
168,
/**/
167,
/**/
166,
/**/
165,
/**/
164,
/**/
163,
/**/
162,
/**/
161,
/**/
160,
/**/
159,
/**/
158,
/**/
157,
/**/
156,
/**/
155,
/**/
154,
/**/
153,
/**/
152,
/**/
151,
/**/
150,
/**/
149,
/**/
148,
/**/
147,
/**/
146,
/**/
145,
/**/
144,
/**/
143,
/**/
142,
/**/
141,
/**/
140,
/**/
139,
/**/
138,
/**/
137,
/**/
136,
/**/
135,
/**/
134,
/**/
133,
/**/
132,
/**/
131,
/**/
130,
/**/
129,
/**/
128,
/**/
127,
/**/
126,
/**/
125,
/**/
124,
/**/
123,
/**/
122,
/**/
121,
/**/
120,
/**/
119,
/**/
118,
/**/
117,
/**/
116,
/**/
115,
/**/
114,
/**/
113,
/**/
112,
/**/
111,
/**/
110,
/**/
109,
/**/
108,
/**/
107,
/**/
106,
/**/
105,
/**/
104,
/**/
103,
/**/
102,
/**/
101,
/**/
100,
/**/
99,
/**/
98,
/**/
97,
/**/
96,
/**/
95,
/**/
94,
/**/
93,
/**/
92,
/**/
91,
/**/
90,
/**/
89,
/**/
88,
/**/
87,
/**/
86,
/**/
85,
/**/
84,
/**/
83,
/**/
82,
/**/
81,
/**/
80,
/**/
79,
/**/
78,
/**/
77,
/**/
76,
/**/
75,
/**/
74,
/**/
73,
/**/
72,
/**/
71,
/**/
70,
/**/
69,
/**/
68,
/**/
67,
/**/
66,
/**/
65,
/**/
64,
/**/
63,
/**/
62,
/**/
61,
/**/
60,
/**/
59,
/**/
58,
/**/
57,
/**/
56,
/**/
55,
/**/
54,
/**/
53,
/**/
52,
/**/
51,
/**/
50,
/**/
49,
/**/
48,
/**/
47,
/**/
46,
/**/
45,
/**/
44,
/**/
43,
/**/
42,
/**/
41,
/**/
40,
/**/
39,
/**/
38,
/**/
37,
/**/
36,
/**/
35,
/**/
34,
/**/
33,
/**/
32,
/**/
31,
/**/
30,
/**/
29,
/**/
28,
/**/
27,
/**/
26,
/**/
25,
/**/
24,
/**/
23,
/**/
22,
/**/
21,
/**/
20,
/**/
19,
/**/
18,
/**/
17,
/**/
16,
/**/
15,
/**/
14,
/**/
13,
/**/
12,
/**/
11,
/**/
10,
/**/
9,
/**/
8,
/**/
7,
/**/
6,
/**/
5,
/**/
4,
/**/
3,
/**/
2,
/**/
1,
/**/
0
};

22
src/version.h
View File

@@ -15,17 +15,17 @@
#define VIM_VERSION_MAJOR 7
#define VIM_VERSION_MAJOR_STR "7"
#define VIM_VERSION_MINOR 2
#define VIM_VERSION_MINOR_STR "2"
#define VIM_VERSION_MINOR 3
#define VIM_VERSION_MINOR_STR "3"
#define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR)
#define VIM_VERSION_BUILD 269
#define VIM_VERSION_BUILD_BCD 0x10d
#define VIM_VERSION_BUILD_STR "269"
#define VIM_VERSION_BUILD 270
#define VIM_VERSION_BUILD_BCD 0x10e
#define VIM_VERSION_BUILD_STR "270"
#define VIM_VERSION_PATCHLEVEL 0
#define VIM_VERSION_PATCHLEVEL_STR "0"
/* Used by MacOS port should be one of: development, alpha, beta, final */
#define VIM_VERSION_RELEASE final
#define VIM_VERSION_RELEASE beta
/*
* VIM_VERSION_NODOT is used for the runtime directory name.
@@ -33,8 +33,8 @@
* VIM_VERSION_MEDIUM is used for the startup-screen.
* VIM_VERSION_LONG is used for the ":version" command and "Vim -h".
*/
#define VIM_VERSION_NODOT "vim72"
#define VIM_VERSION_SHORT "7.2"
#define VIM_VERSION_MEDIUM "7.2"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.2 (2008 Aug 9)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.2 (2008 Aug 9, compiled "
#define VIM_VERSION_NODOT "vim73a"
#define VIM_VERSION_SHORT "7.3a"
#define VIM_VERSION_MEDIUM "7.3a BETA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.3 BETA (2010 May 15)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.3 BETA (2008 May 15, compiled "

2
src/vim.def
View File

@@ -1,4 +1,4 @@
CODE PRELOAD EXECUTEONLY
DATA MULTIPLE SHARED
DESCRIPTION 'Vim 7.2'
DESCRIPTION 'Vim 7.3a'
HEAPSIZE 0,0

2
src/vim16.def
View File

@@ -1,5 +1,5 @@
CODE PRELOAD EXECUTEONLY
DATA MULTIPLE SHARED
DESCRIPTION 'Vim 7.2'
DESCRIPTION 'Vim 7.3a'
STACKSIZE 16000
HEAPSIZE 10000